summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix screen off HCEMaoliang Tang2021-06-291-1/+5
* Fix getSelectionModeForCategoryGeorge Chang2021-05-261-0/+7
* Merge "CRLF Injection in Nfc ConfirmConnectActivity" into oc-mr1-dev am: e2da...TreeHugger Robot2021-05-131-1/+2
|\
| * Merge "CRLF Injection in Nfc ConfirmConnectActivity" into oc-mr1-dev am: e2da...TreeHugger Robot2021-05-131-1/+2
| |\
| | * Merge "CRLF Injection in Nfc ConfirmConnectActivity" into oc-mr1-dev am: e2da...TreeHugger Robot2021-05-131-1/+2
| | |\
| | | * Merge "CRLF Injection in Nfc ConfirmConnectActivity" into oc-mr1-dev am: e2da...TreeHugger Robot2021-05-131-1/+2
| | | |\
| | | | * Merge "CRLF Injection in Nfc ConfirmConnectActivity" into oc-mr1-dev am: e2da...TreeHugger Robot2021-05-131-1/+2
| | | | |\
| | | | | * Merge "CRLF Injection in Nfc ConfirmConnectActivity" into oc-mr1-devTreeHugger Robot2021-05-131-1/+2
| | | | | |\
| | | | | | * CRLF Injection in Nfc ConfirmConnectActivityAlisher Alikhodjaev2021-04-201-1/+2
| | | | * | | Tapjacking vulnerability when pairing Bluetooth devices with NFC am: 662f5b3fe7Alisher Alikhodjaev2021-05-121-0/+3
| | | | |\| |
| | | | | * | Tapjacking vulnerability when pairing Bluetooth devices with NFCAlisher Alikhodjaev2021-04-201-0/+3
| | | | | |/
* | | | | | Tapjacking vulnerability when pairing Bluetooth devices with NFC am: 8afc24e2...Alisher Alikhodjaev2021-05-071-0/+3
|\| | | | |
| * | | | | Tapjacking vulnerability when pairing Bluetooth devices with NFC am: 8afc24e2...Alisher Alikhodjaev2021-05-071-0/+3
| |\| | | |
| | * | | | Tapjacking vulnerability when pairing Bluetooth devices with NFC am: 8afc24e296Alisher Alikhodjaev2021-05-071-0/+3
| | |\| | |
| | | * | | Tapjacking vulnerability when pairing Bluetooth devices with NFCAlisher Alikhodjaev2021-04-201-0/+3
* | | | | | Merge "Do not check nfcee access rules for RF field events" am: 75bfd1a6f1 am...Treehugger Robot2021-05-041-30/+9
|\ \ \ \ \ \
| * \ \ \ \ \ Merge "Do not check nfcee access rules for RF field events" am: 75bfd1a6f1 am...Treehugger Robot2021-05-041-30/+9
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Do not check nfcee access rules for RF field events"Treehugger Robot2021-05-041-30/+9
| | |\ \ \ \ \ \
| | | * | | | | | Do not check nfcee access rules for RF field eventsJack Yu2021-04-291-30/+9
* | | | | | | | | Merge "OOB: Use public constructor vs static creator method." am: 7d74dc902c ...Martin Brabham2021-04-292-11/+11
|\| | | | | | | |
| * | | | | | | | Merge "OOB: Use public constructor vs static creator method." am: 7d74dc902c ...Martin Brabham2021-04-292-11/+11
| |\| | | | | | |
| | * | | | | | | OOB: Use public constructor vs static creator method.Martin Brabham2021-04-262-11/+11
| | |/ / / / / /
* | | | | | | | Merge "Correct default payment selection behavior" am: 693118262f am: d78463e...Treehugger Robot2021-04-211-0/+2
|\| | | | | | |
| * | | | | | | Merge "Correct default payment selection behavior" am: 693118262f am: d78463ed51Treehugger Robot2021-04-211-0/+2
| |\| | | | | |
| | * | | | | | Merge "Correct default payment selection behavior"Treehugger Robot2021-04-211-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | Correct default payment selection behaviorJack Yu2021-04-211-0/+2
* | | | | | | | | Merge "Update ControllerAlwaysOnStateCallback to ControllerAlwaysOnListener" ...George Chang2021-04-151-12/+12
|\| | | | | | | |
| * | | | | | | | Merge "Update ControllerAlwaysOnStateCallback to ControllerAlwaysOnListener" ...George Chang2021-04-151-12/+12
| |\| | | | | | |
| | * | | | | | | Update ControllerAlwaysOnStateCallback to ControllerAlwaysOnListenerGeorge Chang2021-04-151-12/+12
* | | | | | | | | Merge "Replace ACTION_ALWAYS_ON_STATE_CHANGED broadcast with a callback" am: ...George Chang2021-04-071-11/+38
|\| | | | | | | |
| * | | | | | | | Merge "Replace ACTION_ALWAYS_ON_STATE_CHANGED broadcast with a callback" am: ...George Chang2021-04-071-11/+38
| |\| | | | | | |
| | * | | | | | | Replace ACTION_ALWAYS_ON_STATE_CHANGED broadcast with a callbackGeorge Chang2021-04-011-11/+38
| | |/ / / / / /
* | | | | | | | Merge "Update SetControllerAlwaysOn and PRIVILEGED permission" am: 3634e4178c...George Chang2021-03-302-6/+22
|\| | | | | | |
| * | | | | | | Merge "Update SetControllerAlwaysOn and PRIVILEGED permission" am: 3634e4178c...George Chang2021-03-302-6/+22
| |\| | | | | |
| | * | | | | | Update SetControllerAlwaysOn and PRIVILEGED permissionGeorge Chang2021-03-282-6/+22
* | | | | | | | Merge "Catch SecurityException when binding payment service" am: 61008f6c70 a...George Chang2021-03-242-10/+17
|\| | | | | | |
| * | | | | | | Merge "Catch SecurityException when binding payment service" am: 61008f6c70 a...George Chang2021-03-242-10/+17
| |\| | | | | |
| | * | | | | | Merge "Catch SecurityException when binding payment service"George Chang2021-03-242-10/+17
| | |\ \ \ \ \ \
| | | * | | | | | Catch SecurityException when binding payment serviceWang Han2021-03-182-10/+17
* | | | | | | | | Merge "Refine NFC recovery flow" am: 6c22973f89 am: c9df159a57 am: a4d447881cTreehugger Robot2021-03-221-2/+15
|\| | | | | | | |
| * | | | | | | | Merge "Refine NFC recovery flow" am: 6c22973f89 am: c9df159a57Treehugger Robot2021-03-221-2/+15
| |\| | | | | | |
| | * | | | | | | Merge "Refine NFC recovery flow"Treehugger Robot2021-03-221-2/+15
| | |\ \ \ \ \ \ \
| | | * | | | | | | Refine NFC recovery flowJack Yu2021-03-221-2/+15
| * | | | | | | | | Merge "Use new OobData apis to build the OobData object" am: 93fc1d2d82 am: 3...Treehugger Robot2021-03-192-23/+21
| |\| | | | | | | |
| | * | | | | | | | Use new OobData apis to build the OobData objectMartin Brabham2021-03-152-23/+21
| | |/ / / / / / /
* | | | | | | | | Use new OobData apis to build the OobData objectMartin Brabham2021-03-102-23/+21
* | | | | | | | | Merge "The BlueTooth address of the peer can be leaked." into rvc-qpr-dev am:...Alisher Alikhodjaev2021-03-101-0/+1
|\| | | | | | | |
| * | | | | | | | Merge "The BlueTooth address of the peer can be leaked." into rvc-qpr-dev am:...Alisher Alikhodjaev2021-03-101-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | The BlueTooth address of the peer can be leaked.Alisher Alikhodjaev2021-01-141-0/+1
* | | | | | | | | Merge "Added way to call NCI NFCEE_POWER_AND_LINK_CTRL_CMD" am: 1a5524d7df am...George Chang2021-03-092-4/+9
|\| | | | | | | |