OSDN Git Service
Ajay Panicker [Wed, 12 Apr 2017 19:49:00 +0000 (19:49 +0000)]
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev am:
2a2612335a am:
b04d7559e4 am:
5bd1e81103
am:
074cd25c31
Change-Id: I7bcf2f77f5ba100f9926f1932811d54e385c7587
Ajay Panicker [Wed, 12 Apr 2017 19:43:59 +0000 (19:43 +0000)]
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev am:
2a2612335a am:
b04d7559e4
am:
5bd1e81103
Change-Id: Ieac69289983354daef9be1b21627b802576ee289
Ajay Panicker [Wed, 12 Apr 2017 19:37:28 +0000 (19:37 +0000)]
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev am:
2a2612335a
am:
b04d7559e4
Change-Id: I14d62e2bbd98d5d7e6f07de749ea82c14c5d4af2
Ajay Panicker [Wed, 12 Apr 2017 19:32:29 +0000 (19:32 +0000)]
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into nyc-dev
am:
159bb07e8f
Change-Id: Iaf13dd261e5dc91f845d31d6cd8a7cab9bbf5e86
Ajay Panicker [Wed, 12 Apr 2017 19:32:29 +0000 (19:32 +0000)]
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev
am:
2a2612335a
Change-Id: I8d4d89273541425351b4d46690156fa60cc98c92
Ajay Panicker [Wed, 12 Apr 2017 19:24:24 +0000 (19:24 +0000)]
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into nyc-dev
Ajay Panicker [Wed, 12 Apr 2017 19:23:28 +0000 (19:23 +0000)]
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev
Jack He [Wed, 12 Apr 2017 01:39:51 +0000 (01:39 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a am:
15fd305d28 am:
239c976247 -s ours am:
89ad54e8cf am:
45e6bb94bf am:
f955b96701 am:
4a7f0f8140 am:
cd2a70b8ce am:
76f57b2109 am:
db4157b0ae
am:
d8ae136bc3
Change-Id: Ib9075dc2c234c9ff64750438346bc5729ab5b09b
Jack He [Wed, 12 Apr 2017 01:34:51 +0000 (01:34 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a am:
15fd305d28 am:
239c976247 -s ours am:
89ad54e8cf am:
45e6bb94bf am:
f955b96701 am:
4a7f0f8140 am:
cd2a70b8ce am:
76f57b2109
am:
db4157b0ae
Change-Id: I2592b96b29987a35cc7b95bd4ec818d76e03af2a
Jack He [Wed, 12 Apr 2017 01:30:19 +0000 (01:30 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a am:
15fd305d28 am:
239c976247 -s ours am:
89ad54e8cf am:
45e6bb94bf am:
f955b96701 am:
4a7f0f8140 am:
cd2a70b8ce
am:
76f57b2109
Change-Id: I13fa2127dae05b2b9919533ae0df464cd44ec13b
Jack He [Wed, 12 Apr 2017 01:25:19 +0000 (01:25 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a am:
15fd305d28 am:
239c976247 -s ours am:
89ad54e8cf am:
45e6bb94bf am:
f955b96701 am:
4a7f0f8140
am:
cd2a70b8ce
Change-Id: Ie29683afcfd92a235443372ca1a710f3331eb402
Jack He [Wed, 12 Apr 2017 01:20:20 +0000 (01:20 +0000)]
OPP: Restrict file based URI access to external storage am:
ed63da62d4 am:
34bb42918c am:
486b64fef4 -s ours am:
48b3b4713c am:
69a19627ff am:
c7cc23f77c am:
65ba1f1712
am:
b95bd54199
Change-Id: Iffa0a72ac38bb22aedcbe8f250b4acbf84ef8bcb
Jack He [Wed, 12 Apr 2017 01:20:19 +0000 (01:20 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a am:
15fd305d28 am:
239c976247 -s ours am:
89ad54e8cf am:
45e6bb94bf am:
f955b96701
am:
4a7f0f8140
Change-Id: Iaf52b20bf0906521217ec50eed8e227c20d5d816
Jack He [Wed, 12 Apr 2017 01:15:19 +0000 (01:15 +0000)]
OPP: Restrict file based URI access to external storage am:
ed63da62d4 am:
34bb42918c am:
486b64fef4 -s ours am:
48b3b4713c am:
69a19627ff am:
c7cc23f77c
am:
65ba1f1712
Change-Id: Ife594b8407001347b35a6746cf6cdb055d42b4c1
Jack He [Wed, 12 Apr 2017 01:15:18 +0000 (01:15 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a am:
15fd305d28 am:
239c976247 -s ours am:
89ad54e8cf am:
45e6bb94bf
am:
f955b96701
Change-Id: I847117a03d6d6d9b9074068c64573ea749db345c
Jack He [Wed, 12 Apr 2017 01:10:48 +0000 (01:10 +0000)]
OPP: Restrict file based URI access to external storage am:
ed63da62d4 am:
34bb42918c am:
486b64fef4 -s ours am:
48b3b4713c am:
69a19627ff
am:
c7cc23f77c
Change-Id: I6c6fe19c797911138e0cf6ed681376b2c665ac90
Jack He [Wed, 12 Apr 2017 01:10:19 +0000 (01:10 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a am:
15fd305d28 am:
239c976247 -s ours am:
89ad54e8cf
am:
45e6bb94bf
Change-Id: Ib523131b3f71fcfb232e2f322ac1e5708f75e41c
Jack He [Wed, 12 Apr 2017 01:05:18 +0000 (01:05 +0000)]
OPP: Restrict file based URI access to external storage am:
ed63da62d4 am:
34bb42918c am:
486b64fef4 -s ours am:
48b3b4713c
am:
69a19627ff
Change-Id: Iab75ab777be7daec7404fc569c9eb6c2d880e868
Jack He [Wed, 12 Apr 2017 01:05:18 +0000 (01:05 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a am:
15fd305d28 am:
239c976247 -s ours
am:
89ad54e8cf
Change-Id: I09641c3a17766d9aff407fcf18e76a88021ded21
Jack He [Wed, 12 Apr 2017 00:59:48 +0000 (00:59 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a am:
15fd305d28
am:
239c976247 -s ours
Change-Id: If8008aae195e10e0f199ce66ff29bd3b8aa8b805
Jack He [Wed, 12 Apr 2017 00:59:47 +0000 (00:59 +0000)]
OPP: Restrict file based URI access to external storage am:
ed63da62d4 am:
34bb42918c am:
486b64fef4 -s ours
am:
48b3b4713c
Change-Id: If1dc9157b83adb3d542754b131c121974c26a308
Jack He [Wed, 12 Apr 2017 00:54:47 +0000 (00:54 +0000)]
OPP: Restrict file based URI access to external storage am:
ed63da62d4 am:
34bb42918c
am:
486b64fef4 -s ours
Change-Id: I0c36d4d6711f2e6233b818856046a3c7cddffa59
Jack He [Wed, 12 Apr 2017 00:49:46 +0000 (00:49 +0000)]
OPP: Restrict file based URI access to external storage am:
3edd7f0a8a
am:
15fd305d28
Change-Id: Id2ccd43f6a995a5f566ba619cad43db7d55b1b65
Jack He [Wed, 12 Apr 2017 00:45:47 +0000 (00:45 +0000)]
OPP: Restrict file based URI access to external storage am:
ed63da62d4
am:
34bb42918c
Change-Id: I60571e2c6e55d59d53b33d8417a8ecab600fab36
Jack He [Wed, 12 Apr 2017 00:44:46 +0000 (00:44 +0000)]
OPP: Restrict file based URI access to external storage
am:
3edd7f0a8a
Change-Id: Iaff8efe97f4d33419f2f4ada43716b09f164dc6d
Jack He [Wed, 12 Apr 2017 00:40:16 +0000 (00:40 +0000)]
OPP: Restrict file based URI access to external storage
am:
ed63da62d4
Change-Id: I92e5e837fb7055356dced3a747248a83d3f24531
Jack He [Wed, 12 Apr 2017 00:35:45 +0000 (00:35 +0000)]
OPP: Restrict file based URI access to external storage am:
496ed8db35 am:
15668149a8 am:
a71f79263a am:
93954875eb
am:
903d1c3417 -s ours
Change-Id: Id844656ef7e558d1e630d4309e3aec0aa9c115ed
Jack He [Wed, 12 Apr 2017 00:26:45 +0000 (00:26 +0000)]
OPP: Restrict file based URI access to external storage am:
496ed8db35 am:
15668149a8 am:
a71f79263a
am:
93954875eb
Change-Id: I2ad5e3626f111cf39b7b6e322730f97f857e8380
Jack He [Wed, 12 Apr 2017 00:21:44 +0000 (00:21 +0000)]
OPP: Restrict file based URI access to external storage am:
496ed8db35 am:
15668149a8
am:
a71f79263a
Change-Id: I15e1274203c79b903d2044b730132ccb89bf9ca7
Jack He [Wed, 12 Apr 2017 00:18:14 +0000 (00:18 +0000)]
OPP: Restrict file based URI access to external storage am:
496ed8db35
am:
15668149a8
Change-Id: Ide31d0768117a74029ea2cffacb7252773a9a04c
Jack He [Wed, 12 Apr 2017 00:13:43 +0000 (00:13 +0000)]
OPP: Restrict file based URI access to external storage
am:
496ed8db35
Change-Id: I57fc9bdc04ef2e61f254d150d6decd0fff505fa0
Ajay Panicker [Tue, 11 Apr 2017 21:45:40 +0000 (14:45 -0700)]
Prevent OPP from opening files that aren't sent over Bluetooth
Before this patch an app could send an open intent to
BluetoothOppTransferService using a fake content provider to gain external
read and write access. We fix this by checking the Uri of the file before
opening it to see if it originated from the Bluetooth Share content provider.
We also stop graning write access to apps that we use to view the file.
Bug:
35385327
Test: PoC found in bug
Change-Id: Iad85490a0306b3e70767285393b204be22b11511
Ajay Panicker [Tue, 11 Apr 2017 21:45:40 +0000 (14:45 -0700)]
Prevent OPP from opening files that aren't sent over Bluetooth
Before this patch an app could send an open intent to
BluetoothOppTransferService using a fake content provider to gain external
read and write access. We fix this by checking the Uri of the file before
opening it to see if it originated from the Bluetooth Share content provider.
We also stop graning write access to apps that we use to view the file.
Bug:
35385327
Test: PoC found in bug
Change-Id: Iad85490a0306b3e70767285393b204be22b11511
Jack He [Mon, 13 Mar 2017 17:37:06 +0000 (10:37 -0700)]
OPP: Restrict file based URI access to external storage
* Allow only external storage paths in file based URI in
BluetoothOppSendFileInfo when the file send request comes from an
external source
* Fix a potential NPE when using Uri.getPath()
Bug:
35310991
Test: Make, test various cases of Bluetooth file share
Change-Id: I8ff00d63d3c880667302f8d7ff8eaa0c0b533921
(cherry picked from commit
3edd7f0a8aadf2f44bc62ea5b567c74d39a534c8)
Jack He [Mon, 13 Mar 2017 17:37:06 +0000 (10:37 -0700)]
OPP: Restrict file based URI access to external storage
* Allow only external storage paths in file based URI in
BluetoothOppSendFileInfo when the file send request comes from an
external source
* Fix a potential NPE when using Uri.getPath()
Bug:
35310991
Test: Make, test various cases of Bluetooth file share
Change-Id: I8ff00d63d3c880667302f8d7ff8eaa0c0b533921
(cherry picked from commit
3edd7f0a8aadf2f44bc62ea5b567c74d39a534c8)
Jack He [Mon, 13 Mar 2017 17:37:06 +0000 (10:37 -0700)]
OPP: Restrict file based URI access to external storage
* Allow only external storage paths in file based URI in
BluetoothOppSendFileInfo when the file send request comes from an
external source
* Fix a potential NPE when using Uri.getPath()
Bug:
35310991
Test: Make, test various cases of Bluetooth file share
Change-Id: I8ff00d63d3c880667302f8d7ff8eaa0c0b533921
(cherry picked from commit
3edd7f0a8aadf2f44bc62ea5b567c74d39a534c8)
Jack He [Mon, 13 Mar 2017 17:37:06 +0000 (10:37 -0700)]
OPP: Restrict file based URI access to external storage
* Allow only external storage paths in file based URI in
BluetoothOppSendFileInfo when the file send request comes from an
external source
* Fix a potential NPE when using Uri.getPath()
Bug:
35310991
Test: Make, test various cases of Bluetooth file share
Change-Id: I8ff00d63d3c880667302f8d7ff8eaa0c0b533921
Ajay Panicker [Tue, 6 Dec 2016 17:57:21 +0000 (17:57 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff am:
8b498077ce am:
48f7628944 am:
5bdf052376
am:
850fec4b84
Change-Id: Id621186af8281ffe908cc0c5b5f55efb0cc08da2
Ajay Panicker [Tue, 6 Dec 2016 17:53:21 +0000 (17:53 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff am:
8b498077ce am:
48f7628944
am:
5bdf052376
Change-Id: Ie8a36d18260805dc547836bbc498eb2a624c9b66
Ajay Panicker [Tue, 6 Dec 2016 17:48:51 +0000 (17:48 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff am:
8b498077ce
am:
48f7628944
Change-Id: Iedc33b52ba742afa8aea3c550d97880aa986538e
Ajay Panicker [Tue, 6 Dec 2016 17:45:20 +0000 (17:45 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff
am:
8b498077ce
Change-Id: I44ffb224cf88bd92ec7a590bc3f0d327050e5109
Ajay Panicker [Tue, 6 Dec 2016 17:41:20 +0000 (17:41 +0000)]
resolve merge conflicts of
f606637 to mnc-dev
am:
846c09a4ff
Change-Id: Idf327a36530c6ead418310e25d9e4944687aa807
Ajay Panicker [Tue, 6 Dec 2016 03:23:49 +0000 (19:23 -0800)]
resolve merge conflicts of
f606637 to mnc-dev
Change-Id: I2e516b0eb36973e097d7837479377a7063b16765
Ajay Panicker [Tue, 6 Dec 2016 02:52:26 +0000 (02:52 +0000)]
Remove MANAGE_DOCUMENTS permission as it isn't needed am:
c37f27194b
am:
2f1531712d
Change-Id: I7544a341b02cb6a6820d0f16d9d7ba0011f263ee
Ajay Panicker [Tue, 6 Dec 2016 02:49:56 +0000 (02:49 +0000)]
Remove MANAGE_DOCUMENTS permission as it isn't needed
am:
c37f27194b
Change-Id: I60c7f1ac1f5263751882b93bd20635bca05aba10
Ajay Panicker [Thu, 17 Nov 2016 23:50:36 +0000 (15:50 -0800)]
Remove MANAGE_DOCUMENTS permission as it isn't needed
Bug:
32612586
Change-Id: Iebe7dc9b198ce99d5921f5a349ba9d5d4424d156
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Ajay Panicker [Wed, 21 Sep 2016 00:47:56 +0000 (00: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
Change-Id: I90fbf86ed01f1b22bc3bc251241250d1df900332
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
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
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
Ajay Panicker [Wed, 21 Sep 2016 00:42:07 +0000 (00:42 +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
Change-Id: I0422c6b824af052ba01bec484f400a2ff91d9890
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
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
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
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
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
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
Ajay Panicker [Wed, 21 Sep 2016 00:19:14 +0000 (00:19 +0000)]
Fix setPairingConfirmation permissions issue (1/2)
am:
df3304a333
Change-Id: Idc90fd17ec010ba786412d76496cd6f89df139b5
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
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
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
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
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
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
OSDN Git Service
