summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importcm-14.1_prerebaseAbhisek Devkota2017-02-115-1/+129
| | | | Change-Id: I623b70aee092a8dd98bcff146f88cb643fd9fea0
* Automatic translation importAbhisek Devkota2017-02-071-3/+1
| | | | Change-Id: Ib441bb37e3849548c6b21e3d04c41b58654e6521
* Automatic translation importAbhisek Devkota2017-02-0421-145/+3
| | | | Change-Id: I8311ebf138c415c1b28591b16c9a94658cfffe38
* Automatic translation importAbhisek Devkota2017-01-313-0/+3
| | | | Change-Id: Ib0111989a539b8835ed28b65ef0da084c934597a
* Automatic translation importAbhisek Devkota2017-01-256-2/+6
| | | | Change-Id: Ia9fef3481b75f3ab6e053a2071a4f0fc3090547a
* cleanup unused resource stringsMarie Janssen2017-01-14138-951/+1
| | | | | Test: mma -j46 Change-Id: I8f534276d972e13d61ab84c7fdab9f6687c38f88
* Automatic translation importpinky@build012016-12-2435-0/+195
| | | | | Change-Id: Iad38a6752361ac1c91bc3b4103fe4737d179a073 Ticket: -
* Automatic translation importclyde@build012016-12-211-0/+1
| | | | | Change-Id: I5dc810e79e3fea08693ecbad4783fecfa85d1217 Ticket: -
* Automatic translation importblinky@build012016-12-2038-0/+684
| | | | | Change-Id: I2a1f8106f9d7acc5d4b37791b7dd1242021e5a92 Ticket: -
* Automatic translation importpinky@build012016-12-171-0/+1
| | | | | Change-Id: Ic08eb001a6fa7a5a9749e366d7e75103f0c0a184 Ticket: -
* jni: fix merge failureDan Pasanen2016-12-121-5/+6
| | | | Change-Id: I49d28a28f1a75737d8d8bf16d4c96a516acbbaf4
* Automatic translation importpinky@build012016-12-102-0/+2
| | | | | Change-Id: Ia8c61a8673998b18e54de06377220b5b19ca08e6 Ticket: -
* Automatic translation importclyde@build012016-12-071-0/+1
| | | | Change-Id: Ic431b23c001c3861e5611cb71bece05bb2c7c0fc
* Automatic translation importJoey Rizzoli2016-12-070-0/+0
| | | | Change-Id: Id0b3820cd71bf67842fb32aaa9f9bcc4f5c2dab8
* Automatic translation importJoey Rizzoli2016-12-072-0/+2
| | | | Change-Id: I234ea9b381a9e87d8b3ca0ea2541d6d121f06eb8
* Merge tag 'android-7.1.1_r4' into cm-14.1Dan Pasanen2016-12-069-31/+106
|\ | | | | | | | | | | Android 7.1.1 release 4 Change-Id: Ia693c9be65c8662f565d79bb20f9788dae1b7d2d
| * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-230-0/+0
| |\
| | * Add additional logging for device propertiesAjay Panicker2016-10-211-2/+9
| | | | | | | | | | | | | | | | | | | | | Bug: 31947953 Test: Manual Change-Id: I7e23b55c03e7f0382d59efe9a94221ed4bdf57ab (cherry picked from commit 055babc4ab16a11320ffd44e2a1dea97047feb55)
| | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-090-0/+0
| | |\
| | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-290-0/+0
| | | |\
| | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-250-0/+0
| | | | |\
| | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-220-0/+0
| | | | | |\
| | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-210-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-130-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-080-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-010-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-280-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-240-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-230-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-210-0/+0
| | | | | | | | | | | | | |\
| * | | | | | | | | | | | | | Prevent bonded device from being removed from the property mapAjay Panicker2016-10-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 31947953 Test: Manual Change-Id: Ia2d25b305c07949a9251af83e855db4511ff887f
| * | | | | | | | | | | | | | Add additional logging for device propertiesAjay Panicker2016-10-201-2/+9
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 31947953 Test: Manual Change-Id: I7e23b55c03e7f0382d59efe9a94221ed4bdf57ab
| * / / / / / / / / / / / / Ensure LE scan clients are removed when the related app diesAndre Eisenbach2016-10-061-5/+5
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the passed in ScanClient in handleStopScan() to ensure that the client appDied flag is in the correct state to ensure proper removal of the client application reference. Bug: 30681588 Change-Id: I0e0067a8e21ebd5f89870a7054b1f4092fe63ae1
| * / / / / / / / / / / / Cleanup BluetoothPbapReceiver log messagesPavlin Radoslavov2016-09-281-5/+3
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 31442739 Bug: 31457305 Test: manual - checked logcat output for (lack of) excessive logs Change-Id: I76f32dd950afd0a2949f38bfa6c0d4212b83357c (cherry picked from commit f36fc254ad196339a59c2ab00b555f4d8f601718)
| * | | | | | | | | | | Limit number of stored device propertiesAndre Eisenbach2016-09-231-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 31651689 Change-Id: I6e31b4f89d6ebf9e6a0c6df5ea4e1a7be61a125a
| * | | | | | | | | | | Merge "Enable debug logs by default in BluetoothPbapReceiver" into nyc-mr1-devTreeHugger Robot2016-09-231-5/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Enable debug logs by default in BluetoothPbapReceiverPavlin Radoslavov2016-09-211-5/+7
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled more logs to help identify issues when Bluetooth is started because of PBAP. Bug: 31442739 Bug: 31457305 Test: manual - checked logcat output for (lack of) excessive logs Change-Id: I6348fe57a8b3546a8152416a5db95b8b2226e166 (cherry picked from commit beacc3b09d1192c70c6385c5666e5706f7662a75)
| * / / / / / / / / / / Enable debug logs for Bluetooth AdapterServicePavlin Radoslavov2016-09-211-8/+14
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled log messages that are useful to debug the AdapterService state. Remaining log messages are controlled by AdapterService.VERBOSE flag and are disabled by default. Bug: 31442739 Test: manual, and "frameworks/base/core/tests/bluetoothtests" unit tests Change-Id: I7d81fd605f64e64f29aee37314821384234b286d (cherry picked from commit 32a92489e9779d10c613a57d86135a7de6d3d7c4)
| * | | | | | | | | | Merge "Collect number of paired BT devices." into nyc-mr1-devTreeHugger Robot2016-09-212-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Collect number of paired BT devices.pkanwar2016-09-212-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 31602591 Change-Id: I61adee8b20d57e2a1e284ed21a46d1766f059d4a
| * | | | | | | | | | Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵Ajay Panicker2016-09-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours am: 8305951cca am: 8eb38035db am: 1bd3e02a8a am: 3998910222 -s ours am: 1981d50808 am: bee9046a6b Change-Id: Ib386994982f2ece85c8e727ce67a6fb30e6ab07a
| | * \ \ \ \ \ \ \ \ \ Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵Ajay Panicker2016-09-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours am: 8305951cca am: 8eb38035db am: 1bd3e02a8a am: 3998910222 -s ours am: 1981d50808 Change-Id: Id009d4da1f5df9afa36a8cdd30eac22d7fba97cf
| | | * \ \ \ \ \ \ \ \ \ Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵Ajay Panicker2016-09-210-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours am: 8305951cca am: 8eb38035db am: 1bd3e02a8a am: 3998910222 -s ours Change-Id: I70bfe58ce090142cca39f7a7a4392ede22233420
| | | | * \ \ \ \ \ \ \ \ \ Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵Ajay Panicker2016-09-210-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours am: 8305951cca am: 8eb38035db am: 1bd3e02a8a Change-Id: I76fad54c596e03425fae75109ef29409cc08f2e0
| | | | | * \ \ \ \ \ \ \ \ \ Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵Ajay Panicker2016-09-210-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours am: 8305951cca am: 8eb38035db Change-Id: If56e630962e992a8396c8276f2af88d981fdf1a9
| | | | | | * \ \ \ \ \ \ \ \ \ Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵Ajay Panicker2016-09-210-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours am: 8305951cca Change-Id: I92d2761c392537a1e49a5392e224c1809b311f98
| | | | | | | * \ \ \ \ \ \ \ \ \ Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵Ajay Panicker2016-09-210-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours Change-Id: Ibd76e7968c99b10e21ecfe313fb584a64ac41951
| | | | | | | | * \ \ \ \ \ \ \ \ \ Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵Ajay Panicker2016-09-210-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 Change-Id: Ief8c3e89f7c31045239e6f60d801a30525a68874
| | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵Ajay Panicker2016-09-210-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev am: 0ccca8ac62 Change-Id: I58afc49fbbd9d1308323b9947edd21f56c87b812
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" ↵TreeHugger Robot2016-09-211-2/+2
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev