OSDN Git Service

android-x86/packages-apps-Bluetooth.git
7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34...
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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34...
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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34...
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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34...
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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34...
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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3dd11d0a34
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

7 years agoFix setPairingConfirmation permissions issue (1/2) am: df3304a333 am: f8a47ce8ee...
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

7 years agoFix setPairingConfirmation permissions issue (1/2) am: df3304a333 am: f8a47ce8ee...
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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
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

7 years agoFix setPairingConfirmation permissions issue (1/2) am: df3304a333 am: f8a47ce8ee
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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

7 years agoFix setPairingConfirmation permissions issue (1/2) am: df3304a333
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 554f13336e...
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

7 years agoFix setPairingConfirmation permissions issue (1/2)
Ajay Panicker [Wed, 21 Sep 2016 00:19:14 +0000 (00:19 +0000)]
Fix setPairingConfirmation permissions issue (1/2)
am: df3304a333

Change-Id: Idc90fd17ec010ba786412d76496cd6f89df139b5

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

7 years agoMerge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8...
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

7 years ago[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8
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

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

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 17 Sep 2016 01:49:17 +0000 (18:49 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 31516661
Change-Id: Iec6bfd81cc41ea1a332a9d3547a3318bf28ce707

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

7 years agoFix setPairingConfirmation permissions issue (1/2)
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

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

8 years agoImport translations. DO NOT MERGE am: dbd254d610 -s ours am: d1b0e4d9f9 -s ours...
Bill Yi [Mon, 15 Aug 2016 21:00:47 +0000 (21:00 +0000)]
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

8 years agoImport translations. DO NOT MERGE am: dbd254d610 -s ours am: d1b0e4d9f9 -s ours...
Bill Yi [Mon, 15 Aug 2016 20:47:19 +0000 (20:47 +0000)]
Import translations. DO NOT MERGE am: dbd254d610  -s ours am: d1b0e4d9f9  -s ours am: 7b0ed70cfa  -s ours
am: fafbbfeb52  -s ours

Change-Id: I694d7506b62ef522cb5c335509a2999d4305b312

8 years agoImport translations. DO NOT MERGE am: dbd254d610 -s ours am: d1b0e4d9f9 -s ours
Bill Yi [Mon, 15 Aug 2016 20:42:46 +0000 (20:42 +0000)]
Import translations. DO NOT MERGE am: dbd254d610  -s ours am: d1b0e4d9f9  -s ours
am: 7b0ed70cfa  -s ours

Change-Id: I89833c18649ec9ff498212a810a998463dab109f

8 years agoImport translations. DO NOT MERGE am: dbd254d610 -s ours
Bill Yi [Mon, 15 Aug 2016 20:38:46 +0000 (20:38 +0000)]
Import translations. DO NOT MERGE am: dbd254d610  -s ours
am: d1b0e4d9f9  -s ours

Change-Id: I9add542263c74693f2176a75ebafb8983c40fbe3

8 years agoImport translations. DO NOT MERGE am: b8206529c7 -s ours am: 288ba25e96 -s ours...
Bill Yi [Mon, 15 Aug 2016 20:29:24 +0000 (20:29 +0000)]
Import translations. DO NOT MERGE am: b8206529c7  -s ours am: 288ba25e96  -s ours am: fff4c2d598  -s ours
am: 221dba796e  -s ours

Change-Id: Id2a11020ff9c9b64f86a0dd51ecac8a449e8dea9

8 years agoImport translations. DO NOT MERGE am: 74a94150bd -s ours
Bill Yi [Mon, 15 Aug 2016 20:29:24 +0000 (20:29 +0000)]
Import translations. DO NOT MERGE am: 74a94150bd  -s ours
am: 1769805b90  -s ours

Change-Id: Ic527f9273311d42e045c59521d4813e1c5ab5c42

8 years agoImport translations. DO NOT MERGE am: b8206529c7 -s ours am: 288ba25e96 -s ours
Bill Yi [Mon, 15 Aug 2016 20:22:34 +0000 (20:22 +0000)]
Import translations. DO NOT MERGE am: b8206529c7  -s ours am: 288ba25e96  -s ours
am: fff4c2d598  -s ours

Change-Id: Ic39f4a13c50127555b4aa7132481c2e0735dfdb0

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 20:21:19 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE
am: dbd254d610  -s ours

Change-Id: If21da5f4a9010847968359db998e85e1336d5d03

8 years agoImport translations. DO NOT MERGE am: b8206529c7 -s ours
Bill Yi [Mon, 15 Aug 2016 20:21:14 +0000 (20:21 +0000)]
Import translations. DO NOT MERGE am: b8206529c7  -s ours
am: 288ba25e96  -s ours

Change-Id: I843ee9a4f9de59652b5556a9c1f19b66d992b8e5

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 20:17:17 +0000 (20:17 +0000)]
Import translations. DO NOT MERGE
am: b8206529c7  -s ours

Change-Id: I69d67b67bb984916cc6793f76c620390ff44de47

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 20:17:14 +0000 (20:17 +0000)]
Import translations. DO NOT MERGE
am: 74a94150bd  -s ours

