Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
464,873 Commits 3 Branches 0 Tags
a1663403045248f94e88fb6d9558dc589d86114e
Commit Graph

1568 Commits

Author SHA1 Message Date
Automerger Merge Worker
e7217d3eee Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61 am: cd3f28071e am: 9514b54cfd 
Change-Id: I648f6be33a3b9ec4626fc991863df4645629d2a2
 2020-02-05 01:14:26 +00:00
Automerger Merge Worker
cd3f28071e Merge "Change data type of duration param from int representing seconds to long representing milliseconds in BluetoothAdapter#setScanMode" am: 6d4004fc61 
Change-Id: I3a222fe93c7cc4bfc0b967e51b633ceb0605c642
 2020-02-05 00:50:59 +00:00
Rahul Sabnis
99507b5eb3 Change data type of duration param from int representing seconds to long 
representing milliseconds in BluetoothAdapter#setScanMode

Bug: 144380530
Test: Manual
Change-Id: I76528478a64d22afefd4ec964d1a78295dd3c94f
 2020-02-04 14:29:09 -08:00
Automerger Merge Worker
e2deab502f Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: 7a028c7f5b am: bbfcf7fc56 am: 8eebd377ae 
Change-Id: I61d78666262095cd22f3fdef7bcc50e281ddc2a0
 2020-02-02 00:02:43 +00:00
Automerger Merge Worker
4104f77d64 Merge "Add new API BluetoothAdapter#removeActiveDevice to replace calls to BluetoothAdapter#setActiveDevice with a null device" am: f0f3a0f48e am: 44d8a611c4 am: 96c736b92c 
Change-Id: Id0be090915b319b8f38a624279cec31c9cfd62c1
 2020-02-02 00:02:21 +00:00
Automerger Merge Worker
bbfcf7fc56 Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" am: 7a028c7f5b 
Change-Id: I363ded95542c1402b6828d5475e04d2554c8d01e
 2020-02-01 23:41:15 +00:00
Automerger Merge Worker
44d8a611c4 Merge "Add new API BluetoothAdapter#removeActiveDevice to replace calls to BluetoothAdapter#setActiveDevice with a null device" am: f0f3a0f48e 
Change-Id: Ia5a08318ebdfdee7634a6cec492b36f35e143870
 2020-02-01 23:37:45 +00:00
Treehugger Robot
7a028c7f5b Merge "Add privileged permission to SystemApi BluetoothDevice#setAlias" 2020-02-01 23:37:34 +00:00
Treehugger Robot
f0f3a0f48e Merge "Add new API BluetoothAdapter#removeActiveDevice to replace calls to BluetoothAdapter#setActiveDevice with a null device" 2020-02-01 23:27:10 +00:00
Automerger Merge Worker
e55cd0e21b Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" am: ea711aba95 am: 8752cb4fc7 am: bab7bb92bf 
Change-Id: I3e6e9f7dd0ae3472bc97e3b28fdb6af48cb8e091
 2020-02-01 22:55:34 +00:00
Automerger Merge Worker
8752cb4fc7 Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" am: ea711aba95 
Change-Id: Ib585b2b8831e12ba8231704a99a47ceaf0da0e8e
 2020-02-01 22:32:12 +00:00
Treehugger Robot
ea711aba95 Merge "Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to android.bluetooth.device.action.ALIAS_CHANGED from android.bluetooth.action.ALIAS_CHANGED" 2020-02-01 22:21:27 +00:00
Rahul Sabnis
e75a016d1b Revert value of BluetoothDevice.ACTION_ALIAS_CHANGED back to 
android.bluetooth.device.action.ALIAS_CHANGED from
android.bluetooth.action.ALIAS_CHANGED

Bug: 146158681
Test: Manual
Change-Id: Ie247568ff3e5a750d74f22636aca69e3e74a55f5
 2020-01-31 10:38:02 -08:00
Automerger Merge Worker
0b440628dd Merge "Add BLUETOOTH_PRIVILEGED permission to SystemApi BluetoothHidDevice#setConnectionPolicy" am: 3c57a25b4f am: 5404d58320 am: 8acee1db54 
Change-Id: Idaab46acf3e38332bcbf4606de39a4656e3339d5
 2020-01-31 16:56:25 +00:00
Automerger Merge Worker
5404d58320 Merge "Add BLUETOOTH_PRIVILEGED permission to SystemApi BluetoothHidDevice#setConnectionPolicy" am: 3c57a25b4f 
Change-Id: I37da24b0dd04118a937378414412ee17acf79c70
 2020-01-31 16:38:55 +00:00
Automerger Merge Worker
bcaee6a571 Merge "Add api BluetoothAdapter.getMostRecentlyConnectedDevices() to be able to get connected devices ordered by how recently they were connected" am: 4f833efcbb am: 802c49bb00 am: b551d0f9f4 
Change-Id: I49225d84e7ae60cb042d31479623b19bce7608fb
 2020-01-31 16:27:10 +00:00
