git.osdn.net Git - android-x86/packages-apps-Bluetooth.git/log

Ajay Panicker [Fri, 21 Oct 2016 23:22:11 +0000 (16:22 -0700)]

Prevent bonded device from being removed from the property map

Bug: 31947953
Test: Manual
Change-Id: Ia2d25b305c07949a9251af83e855db4511ff887f

commit | commitdiff | tree

Ajay Panicker [Thu, 20 Oct 2016 19:56:34 +0000 (12:56 -0700)]

Add additional logging for device properties

Bug: 31947953
Test: Manual
Change-Id: I7e23b55c03e7f0382d59efe9a94221ed4bdf57ab

commit | commitdiff | tree

Andre Eisenbach [Fri, 7 Oct 2016 00:39:31 +0000 (17:39 -0700)]

Ensure LE scan clients are removed when the related app dies

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

commit | commitdiff | tree

Pavlin Radoslavov [Wed, 28 Sep 2016 23:58:07 +0000 (16:58 -0700)]

Cleanup BluetoothPbapReceiver log messages

Bug: 31442739
Bug: 31457305
Test: manual - checked logcat output for (lack of) excessive logs
Change-Id: I76f32dd950afd0a2949f38bfa6c0d4212b83357c
(cherry picked from commit f36fc254ad196339a59c2ab00b555f4d8f601718)

commit | commitdiff | tree

Andre Eisenbach [Thu, 22 Sep 2016 21:30:32 +0000 (14:30 -0700)]

Limit number of stored device properties

Bug: 31651689
Change-Id: I6e31b4f89d6ebf9e6a0c6df5ea4e1a7be61a125a

commit | commitdiff | tree

TreeHugger Robot [Fri, 23 Sep 2016 00:08:58 +0000 (00:08 +0000)]

Merge "Enable debug logs by default in BluetoothPbapReceiver" into nyc-mr1-dev

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 22 Sep 2016 00:46:07 +0000 (17:46 -0700)]

Enable debug logs for Bluetooth AdapterService

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)

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 15 Sep 2016 20:15:41 +0000 (13:15 -0700)]

Enable debug logs by default in BluetoothPbapReceiver

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)

commit | commitdiff | tree

TreeHugger Robot [Wed, 21 Sep 2016 22:57:23 +0000 (22:57 +0000)]

Merge "Collect number of paired BT devices." into nyc-mr1-dev

Collect number of paired BT devices.