Change-Id: Ied8ab2b2df2b993d57b89e820aabdf43a5627be8

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 20:13:44 +0000 (20:13 +0000)]
Import translations. DO NOT MERGE
am: 3d66fe4171  -s ours

Change-Id: I5f4d02e1862ae2b89b1cab7f43efb4d0c3ceb81e

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 17:31:01 +0000 (10:31 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 17:29:16 +0000 (10:29 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 17:23:14 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 17:20:20 +0000 (10:20 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Aug 2016 17:18:53 +0000 (10:18 -0700)]
Import translations. DO NOT MERGE

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

8 years agoRemoteDevices: Optimize adding new remote devices
Myles Watson [Fri, 15 Jul 2016 00:43:11 +0000 (17:43 -0700)]
RemoteDevices: Optimize adding new remote devices

RemoteDevices keeps track of the Bluetooth devices which have been
seen since the Bluetooth stack was initialized.  Each time a remote
device is discovered, it is added to a hash map.  When the size of the
hash map grows beyond a few hundred devices, the performance degrades.

This patch:
 - creates the address string once per search
  reducing the average search time with 300 devices from ~20ms to ~1ms
 - uses the hash of the address string to search
  further reducing the time with 1200 devices from ~2ms to ~1ms

HashMap<BluetoothDevice, DeviceProperties> became
 HashMap<String, DeviceProperties>

mDevice now stores the BluetoothDevice in each instance of
DeviceProperties.

TEST: Used System.nanoTime() to measure the elapsed time of
      getDeviceProperties()
Bug: 30828758

Change-Id: Id44886143fb2910955294341d4938d638c72f7f9
Signed-off-by: Myles Watson <mylesgw@google.com>
(cherry picked from commit 1fb90c4f25ba33b0f951e6ac092d05f85d355e2f)

8 years agoPrevent LE scanning apps from being wrongflully downgraded to opportunistic
Ajay Panicker [Thu, 4 Aug 2016 02:18:50 +0000 (19:18 -0700)]
Prevent LE scanning apps from being wrongflully downgraded to opportunistic

Bug: 30648104
Change-Id: I9d749a20eefdbeb126fa25a425d636205a22b2ef

8 years agoPrevent OPP connections from staying open forever
Ajay Panicker [Fri, 5 Aug 2016 20:20:55 +0000 (13:20 -0700)]
Prevent OPP connections from staying open forever

OPP connections could possibly stay open forever if no response to
the put request is received after transfering very small files. Fixed
by waiting to clear the timeout message until after the response is
received.

Bug: 30645605
Change-Id: I0743685e98e74195b99eff7012dc8c8044c425ca

8 years agoProtect against SecurityException generated by query
Ajay Panicker [Wed, 3 Aug 2016 01:53:00 +0000 (18:53 -0700)]
Protect against SecurityException generated by query

Bug: 30444661
Change-Id: I1d93645f1d4475cf603cda8bb28df0b960ccb445

8 years agoMove file lookup to its own thread for beaming
Ajay Panicker [Tue, 26 Jul 2016 18:54:21 +0000 (11:54 -0700)]
Move file lookup to its own thread for beaming

Bug: 28973021
Change-Id: I40f6d32ffadd58e60dbd1e44802a629b9fab64e4

8 years agoFix bugs in play status and play pos notifications
Marie Janssen [Tue, 26 Jul 2016 23:23:54 +0000 (16:23 -0700)]
Fix bugs in play status and play pos notifications

Fix multiple issues with status notificatios:
  * Playback state was not being sent when state wasn't sent
    accompanying a metadata change
  * Play state was being sent without an update
  * Position was being sent without a change and with the wrong
    indicator
  * Position was not being scheduled for update when playing.
  * Position was being scheduled for update when paused / stopped.

Bug: 30459664
Bug: 29400658
Bug: 28639383
Change-Id: Ic550dcab0430be45187b0267cc77875740388a2a
(cherry picked from commit fa81085f6cda571d56c62eb1d646ae4a52cb90ee)

8 years agoChange URI accessed to properly update read status
Ajay Panicker [Thu, 28 Jul 2016 00:18:35 +0000 (17:18 -0700)]
Change URI accessed to properly update read status

Bug: 28970262
Change-Id: I07d9ab24d10396baa4ddbfbdfad5b1eec1b8e9d5

8 years agoMerge "Don't use SMS database until after the phone is unlocked" into nyc-mr1-dev
Ajay Panicker [Wed, 27 Jul 2016 01:14:03 +0000 (01:14 +0000)]
Merge "Don't use SMS database until after the phone is unlocked" into nyc-mr1-dev

8 years agoMerge "Add foreground flag to AG_CALL_CHANGED broadcast intent." into nyc-mr1-dev
Chenjie Luo [Tue, 26 Jul 2016 23:32:44 +0000 (23:32 +0000)]
Merge "Add foreground flag to AG_CALL_CHANGED broadcast intent." into nyc-mr1-dev

8 years agoDon't use SMS database until after the phone is unlocked
Ajay Panicker [Thu, 21 Jul 2016 17:39:14 +0000 (10:39 -0700)]
Don't use SMS database until after the phone is unlocked

When the device is encrypted and a passcode is set,
the SMS database isn't available and the MAP service
crashes when trying to access it. The service will now
respond with OBEX_SERVICE_UNAVAILABLE until the phone
is unlocked. At this point, the SMS database will
notify the content observer that all the messages are
available, and send corresponding events.

Bug: 29990836
Change-Id: I53f12d0e114212d94f16b56df7c7dbe73f6254df

8 years agoAdd foreground flag to AG_CALL_CHANGED broadcast intent.
Lianchao Song [Fri, 8 Jul 2016 11:07:21 +0000 (19:07 +0800)]
Add foreground flag to AG_CALL_CHANGED broadcast intent.

To fix the issue that the watch is still ringing after answer an
incoming call on phone. It is caused by the ACTION_CALL_CHANGED
broadcast reception processing delayed.

Bug:29931814

Change-Id: I8d8f297c3a13dfe65674eca94724a50d82618f5e
Signed-off-by: m00230717 <m00230717@notesmail.huawei.com>
(cherry picked from commit 6b375a456e971ae8ef7ddf1d7d41876ca39e44bc)

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Jul 2016 01:56:51 +0000 (18:56 -0700)]
Import translations. DO NOT MERGE

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

8 years agoFix AVRCP crash, position and state tracking
Marie Janssen [Mon, 18 Jul 2016 14:22:39 +0000 (14:22 +0000)]
Fix AVRCP crash, position and state tracking
am: 9b04e432de

Change-Id: Ibccde59d643df4ed3fe869eda05d34891f80147d

8 years agoRefactor playback position tracking
Marie Janssen [Mon, 18 Jul 2016 14:22:21 +0000 (14:22 +0000)]
Refactor playback position tracking
am: 2be5946285  -s ours

Change-Id: Ib67100dd6a0a21aee2c8fa5644ad932ce1dd5746

8 years agoFix AVRCP crash, position and state tracking
Marie Janssen [Tue, 12 Jul 2016 14:53:54 +0000 (07:53 -0700)]
Fix AVRCP crash, position and state tracking

When the MediaController goes away (media stops) a NPE would cause a
crash.

Initialize the position so that an initial notification gets sent
when position is requested, send it when the music is paused, and
send play state whenever the app sends us a play state update.

Bug: 30039744
Bug: 29416450
Change-Id: I44397b3dc40d328fa75a2c15875fad298a5090dd
(cherry picked from commit 84d3f084d4d1a65eb7a481e5a7fe4a6ac827be7b)

8 years agoRefactor playback position tracking
Marie Janssen [Thu, 30 Jun 2016 21:29:18 +0000 (14:29 -0700)]
Refactor playback position tracking

Use PlaybackState directly to track the position through time.  Update
the state when necessary (track changes, etc.)

Remove complex logic and centralize sending of Play Position
Notificaiton response and scheduling.

Update dumpsys and add current package session.

Bug: 29416450
Bug: 29606822

Change-Id: Ie82b48d6d7f9e1a05b64835731433d05a3a3a41a
(cherry picked from commit eb9e6ef0ecde4929fa2df1aa4cc8954d88d3b452)

8 years agoMAP: Remove redundant call to sendShutdownMessage to prevent crash
Hemant Gupta [Mon, 6 Jun 2016 17:33:19 +0000 (23:03 +0530)]
MAP: Remove redundant call to sendShutdownMessage to prevent crash

Usecase:
Perform BT off/on repeatedly.

Issue:
Bluetooth crashes.

Fix:
Remove redundant call to sendShutdownMessage() from stop API to prevent
MapServiceMessageHandler becoming null and being dereferenced.

Bug: 29149190
Change-Id: I739664975043c4a1895fd2113869c87cdb704338
(cherry picked from commit 5847ca3c7068500b1f2a4cd4cf5ff373347f8fbf)

8 years agoMerge "PAN: Avoid reconfiguration of bt-pan interface in NAP role" into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 21:00:21 +0000 (21:00 +0000)]
Merge "PAN: Avoid reconfiguration of bt-pan interface in NAP role" into nyc-mr1-dev

