summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to e8feb4378c7dca4ea0c1115e5737a...The Android Automerger2014-10-220-0/+0
| | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to e8feb4378c7dca4ea0c1115e5737a...The Android Automerger2014-10-210-0/+0
| | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 7d8e9a246a5c57443e153fd328e22...The Android Automerger2014-10-200-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 7d8e9a246a5c57443e153fd328e22...The Android Automerger2014-10-190-0/+0
| | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 7d8e9a246a5c57443e153fd328e22...The Android Automerger2014-10-180-0/+0
| | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 7d8e9a246a5c57443e153fd328e22...The Android Automerger2014-10-160-0/+0
| | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 7d8e9a246a5c57443e153fd328e22...The Android Automerger2014-10-150-0/+0
| | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 3bd4c225d74354d1306a1fa0425aa...The Android Automerger2014-10-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to b04645260dd4b19d22ec6098dc7ae...The Android Automerger2014-10-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to 1ed41739a63ee557115b6d64cd2fd...The Android Automerger2014-10-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 1ed41739a63ee557115b6d64cd2fd...The Android Automerger2014-10-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 5954dbde3b8a3d2716b04c0675051...The Android Automerger2014-10-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to 0b8d77eab4abcb592f4e7aa48ecc5...The Android Automerger2014-10-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 0b8d77eab4abcb592f4e7aa48ecc5...The Android Automerger2014-10-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to c0382969e195681405c50367d65f5...The Android Automerger2014-10-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to b725fcaf1d293bad8e858a4904742...The Android Automerger2014-10-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to b725fcaf1d293bad8e858a4904742...The Android Automerger2014-10-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 155b6dd0cc35e16eac781a2149364...The Android Automerger2014-10-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to 61b127ee71398320c5a315863f447...The Android Automerger2014-10-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 61b127ee71398320c5a315863f447...The Android Automerger2014-09-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to b3c4843142fd6b2da067f70432bb1...The Android Automerger2014-09-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to 811a8bd72a4530d5a359e4879b80a...The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 811a8bd72a4530d5a359e4879b80a...The Android Automerger2014-09-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 33c6b9e33e58cf51c1b5341d7ba67...The Android Automerger2014-09-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to b202bbd7cb1d0e5dff437ca59bad8...The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to b202bbd7cb1d0e5dff437ca59bad8...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to b202bbd7cb1d0e5dff437ca59bad8...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to f57946458f67d2d2866de7b8da384...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to f57946458f67d2d2866de7b8da384...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to f57946458f67d2d2866de7b8da384...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API to check if a Bluetooth connection is encrypted (2/2)Andre Eisenbach2015-02-052-11/+9
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Use LTE signal level when under LTEMatthew Xie2015-01-261-1/+9
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove GATT context if client registration did not succeed" into lmp-m...Andre Eisenbach2015-01-202-2/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove GATT context if client registration did not succeedAndre Eisenbach2015-01-162-2/+23
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Improve VCARD filter logic and reduce log spam" into lmp-mr1-devAndre Eisenbach2015-01-151-287/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve VCARD filter logic and reduce log spamAndre Eisenbach2015-01-121-287/+77
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-devWink Saville2015-01-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename reg/unreg OnSubscriptionsChangedListener.Wink Saville2015-01-121-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Fix Bluetooth crash when all filters are used.Wei Wang2015-01-091-2/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add EventLog for configHciSnoopLog() security check" into lmp-mr1-devAndre Eisenbach2014-12-181-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EventLog for configHciSnoopLog() security checkAndre Eisenbach2014-12-171-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATT" into lmp-mr...Andre Eisenbach2014-12-171-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce BLUETOOTH_PRIVILEGED permission for HID-over-GATTAndre Eisenbach2014-12-161-0/+25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Allow system process to interact with Bluetooth across users." into lm...Santos Cordon2014-12-171-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow system process to interact with Bluetooth across users.Santos Cordon2014-12-161-4/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Prevent possible NullPointerException when service is destroyed" into ...Andre Eisenbach2014-12-161-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent possible NullPointerException when service is destroyedAndre Eisenbach2014-12-161-1/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-devAndre Eisenbach2014-12-161-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent duplicate OPP permission request dialogsAndre Eisenbach2014-12-141-1/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Prevent non-system users from enabling Bluetooth HCI loggingAndre Eisenbach2014-12-151-3/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /