Skip to content
Permalink
Branch: aosp-plus_4.4
Commits on Jun 3, 2014
  1. Nfc Unlock (3/3)

    tombriden committed May 10, 2014
    Depends on changes to frameworks/base and Settings
    
    Change-Id: I54ddee9b82d54c303573e02fd73abc758091be29
  2. Use system setting to decide when to poll (2/2)

    tombriden committed May 10, 2014
    Change-Id: I416472bd67ea4599deb0eb86f0e829c3e62f7c57
Commits on Mar 19, 2014
  1. Fix compiler warnings (DO NOT MERGE).

    nickkral authored and Martijn Coenen committed Jan 3, 2014
    packages/apps/Nfc/nci/jni/RoutingManager.cpp: In member function 'bool RoutingManager::addAidRouting(const UINT8*, UINT8, int)':
    packages/apps/Nfc/nci/jni/RoutingManager.cpp:123:94: warning: format '%s' expects a matching 'char*' argument [-Wformat=]
             ALOGE ("%s: failed to route AID");
                                                                                                  ^
    packages/apps/Nfc/nci/jni/RoutingManager.cpp: In member function 'bool RoutingManager::removeAidRouting(const UINT8*, UINT8)':
    packages/apps/Nfc/nci/jni/RoutingManager.cpp:139:95: warning: format '%s' expects a matching 'char*' argument [-Wformat=]
             ALOGE ("%s: failed to remove AID");
    
    Bug: 13476133
    Change-Id: I6765bc68a7d8c2180cf8dd2f587d302cac314538
Commits on Mar 14, 2014
  1. DO NOT MERGE Fix NPE in RegisteredAidCache

    Yuka Anami Andres Morales
    Yuka Anami authored and Andres Morales committed Dec 26, 2013
    If the specified AID is not matched to any of mAidCache's keys,
    the HashMap returns null and then NullPointerException occurs.
    
    Bug: 13322965
    Change-Id: I0d97aab0e47a6c6e7cbdb2426173038f4194c457
Commits on Feb 21, 2014
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Feb 21, 2014
    Change-Id: I3b39f521bc29c9ca0208d67c66b6f95679d2ce6c
    Auto-generated-cl: translation import
Commits on Dec 12, 2013
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Dec 12, 2013
    Change-Id: I8b06d43cb18a2cb1e8e735b6d78515ccca670006
    Auto-generated-cl: translation import
Commits on Nov 6, 2013
  1. Increase NFC-A guard time to work around B5 issue.

    Martijn Coenen
    Martijn Coenen committed Nov 6, 2013
    Increase NFC-A guard time in reader mode, to make
    sure we properly wake up BCM20791B05 devices.
    
    Bug: 10852675
    Change-Id: Ia30972d5d7850171bc58068c5d6896025eb6c2c1
Commits on Oct 29, 2013
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Oct 29, 2013
    Change-Id: Ibfd34791605d53500be71f7c09223e198370fbf0
    Auto-generated-cl: translation import
Commits on Oct 23, 2013
  1. HCE: Fix potential crash and handle Android AID.

    Martijn Coenen
    Martijn Coenen committed Oct 22, 2013
    For new "default route" CTS test. Also, fix
    a potential crash for starting off-host services
    and check that HCE services have declared the
    NFC permission.
    
    Bug: 10681671
    Change-Id: If86d9820d6eef5a0661be92be67168d5f81ddc64
Commits on Oct 21, 2013
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Oct 21, 2013
    Change-Id: I930a2209b1b7e2fcc03ed448b0abcb127b70b86b
    Auto-generated-cl: translation import
Commits on Oct 17, 2013
  1. Merge "Import translations. DO NOT MERGE" into klp-dev

    Baligh Uddin Android (Google) Code Review
    Baligh Uddin authored and Android (Google) Code Review committed Oct 17, 2013
  2. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Oct 17, 2013
    Change-Id: I443b01b550cb0e1d98818db042dcb1c8fbd19059
    Auto-generated-cl: translation import
  3. merge in klp-release (no-op)

    Ed Heyl
    Ed Heyl committed Oct 17, 2013
Commits on Oct 13, 2013
  1. merge in klp-release history after reset to klp-dev

    The Android Automerger
    The Android Automerger committed Oct 13, 2013
Commits on Oct 12, 2013
  1. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Oct 12, 2013
    Change-Id: Ia70dd60758f95b07085ba70e5631c5f93ff9da68
    Auto-generated-cl: translation import