8 years agoPAN: Avoid reconfiguration of bt-pan interface in NAP role
Nitin Shivpure [Thu, 16 Jun 2016 15:15:29 +0000 (20:45 +0530)]
PAN: Avoid reconfiguration of bt-pan interface in NAP role

Issue:
Browsing is not working with multiple remote PANU Device(s).

Root Cause:
When the 1st remote PANU is connected, the bt-pan interface gets
configured. As soon as 2nd PANU is connected, the bt-pan interface
goes into a bad state. The second device is able to write Ethernet
packets on the bt-pan interface (TUN driver) after reconfiguration,
but it is unable to read Ethernet packets from the interface.

Fix:
If the bt-pan interface is already configured in the NAP role,
then do not reconfigure bt-pan when the 2nd PANU is connected.

Bug: 29992925
Change-Id: Ib6e0cb91d573649af45ffe25c7095a4bd74a5022

8 years agoFix AVRCP crash, position and state tracking
Marie Janssen [Tue, 12 Jul 2016 14:53:54 +0000 (07:53 -0700)]
Fix AVRCP crash, position and state tracking

When the MediaController goes away (media stops) a NPE would cause a
crash.

Initialize the position so that an initial notification gets sent
when position is requested, send it when the music is paused, and
send play state whenever the app sends us a play state update.