Bug: 31602591
Change-Id: I61adee8b20d57e2a1e284ed21a46d1766f059d4a

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 05:42:19 +0000 (05:42 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" 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

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 05:42:16 +0000 (05:42 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34 am: 28dc531ac7 am: 460561cb28 -s ours am: 107bf18aa3 am: b8b865d786 am: 5b10905e4f am: ed611c8943 -s ours am: dbf0fcea18
am: 95416561d3

Change-Id: I8e3409b7912dc0a6eb79b14806079621330771e8

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 05:41:51 +0000 (05:41 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours" into lmp-dev am: 60b2ea959d -s ours am: fcc8d6c900 am: 64998914de am: 0d4475fc01 -s ours am: 5c950df332 am: 1dc5800553 am: e45190af67 am: 72c9d444c3 -s ours am: fd4fdc2086
am: 585b49b657

Change-Id: I691045af3fa321236ab70ad23e068eedc66ade3a

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 05:41:46 +0000 (05:41 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours am: 1a3a6accdc -s ours am: 05a136ed33 am: 285c44140c am: 2f7e244816 -s ours am: 01bb2d1aac am: 5d2069d9dc am: 21a74c67ca am: 3dbe82ee89 -s ours am: 409014735a
am: 91a29a46c7

Change-Id: I2f6f8b5b30c476a6b5b0833d986a6d602c947035

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:16:34 +0000 (04:16 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e -s ours am: 8fe2b32637 am: 0c98432a94 am: 5ff155974f -s ours am: 0fb4bfd5b5 am: 93d6266c04 am: 3512fd433a am: eebe586729 -s ours am: cb5b3f1045
am: e8b3f00d9f

Change-Id: I6046781c590f1b5ff891d8eb726d71a4ff151364

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:15:02 +0000 (04:15 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" 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

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:14:58 +0000 (04:14 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34 am: 28dc531ac7 am: 460561cb28 -s ours am: 107bf18aa3 am: b8b865d786 am: 5b10905e4f am: ed611c8943 -s ours
am: dbf0fcea18

Change-Id: I66b49929c7ed85f07f9d1317c9ee87aa08ad224e

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:14:36 +0000 (04:14 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours" into lmp-dev am: 60b2ea959d -s ours am: fcc8d6c900 am: 64998914de am: 0d4475fc01 -s ours am: 5c950df332 am: 1dc5800553 am: e45190af67 am: 72c9d444c3 -s ours
am: fd4fdc2086

Change-Id: Ie1f9aab57f23ef266f6ef4be50bd5db7b13286bc

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 04:14:31 +0000 (04:14 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours am: 1a3a6accdc -s ours am: 05a136ed33 am: 285c44140c am: 2f7e244816 -s ours am: 01bb2d1aac am: 5d2069d9dc am: 21a74c67ca am: 3dbe82ee89 -s ours
am: 409014735a

Change-Id: Ia6f3cae8acd5ba260d1751a3bed825cb17ed4157

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:30:50 +0000 (03:30 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e -s ours am: 8fe2b32637 am: 0c98432a94 am: 5ff155974f -s ours am: 0fb4bfd5b5 am: 93d6266c04 am: 3512fd433a am: eebe586729 -s ours
am: cb5b3f1045

Change-Id: Icd1c4d0cc713239e8405f118239411798b363ec4

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:27:34 +0000 (03:27 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" 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

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:27:28 +0000 (03:27 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34 am: 28dc531ac7 am: 460561cb28 -s ours am: 107bf18aa3 am: b8b865d786 am: 5b10905e4f
am: ed611c8943 -s ours

Change-Id: I2adc0e26334ae8e113e7b0dcf4007d0d2ade4fa3

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:27:03 +0000 (03:27 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours" into lmp-dev am: 60b2ea959d -s ours am: fcc8d6c900 am: 64998914de am: 0d4475fc01 -s ours am: 5c950df332 am: 1dc5800553 am: e45190af67
am: 72c9d444c3 -s ours

Change-Id: I69d37a74d8d4fe28de81b66a683040a2e67616ad

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:26:37 +0000 (03:26 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours am: 1a3a6accdc -s ours am: 05a136ed33 am: 285c44140c am: 2f7e244816 -s ours am: 01bb2d1aac am: 5d2069d9dc am: 21a74c67ca
am: 3dbe82ee89 -s ours

Change-Id: Ib93c5a5a44158f8c4137b5ff32d60e6c78b04508

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:15:17 +0000 (03:15 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e -s ours am: 8fe2b32637 am: 0c98432a94 am: 5ff155974f -s ours am: 0fb4bfd5b5 am: 93d6266c04 am: 3512fd433a
am: eebe586729 -s ours

Change-Id: Ibf81f4cbec6d85dd7a04f7436f9b37df840f9221

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:12:13 +0000 (03:12 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours am: 8305951cca am: 8eb38035db
am: 1bd3e02a8a

Change-Id: I76fad54c596e03425fae75109ef29409cc08f2e0

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 03:10:46 +0000 (03:10 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34 am: 28dc531ac7 am: 460561cb28 -s ours am: 107bf18aa3 am: b8b865d786
am: 5b10905e4f

Change-Id: Ia877cdf3963562522cfab0c616666fffaa8d49fa

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:57:01 +0000 (02:57 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours am: 8305951cca
am: 8eb38035db

Change-Id: If56e630962e992a8396c8276f2af88d981fdf1a9

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:56:57 +0000 (02:56 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34 am: 28dc531ac7 am: 460561cb28 -s ours am: 107bf18aa3
am: b8b865d786

Change-Id: I33ae4ede54f9e324aae18e7bdc5a9925f330ece5

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:47:32 +0000 (02:47 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours" into lmp-dev am: 60b2ea959d -s ours am: fcc8d6c900 am: 64998914de am: 0d4475fc01 -s ours am: 5c950df332 am: 1dc5800553
am: e45190af67

Change-Id: I7558ac8a10b01f11be01a0fe4fc3a5ed1e37b329

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:47:27 +0000 (02:47 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours am: 1a3a6accdc -s ours am: 05a136ed33 am: 285c44140c am: 2f7e244816 -s ours am: 01bb2d1aac am: 5d2069d9dc
am: 21a74c67ca

Change-Id: I7bdc0971bba6d81b537d791288b3517bd91178a6

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:40:36 +0000 (02:40 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e -s ours am: 8fe2b32637 am: 0c98432a94 am: 5ff155974f -s ours am: 0fb4bfd5b5 am: 93d6266c04
am: 3512fd433a

Change-Id: I4d2bfb289f4cd685a07998df19459c2f5afb254c

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:37:40 +0000 (02:37 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53 -s ours
am: 8305951cca

Change-Id: I92d2761c392537a1e49a5392e224c1809b311f98

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:37:38 +0000 (02:37 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34 am: 28dc531ac7 am: 460561cb28 -s ours
am: 107bf18aa3

Change-Id: Ice840bd87ac5248e89287bd0699442acdbc68681

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:31:26 +0000 (02:31 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours" into lmp-dev am: 60b2ea959d -s ours am: fcc8d6c900 am: 64998914de am: 0d4475fc01 -s ours am: 5c950df332
am: 1dc5800553

Change-Id: I8bca79ec92f18fba4977c3b2179908752b1c0d93

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:31:21 +0000 (02:31 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours am: 1a3a6accdc -s ours am: 05a136ed33 am: 285c44140c am: 2f7e244816 -s ours am: 01bb2d1aac
am: 5d2069d9dc

Change-Id: I5f880aa9e6720349ddd1dae938a6653481e5c65d

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:26:18 +0000 (02:26 +0000)]

Fix setPairingConfirmation permissions issue (1/2) am: df3304a333 am: f8a47ce8ee am: 3ea7d86110 am: ccca20484c am: 4a20ca7bae
am: 8e9f9f4bd8

Change-Id: Iecae3b133a96b2195c64894f55a2330534834d5b

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:24:49 +0000 (02:24 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e -s ours am: 8fe2b32637 am: 0c98432a94 am: 5ff155974f -s ours am: 0fb4bfd5b5
am: 93d6266c04

Change-Id: If5eca2ff7bae19928a0ed411c16da795aea1f183

commit | commitdiff | tree

TreeHugger Robot [Wed, 21 Sep 2016 02:20:12 +0000 (02:20 +0000)]

Merge "Do not downgrade filtered scans to opportunistic" into nyc-mr1-dev

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:09:12 +0000 (02:09 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642
am: 5bc4962e53 -s ours

Change-Id: Ibd76e7968c99b10e21ecfe313fb584a64ac41951

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:09:11 +0000 (02:09 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34 am: 28dc531ac7
am: 460561cb28 -s ours

Change-Id: I44a2426109e19eb972b1cd57563dfb40d3b91561

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:05:37 +0000 (02:05 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours" into lmp-dev am: 60b2ea959d -s ours am: fcc8d6c900 am: 64998914de am: 0d4475fc01 -s ours
am: 5c950df332

Change-Id: Iabd73bf8da9e82107f8825724bb03bfb7bce233a

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:05:33 +0000 (02:05 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours am: 1a3a6accdc -s ours am: 05a136ed33 am: 285c44140c am: 2f7e244816 -s ours
am: 01bb2d1aac

Change-Id: I9a562c2b166eb563436d9f634e1a91ea30a3fcb1

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 02:00:31 +0000 (02:00 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62
am: 56fc3a7642

Change-Id: Ief8c3e89f7c31045239e6f60d801a30525a68874

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:59:21 +0000 (01:59 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e -s ours am: 8fe2b32637 am: 0c98432a94 am: 5ff155974f -s ours
am: 0fb4bfd5b5

Change-Id: I237d2df2c93f744f5cd4b5a51330b2bcf4548216

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:59:20 +0000 (01:59 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34
am: 28dc531ac7

Change-Id: I0066914efcd0dd741b4d27d3633d49248180578e

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:34:33 +0000 (01:34 +0000)]

Fix setPairingConfirmation permissions issue (1/2) am: df3304a333 am: f8a47ce8ee am: 3ea7d86110 am: ccca20484c
am: 4a20ca7bae

Change-Id: I4a9f4408bf601c7e06290210e8e199969af64420

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:04:31 +0000 (01:04 +0000)]

Fix setPairingConfirmation permissions issue (1/2) am: df3304a333 am: f8a47ce8ee am: 3ea7d86110
am: ccca20484c

Change-Id: I549bf83ae4a98257a45c0fee77257cebdbe67b4f

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:03:20 +0000 (01:03 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours" into lmp-dev am: 60b2ea959d -s ours am: fcc8d6c900 am: 64998914de
am: 0d4475fc01 -s ours

Change-Id: Ib1f79cd0b3498aef5a1d797cc5c8b485ac6e2f23

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:03:17 +0000 (01:03 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours am: 1a3a6accdc -s ours am: 05a136ed33 am: 285c44140c
am: 2f7e244816 -s ours

Change-Id: I3e1ca8cdfa6a0072fe6db1b913a6f3330da39edf

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:02:29 +0000 (01:02 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev
am: 0ccca8ac62

Change-Id: I58afc49fbbd9d1308323b9947edd21f56c87b812

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 01:01:43 +0000 (01:01 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am: 3dd11d0a34

Change-Id: I983bc5c8ff9cf7249f9da14ac33595b4e6666a65

commit | commitdiff | tree

Andre Eisenbach [Mon, 19 Sep 2016 19:23:15 +0000 (12:23 -0700)]

Do not downgrade filtered scans to opportunistic

Change-Id: I0d8bcffef9951c03607f7f3b25b79557062a9bec
Fixes: 31308591

commit | commitdiff | tree

TreeHugger Robot [Wed, 21 Sep 2016 00:52:46 +0000 (00:52 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:47:56 +0000 (00:47 +0000)]

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:47:54 +0000 (00:47 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours am: 1a3a6accdc -s ours am: 05a136ed33
am: 285c44140c

Change-Id: I13eaddb2db3073e4a1de8c63480a069cd0b78170

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:45:32 +0000 (00:45 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e -s ours am: 8fe2b32637 am: 0c98432a94
am: 5ff155974f -s ours

Change-Id: Ib4c5f26da7912161d7cad1b23d9172379bf899ba

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:44:52 +0000 (00:44 +0000)]

Fix setPairingConfirmation permissions issue (1/2) am: df3304a333 am: f8a47ce8ee
am: 3ea7d86110

Change-Id: Iba991daf03a221a4fff7a575dcdffd7181a70861

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:42:07 +0000 (00:42 +0000)]

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:42:06 +0000 (00:42 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours am: 1a3a6accdc -s ours
am: 05a136ed33

Change-Id: I791af270ae6d542f72c2751159289082ac49df7f

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:40:04 +0000 (00:40 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e -s ours am: 8fe2b32637
am: 0c98432a94

Change-Id: If2baba2e684084a0ca5b74606675d5f0934a2833

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:37:40 +0000 (00:37 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours" into lmp-dev
am: 60b2ea959d -s ours

Change-Id: Id90024c2155db8b9da83feecf4dddf370e3c610f

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:36:35 +0000 (00:36 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours
am: 1a3a6accdc -s ours

Change-Id: I031461f1073654ffa42a7c2e1fb934631374bc88

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:36:09 +0000 (00:36 +0000)]

Fix setPairingConfirmation permissions issue (1/2) am: df3304a333
am: f8a47ce8ee

Change-Id: Ia73de9a88d22342fe27f5f1e965cc76b088a7a0d

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:21:21 +0000 (00:21 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e -s ours
am: 8fe2b32637

Change-Id: I37ccabcb68fbf3f09ec8114493fddceae90a6a23

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:19:14 +0000 (00:19 +0000)]

Fix setPairingConfirmation permissions issue (1/2)
am: df3304a333

Change-Id: Idc90fd17ec010ba786412d76496cd6f89df139b5

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:12:22 +0000 (00:12 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am: 554f13336e -s ours

Change-Id: I3eafa8236429c8ba5ba54ee5464e3f0fd1622bb7

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 21 Sep 2016 00:05:40 +0000 (00:05 +0000)]

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641 -s ours" into lmp-dev

commit | commitdiff | tree

Ajay Panicker [Wed, 21 Sep 2016 00:04:38 +0000 (00:04 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898
am: 77a38cb641 -s ours

Change-Id: I93e490e6f7ff7ca24e0ef5a321565db21a08f9a4

commit | commitdiff | tree

Ajay Panicker [Tue, 20 Sep 2016 23:56:57 +0000 (23:56 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8
am: 2c3e8b5898

Change-Id: Iddbee8b99be3c4e5c4305d9172ef7f23880a12f6

commit | commitdiff | tree

Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)

setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.

This is restricted to BLUETOOTH_PRIVILEGED permission.

Bug: 29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa

commit | commitdiff | tree

Ajay Panicker [Tue, 20 Sep 2016 23:49:08 +0000 (23:49 +0000)]

[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am: 3ccc668ff8

Change-Id: I5932ce563c8858824a6aa8732f13aecb00d9099e

Import translations. DO NOT MERGE
am: c2d1c05172 -s ours

Change-Id: Ib96d98b85bb34e8771cdc4d30faa25fecaecdfeb

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 31516661
Change-Id: Iec6bfd81cc41ea1a332a9d3547a3318bf28ce707

commit | commitdiff | tree

Ajay Panicker [Wed, 24 Aug 2016 03:23:08 +0000 (20:23 -0700)]

Change MAP to send one new message event when encrypted storage is unlocked

The MAP service will now send one new message event for all messages
when device storage is unlocked instead of sending an event per message.

Bug: 30809925
Change-Id: Iec902c414c3c229043aa089d19871d80d62f557f

commit | commitdiff | tree

Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]

commit | commitdiff | tree

Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]

Fix setPairingConfirmation permissions issue (1/2)

setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.

This is restricted to BLUETOOTH_PRIVILEGED permission.

Bug: 29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa

commit | commitdiff | tree

Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]

commit | commitdiff | tree

Jakub Pawlowski [Thu, 1 Sep 2016 19:04:07 +0000 (12:04 -0700)]

Fix ConcurrentModificationException in GattService.onScanResult

If a scan client is added or removed while iterating over
mRegularScanClients, a concurrent modification exception will be thrown,
because we use a regular hash map.

Use a ConcurrentHashMap instead to fix this issue.

Bug: 31122137
Change-Id: Icbd427ebbe63adc6b5bd4ee950ef3a874ce6067b
(cherry picked from commit 92d52b44ac480a23f98749c3a2884a5b3a23ff32)

commit | commitdiff | tree

Kyle Horimoto [Wed, 31 Aug 2016 00:54:16 +0000 (17:54 -0700)]

ContextMap: Remove connection references when an app is removed

This fixes an issue which could cause a stale Bluetooth address to be
used. The issue would manifest itself when an app is added with a
connection ID, then the app is removed and app is re-added, causing
the original connection ID (which could be stale) to be used.

Bug: 30765855
Change-Id: Idacbbfb07d895bf9276fdd986100e832a54d81b0

commit | commitdiff | tree

Ajay Panicker [Thu, 25 Aug 2016 02:40:11 +0000 (19:40 -0700)]

Fix initMsgList() check to return if encrypted storage is locked

Bug: 30809925
Change-Id: I3f02779116bbae3bfcd006a8bb2012b517cda7e7

commit | commitdiff | tree

Nathan Harold [Tue, 23 Aug 2016 22:23:33 +0000 (15:23 -0700)]

Allocate CallbacksObj Before Initializing A2DP JNI Interface

Bug: 31016704
Change-Id: If3dd4fdbc92e1420bc60910c39771aa549ac5dab

commit | commitdiff | tree

Jakub Pawlowski [Fri, 19 Aug 2016 11:08:18 +0000 (04:08 -0700)]

Fix a deadlock in service discovery callbacks

onSearchCompleted calling gattClientGetGattDbNative directly, might
cause deadlock if the jni_workqueue is full.

Bug: 30835367
Change-Id: I05de735aa189dd2d250f2c5816d38c2ddcabb864

commit | commitdiff | tree

Jakub Pawlowski [Thu, 18 Aug 2016 00:00:02 +0000 (17:00 -0700)]

Fix NPE in permissionCheck

permissionCheck can throw NPE when notification is received before
GATT database is discovered. Assume that permission is granted when
receiving notifications for unknown characteristic.

Bug: 30853729
Change-Id: I02aab1197b036584b2021d76f290c2c57db24a19

Import translations. DO NOT MERGE am: dbd254d610 -s ours am: d1b0e4d9f9 -s ours am: 7b0ed70cfa -s ours am: fafbbfeb52 -s ours
am: f6f36780e0 -s ours

Change-Id: Id7faf53edbe496e7012d03f820f147748444a020

Import translations. DO NOT MERGE am: dbd254d610 -s ours am: d1b0e4d9f9 -s ours am: 7b0ed70cfa -s ours
am: fafbbfeb52 -s ours

Change-Id: I694d7506b62ef522cb5c335509a2999d4305b312

Import translations. DO NOT MERGE am: dbd254d610 -s ours am: d1b0e4d9f9 -s ours
am: 7b0ed70cfa -s ours

Change-Id: I89833c18649ec9ff498212a810a998463dab109f

Import translations. DO NOT MERGE am: dbd254d610 -s ours
am: d1b0e4d9f9 -s ours

Change-Id: I9add542263c74693f2176a75ebafb8983c40fbe3

Import translations. DO NOT MERGE am: b8206529c7 -s ours am: 288ba25e96 -s ours am: fff4c2d598 -s ours
am: 221dba796e -s ours

Change-Id: Id2a11020ff9c9b64f86a0dd51ecac8a449e8dea9

Import translations. DO NOT MERGE am: 74a94150bd -s ours
am: 1769805b90 -s ours

Change-Id: Ic527f9273311d42e045c59521d4813e1c5ab5c42

Import translations. DO NOT MERGE am: b8206529c7 -s ours am: 288ba25e96 -s ours
am: fff4c2d598 -s ours

Change-Id: Ic39f4a13c50127555b4aa7132481c2e0735dfdb0

Import translations. DO NOT MERGE
am: dbd254d610 -s ours

Change-Id: If21da5f4a9010847968359db998e85e1336d5d03

Import translations. DO NOT MERGE am: b8206529c7 -s ours
am: 288ba25e96 -s ours

Change-Id: I843ee9a4f9de59652b5556a9c1f19b66d992b8e5

Import translations. DO NOT MERGE
am: b8206529c7 -s ours

Change-Id: I69d67b67bb984916cc6793f76c620390ff44de47

Import translations. DO NOT MERGE
am: 74a94150bd -s ours

Change-Id: Ied8ab2b2df2b993d57b89e820aabdf43a5627be8

Import translations. DO NOT MERGE
am: 3d66fe4171 -s ours

Change-Id: I5f4d02e1862ae2b89b1cab7f43efb4d0c3ceb81e

Import translations. DO NOT MERGE

Change-Id: I250197560618852d32013e4280fa1cb0ce835bb6
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

Change-Id: I7e7ebd7b79f42c7ffd05c0b323cd706f8ed02f61
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

Change-Id: Ia34ce6a2225eb57e1144dfe76cc54dd71e3e6af5
Auto-generated-cl: translation import

Import translations. DO NOT MERGE

Change-Id: Ic8ffd8d1714ac2266d19bac540e4b9a7ac5698bc
Auto-generated-cl: translation import