Automerger Merge Worker
802c49bb00 Merge "Add api BluetoothAdapter.getMostRecentlyConnectedDevices() to be able to get connected devices ordered by how recently they were connected" am: 4f833efcbb 
Change-Id: I5bd4a18d9f66d8a7cf59b4d7d6c0c725be2b269e
 2020-01-31 16:10:50 +00:00
Rahul Sabnis
e6f17155da Add new API BluetoothAdapter#removeActiveDevice to replace calls to 
BluetoothAdapter#setActiveDevice with a null device

Bug: 147428526
Test: Manual
Change-Id: I838448a504515d5a8b1eec254ccc1d9414239475
 2020-01-30 16:59:02 -08:00
Rahul Sabnis
f93a469cec Add BLUETOOTH_PRIVILEGED permission to SystemApi 
BluetoothHidDevice#setConnectionPolicy

Bug: 148597061
Test: Manual
Change-Id: I03875cb71483d3d6e18795324a7fbea6681fb9b0
 2020-01-30 13:49:35 -08:00
Rahul Sabnis
98c6c7c4c9 Add privileged permission to SystemApi BluetoothDevice#setAlias 
Bug: 144792904
Test: Manual
Change-Id: Ie11109736bb0eb4cd0f06c38db44805c0169ac5f
 2020-01-30 12:02:17 -08:00
Rahul Sabnis
791dedb43f Add api BluetoothAdapter.getMostRecentlyConnectedDevices() to be able to 
get connected devices ordered by how recently they were connected

Bug: 130984590
Test: Manual
Change-Id: Ie5d0c7a8e6bc5daad5ff14064b0c65b7c4c5e6b0
 2020-01-29 11:53:10 -08:00
Automerger Merge Worker
8c45fefa83 Merge "Bluetooth LE COC: Delete unused testing API" am: 25983a0972 am: dfe0273968 am: e8383fd5fc 
Change-Id: I336a04270cbce29fb8998474f28d0dea8eadd9d2
 2020-01-25 00:29:55 +00:00
Hansong Zhang
dfe0273968 Merge "Bluetooth LE COC: Delete unused testing API" 
am: 25983a0972

Change-Id: Iba4797930d442399b4078705b30eef07855dabee
 2020-01-24 16:22:26 -08:00
Hansong Zhang
a0b7355a6f Bluetooth LE COC: Delete unused testing API 
Some methods are for SL4A test only, and now they have been migrated.

Test: compile
Change-Id: I86e22814fc9a3fd296c359804a465b9ead4d926f
 2020-01-24 21:26:07 +00:00
Automerger Merge Worker
c7e29fe189 Merge "Use @ConnectionPolicy annotation more consistently in classes with methods setConnectionPolicy and getConnectionPolicy" am: 4328fba884 am: f38016bdef am: 0f355e6ae7 
Change-Id: I7777fcd80d3be4d7a523f5d296e602391949fe16
 2020-01-24 07:58:44 +00:00
Rahul Sabnis
f38016bdef Merge "Use @ConnectionPolicy annotation more consistently in classes with methods setConnectionPolicy and getConnectionPolicy" 
am: 4328fba884

Change-Id: I46a7f13edc552036fa7ee81144a794d750eaa3ca
 2020-01-22 22:05:14 -08:00
Treehugger Robot
4328fba884 Merge "Use @ConnectionPolicy annotation more consistently in classes with methods setConnectionPolicy and getConnectionPolicy" 2020-01-23 04:20:53 +00:00
Rahul Sabnis
30c597ffb0 Use @ConnectionPolicy annotation more consistently in classes with 
methods setConnectionPolicy and getConnectionPolicy

Bug: 147669289
Test: Manual
Change-Id: I2b9b0391a02d01623c1cd253f2da12b2baaea599
 2020-01-22 23:08:21 +00:00
Automerger Merge Worker
8030e4860e Merge "Add @RequiresPermission annotation to SystemApis in BluetoothPan, open up close method as a SystemApi, and BluetoothPan class now implements AutoCloseable and CloseGuard" am: 23deb3367f am: 264da33fe5 am: 4aa1811337 
Change-Id: I720267221928468a4aa5579363ad4eb341f97389
 2020-01-22 21:49:25 +00:00
Automerger Merge Worker
81d8b9cea0 Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable" am: b4dbfff366 am: 5a607f2666 am: 8371addcb4 
Change-Id: Ib5c91460b57d58fad612c6bab74009b9282485bd
 2020-01-22 21:48:33 +00:00
Rahul Sabnis
264da33fe5 Merge "Add @RequiresPermission annotation to SystemApis in BluetoothPan, open up close method as a SystemApi, and BluetoothPan class now implements AutoCloseable and CloseGuard" 
am: 23deb3367f

Change-Id: Iaab890dc9ebefabbcb7809fe2e83221f11d7d9f0
 2020-01-22 13:21:55 -08:00
Rahul Sabnis
5a607f2666 Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable" 
am: b4dbfff366

Change-Id: If06bce0f62fee4121c0e4445178c13458cd4b7c6
 2020-01-22 13:17:19 -08:00
Treehugger Robot
23deb3367f Merge "Add @RequiresPermission annotation to SystemApis in BluetoothPan, open up close method as a SystemApi, and BluetoothPan class now implements AutoCloseable and CloseGuard" 2020-01-22 21:09:47 +00:00
Treehugger Robot
b4dbfff366 Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable" 2020-01-22 21:09:39 +00:00
Rahul Sabnis
dc125268fb Add @RequiresPermission annotation to SystemApis in BluetoothPan, open 
up close method as a SystemApi, and BluetoothPan class now implements
AutoCloseable and CloseGuard

Bug: 146045934
Test: Manual
Change-Id: Iafb2157d67ae4f8e3d7d97cf4198f2978e391a8c
 2020-01-22 11:30:59 -08:00
Automerger Merge Worker
35030868e4 Merge "Make certain BluetoothProfile constants being used by CarBluetoothTest into @SystemApi" am: 80a2b522b1 am: f0a2e25c9f am: 9c741338dc 
Change-Id: I047f9d64c8dfef979e8281aa8cd9f2a73017bbcb
 2020-01-22 04:32:35 +00:00
Rahul Sabnis
f0a2e25c9f Merge "Make certain BluetoothProfile constants being used by CarBluetoothTest into @SystemApi" 
am: 80a2b522b1

Change-Id: I81491cbcc449cc718be94637d609cc4f799b6cf2
 2020-01-21 17:05:15 -08:00
Rahul Sabnis
a079dc7984 Make certain BluetoothProfile constants being used by CarBluetoothTest 
into @SystemApi

Bug: 146663105
Test: Manual
Change-Id: Ic474a85c17b69c71cf24b06d0262c13b3b8142fe
 2020-01-21 15:11:22 -08:00
Rahul Sabnis
d3dd01190c Add error log to BluetoothAdapter.factoryReset() and make 
BluetoothAdapter.getUuids() marked with @Nullable

Bug: 144765076
Test: Manual
Change-Id: I2a38fbb2256177ad29e2739ccbec8c13aae9df6a
 2020-01-17 15:09:44 -08:00
satayev
e1432f59ee Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 13:09:36 +00:00
Automerger Merge Worker
dffdb984c3 Merge "Make the BluetoothMap class @SystemApi" am: 7de3328d4e am: 0b9386c52d am: defec369b6 
Change-Id: Iafc1967c0127bfbe25b115982f57c09088aeb6ed
 2020-01-10 21:23:24 +00:00
Automerger Merge Worker
defec369b6 Merge "Make the BluetoothMap class @SystemApi" am: 7de3328d4e am: 0b9386c52d 
Change-Id: I75eff4043effbd13f1facbbbead512f164721cb4
 2020-01-10 21:12:15 +00:00
Treehugger Robot
7de3328d4e Merge "Make the BluetoothMap class @SystemApi" 2020-01-10 20:53:20 +00:00
Automerger Merge Worker
02d105fd25 Merge "Add setConnectionPolicy to HidDevice and Pan. Clean up documentation for the method in Pbap." am: 06410db097 am: 20acd0b7a7 am: cc626683b8 
Change-Id: Ie234869b5d50c7cbfba0bee5c6596c472f32838c
 2020-01-10 20:35:48 +00:00
Automerger Merge Worker
cc626683b8 Merge "Add setConnectionPolicy to HidDevice and Pan. Clean up documentation for the method in Pbap." am: 06410db097 am: 20acd0b7a7 
Change-Id: I3ea4fa8fa743c159c1aef5d7f80bc42ebc8d7d70
 2020-01-10 20:35:17 +00:00
Treehugger Robot
06410db097 Merge "Add setConnectionPolicy to HidDevice and Pan. Clean up documentation for the method in Pbap." 2020-01-10 20:19:36 +00:00
Artur Satayev
76c1d9d5e1 Use new UnsupportedAppUsage annotation. 
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I6ab53570aca580fbee1fcc927871caa09780f58f
Merged-In: I6ab53570aca580fbee1fcc927871caa09780f58f
 2020-01-10 17:02:03 +00:00
TreeHugger Robot
4666dc1d5c Merge "Use new UnsupportedAppUsage annotation." into qt-qpr1-dev-plus-aosp 2020-01-10 08:27:18 +00:00
Automerger Merge Worker
d1a292774c Merge "Support PBAP for get/close profile proxy" am: 3e3f8bc09f am: 80e13d598c am: 870ca86684 
Change-Id: Icd8f45c4d19b92e9249240625ed392dd8f2cdaa4
 2020-01-10 02:41:48 +00:00
Automerger Merge Worker
870ca86684 Merge "Support PBAP for get/close profile proxy" am: 3e3f8bc09f am: 80e13d598c 
Change-Id: I11a28320654e0a2cbd46f2ae0e187c22c9c47789
 2020-01-10 02:32:41 +00:00