Bug: 30039744
Bug: 29416450
Change-Id: I44397b3dc40d328fa75a2c15875fad298a5090dd

8 years agoRefactor playback position tracking
Marie Janssen [Thu, 30 Jun 2016 21:29:18 +0000 (14:29 -0700)]
Refactor playback position tracking

Use PlaybackState directly to track the position through time.  Update
the state when necessary (track changes, etc.)

Remove complex logic and centralize sending of Play Position
Notificaiton response and scheduling.

Update dumpsys and add current package session.

Bug: 29416450
Bug: 29606822

Change-Id: Ie82b48d6d7f9e1a05b64835731433d05a3a3a41a

8 years agoAllow MAP to accept and list draft messages without recipients
Ajay Panicker [Wed, 6 Jul 2016 19:20:02 +0000 (12:20 -0700)]
Allow MAP to accept and list draft messages without recipients

Bug: 28970268
Change-Id: I5bdef6cd67708036352ed37ea35b027d6a54af03

8 years agoCheck for call/call setup state before creating SCO
Satish Kodishala [Wed, 4 May 2016 14:11:24 +0000 (19:41 +0530)]
Check for call/call setup state before creating SCO

Use case:
1. Run HFP AG PTS test cases.
or
1. Pair and connect phone with Sony xba-bt75 Bluetooth headset.
2. Make incoming call and accept it.

Failure:
PTS test cases fail. There will be no call audio on
Sony xba-bt75 headset.

Root cause:
Telephony asking to create SCO before incoming call
is accepted.

Fix:
If there is no active/held call, outgoing call setup
in progress, we should not create SCO. Telephony will
ask to create SCO for incoming call before the call
becomes active, this creates IOT issues and fail below
PTS test cases.
TC_AG_ACC_BV_08_I
TC_AG_ACC_BV_10_I
TC_AG_ACC_BV_11_I
TC_AG_ACC_BV_12_I
TC_AG_ACC_BV_13_I
TC_AG_ACC_BV_14_I