Commits on Oct 10, 2013
  1. merge in klp-release history after reset to klp-dev

    The Android Automerger
    The Android Automerger committed Oct 10, 2013
Commits on Oct 9, 2013
  1. Merge "Disable HCE debug logging." into klp-dev

    Martijn Coenen Android (Google) Code Review
    Martijn Coenen authored and Android (Google) Code Review committed Oct 9, 2013
  2. merge in klp-release history after reset to klp-dev

    The Android Automerger
    The Android Automerger committed Oct 9, 2013
  3. Disable HCE debug logging.

    Martijn Coenen
    Martijn Coenen committed Oct 7, 2013
    But add some code to dump information about the
    HCE service/AID cache in bugreports.
    
    Bug: 11142134
    Change-Id: I7387748bcf93e92ab2f25bc307941cdeccaca4ef
Commits on Oct 8, 2013
  1. merge in KFS78N (no-op)

    Ed Heyl
    Ed Heyl committed Oct 8, 2013
  2. merge in KQS81M

    Ed Heyl
    Ed Heyl committed Oct 8, 2013
  3. Merge "Add BLUETOOTH_PRIVILEGED permission." into klp-dev

    Martijn Coenen Android (Google) Code Review
    Martijn Coenen authored and Android (Google) Code Review committed Oct 8, 2013
  4. Add BLUETOOTH_PRIVILEGED permission.

    Martijn Coenen
    Martijn Coenen committed Oct 8, 2013
    To allow NFC connection handover again.
    
    Bug: 11121108
    Change-Id: I964b6ad078a0efbfaa08e868c43f4927d824ad03
Commits on Oct 7, 2013
  1. merge in klp-release history after reset to klp-dev

    The Android Automerger
    The Android Automerger committed Oct 7, 2013
  2. Fix NPE in NfcService.

    Martijn Coenen
    Martijn Coenen committed Oct 7, 2013
    Bug: 11104960
    Change-Id: Ie068d2bbbed92165abd6afc685727c9fc4aabd12
Commits on Oct 6, 2013
  1. merge in klp-release history after reset to klp-dev

    The Android Automerger
    The Android Automerger committed Oct 6, 2013
Commits on Oct 5, 2013
  1. Merge "Import translations. DO NOT MERGE" into klp-dev

    Baligh Uddin Android (Google) Code Review
    Baligh Uddin authored and Android (Google) Code Review committed Oct 5, 2013
  2. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Oct 5, 2013
    Change-Id: I7d87ca82f8459902743f457a31af429b7cfa4996
    Auto-generated-cl: translation import
Commits on Oct 4, 2013
  1. Merge "Increase reader mode pull duration." into klp-dev

    Martijn Coenen Android (Google) Code Review
    Martijn Coenen authored and Android (Google) Code Review committed Oct 4, 2013
  2. Increase reader mode pull duration.

    Martijn Coenen
    Martijn Coenen committed Oct 4, 2013
    Also fixed a bug where gActivated is not
    properly reset (scenario: turn NFC off
    while doing P2P/reader) and moved some
    logs to DBG. Will flick the DBG switch
    later.
    
    Bug: 10852675
    Change-Id: If115ab162ddc4a080166f00cdf5e95ed4da70642
Commits on Oct 3, 2013
  1. merge in klp-release history after reset to klp-dev

    The Android Automerger
    The Android Automerger committed Oct 3, 2013
  2. Import translations. DO NOT MERGE

    Baligh Uddin
    Baligh Uddin committed Oct 3, 2013
    Change-Id: I89dcf35c153afb7334ce51728df6c4b675b1e2b2
    Auto-generated-cl: translation import
Commits on Oct 2, 2013
  1. merge in klp-release history after reset to klp-dev

    The Android Automerger
    The Android Automerger committed Oct 2, 2013
Commits on Oct 1, 2013
  1. Merge "Notify NfcService on NFA_DEACTIVATED_EVT." into klp-dev

    Martijn Coenen Android (Google) Code Review
    Martijn Coenen authored and Android (Google) Code Review committed Oct 1, 2013
  2. Notify NfcService on NFA_DEACTIVATED_EVT.

    Martijn Coenen
    Martijn Coenen committed Oct 1, 2013
    This event comes when the remote puts us to sleep;
    we should notify NfcService in this scenario as well,
    so that NfcService in turn can notify HCE applications.
    
    Bug: 10681671
    Change-Id: Ice7f33c3385d40793df6f2c5c900ff6d4e7640f3
Older
You can’t perform that action at this time.