Bug: 29417803
Change-Id: I0c1002b31da65cbc0b0e74b590468d37ea51d065
(cherry picked from commit c01a35486da7fa801b4cb6ad4d1bb7702ab4f272)

8 years agoSet the Adapter Service onCreate()
Pavlin Radoslavov [Sat, 25 Jun 2016 00:31:52 +0000 (17:31 -0700)]
Set the Adapter Service onCreate()

We should call setAdapterService(this) inside onCreate() instead of
inside BleOnProcessStart(). The former is more robust.

Change-Id: Ide1d98dfdde148645f3efe246e6fbf95659195a7

8 years agoUse the live AdapterService in ProfileService.
Calvin On [Fri, 24 Jun 2016 00:10:59 +0000 (00:10 +0000)]
Use the live AdapterService in ProfileService.
am: d4152d61ac

Change-Id: I3e9f60f8589a62640055654d25fab66d270fec54

8 years agoUse the live AdapterService in ProfileService.
Calvin On [Wed, 22 Jun 2016 21:23:49 +0000 (14:23 -0700)]
Use the live AdapterService in ProfileService.

Previously, if AdapterService was null while ProfileService is
created, the ProfileService would never work because it would
store a stale reference to the AdapterService.

This change ensures that ProfileService accesses the current
AdapterService at any given time.

Bug: 29519304
Bug: 29610505

Change-Id: I25efbf4a58932f519ac9f0b89c4112a442c994eb
(cherry picked from commit b55c6a1f4ce60ad552e9c9a6d06fab6781a4dadb)

8 years agoMerge "Use the live AdapterService in ProfileService." into nyc-mr1-dev
Calvin On [Thu, 23 Jun 2016 21:06:58 +0000 (21:06 +0000)]
Merge "Use the live AdapterService in ProfileService." into nyc-mr1-dev

8 years agoClose output stream before getting response
Ajay Panicker [Thu, 23 Jun 2016 20:46:46 +0000 (20:46 +0000)]
Close output stream before getting response
am: e026ad5004

Change-Id: I54248b785427cce08568d7fed2bb329f90b3af02

8 years agoClose output stream before getting response
Ajay Panicker [Thu, 23 Jun 2016 20:29:34 +0000 (13:29 -0700)]
Close output stream before getting response

If the output stream is still open after finishing the sending of
a file, a CONTINUE response code is received instead of an OK code.

Bug: 29583227
Change-Id: I1b2515e8fe5eec208bbbe1df17f96cc20c5ea884

8 years agoUse the live AdapterService in ProfileService.
Calvin On [Wed, 22 Jun 2016 21:23:49 +0000 (14:23 -0700)]
Use the live AdapterService in ProfileService.

Previously, if AdapterService was null while ProfileService is
created, the ProfileService would never work because it would
store a stale reference to the AdapterService.

This change ensures that ProfileService accesses the current
AdapterService at any given time.

Bug: 29519304

Change-Id: I25efbf4a58932f519ac9f0b89c4112a442c994eb

8 years agoMerge \"Prevent energy data overflow\" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 18:57:32 +0000 (18:57 +0000)]
Merge \"Prevent energy data overflow\" into nyc-dev
am: 303ef0bd13

Change-Id: Ic6927d8d5b929954b78c616d64332c29b24e55bf

8 years agoMerge "Prevent energy data overflow" into nyc-dev
Adam Lesinski [Wed, 22 Jun 2016 18:48:20 +0000 (18:48 +0000)]
Merge "Prevent energy data overflow" into nyc-dev

8 years agoFix how file size is calculated if not provided
Ajay Panicker [Wed, 22 Jun 2016 00:00:07 +0000 (00:00 +0000)]
Fix how file size is calculated if not provided
am: 120ba1db4d

Change-Id: I240f7fc0955aa6ec9d1e4e18cf217eac2b3aa394

8 years agoFix how file size is calculated if not provided
Ajay Panicker [Tue, 21 Jun 2016 00:54:36 +0000 (17:54 -0700)]
Fix how file size is calculated if not provided

Currently if there is no file size provided, InputStream.available()
is used to guess how many bytes are available. According to the
java documentation, available() should not be used to calculate
file sizes, as it isn't guarenteed to return the total number of
bytes in the stream. This is fixed by reading the stream to
calculate the length, then resetting the stream.

Bug: 29334784
Change-Id: Ic851c46d053157e4d5404352d76f9ff87a509607