Meng Wang
0204e4a08e
Merge "PersistableBundle: writeToStream/readFromStream"
2020-01-08 23:47:40 +00:00
Cody Kesting
afa0f1756e
Merge "Add API surface for ConnectivityDiagnostics API."
2020-01-08 21:53:14 +00:00
Meng Wang
2536134b12
PersistableBundle: writeToStream/readFromStream
...
Bug: 143911192
Test: manual sanity test
Change-Id: I208487d572c8148f28fac3307873dfdc90996ae1
2020-01-08 13:44:15 -08:00
Hall Liu
f428f58080
Merge "Add setDisabledForSimNetworkLock to StatusBarManager"
2020-01-08 20:54:48 +00:00
Andrei-Valentin Onea
e7194bfdfc
Merge changes from topic "fix-policy"
...
* changes:
Refactor CompatConfigTest and PlatformCompatTest
Add test for OverrideValidatorImpl
Enforce overriding methods for IPlatformCompat
2020-01-08 18:42:44 +00:00
Yifan Hong
d0c62b9dab
Merge changes from topics "vab_allocate", "vab_wait"
...
* changes:
Use @ErrorCode for UpdateEngineCallback
Add @ErrorCode annotation to UpdateEngine APIs
Add UpdateEngine.cleanupSuccessfulUpdate
Add UpdateEngine.allocateSpace
2020-01-08 18:37:16 +00:00
Xin Li
45fa8ce95e
Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
2020-01-08 17:39:17 +00:00
Artur Satayev
33f9217695
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: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
Merged-In: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
2020-01-08 14:04:40 +00:00
Rick Yiu
e716ff86af
Merge "Revert "Implement the ThreadPrioritySetter interface""
2020-01-08 06:49:37 +00:00
Aaron Huang
b5b0b321f6
Merge "Make Context.NETWORK_POLICY_SERVICE @SystemApi"
2020-01-08 03:22:43 +00:00
Treehugger Robot
5e7e617e17
Merge "Make the BluetoothHidHost class @SystemApi"
2020-01-08 02:43:18 +00:00
Rick Yiu
6df72bd988
Revert "Implement the ThreadPrioritySetter interface"
...
Revert submission 1194951-ThreadPrioritySetter2
Reason for revert: need to update new API
Reverted Changes:
Iee33a26c0: Implement the ThreadPrioritySetter interface
I71c5052be: Use ThreadPrioritySetter to set thread priority
Change-Id: I38c1335bff657662d82ff8778bffade323ced620
2020-01-08 02:22:39 +00:00
Rahul Sabnis
9913cb52cf
Make the BluetoothHidHost class @SystemApi
...
Bug: 146462547
Test: Manual
Change-Id: I2044e850583701173b51ca89e30ff8aa79bb255c
2020-01-07 17:02:22 -08:00
Rahul Sabnis
53c8e6cbc0
Merge "Add setConnectionPolicy to BluetoothPbap"
...
am: c0c8c00976
Change-Id: I96a64f6a86392f1140884fc03f8059b5590e8736
2020-01-07 12:56:19 -08:00
Treehugger Robot
c0c8c00976
Merge "Add setConnectionPolicy to BluetoothPbap"
2020-01-07 20:33:21 +00:00
Neil Fuller
1d866c0bf3
Merge "Fix annotation / debugging"
...
am: 69bbb1904f
Change-Id: I9da174d658ada4acf399fe9f743b012aea7ebeae
2020-01-07 08:29:19 -08:00
Neil Fuller
69bbb1904f
Merge "Fix annotation / debugging"
2020-01-07 16:24:38 +00:00
Neil Fuller
4d10019960
Fix annotation / debugging
...
Fix copy and paste errors from commit 4ab8a199de -
the API is new so does not need @UnsupportedAppUsage and
the debug log was incorrect.
Bug: 140712361
Test: build only
Change-Id: I123f76d011d7505d3dc053cb48c40353f0579d17
2020-01-07 14:32:29 +00:00
Tobias Thierer
55024898c8
Merge "android.net.http: Update OWNERS."
...
am: 106d798af8
Change-Id: I4f135178ae22b85d0c9196ac70ba6bc6b2793d80
2020-01-07 05:50:18 -08:00
Treehugger Robot
106d798af8
Merge "android.net.http: Update OWNERS."
2020-01-07 13:45:20 +00:00
Neil Fuller
f11a45b756
Merge "Change NetworkTimeUpdateServiceImpl behavior"
...
am: 48247d9223
Change-Id: I299a69b5a3abf5da66237f79aa7ca56b6268452a
2020-01-07 02:14:01 -08:00
Neil Fuller
48247d9223
Merge "Change NetworkTimeUpdateServiceImpl behavior"
2020-01-07 10:07:08 +00:00
markchien
75b0369615
Merge "Change tetheroffloadjni to tetheringutilsjni"
...
am: 3e16a10a3e
Change-Id: I48207d95cf6f512ec038fb5dc9ba4009c01d676d
2020-01-07 01:12:30 -08:00
Treehugger Robot
3e16a10a3e
Merge "Change tetheroffloadjni to tetheringutilsjni"
2020-01-07 09:05:43 +00:00
Tobias Thierer
d913b9037a
Merge "android.net: Update OWNERS."
...
am: 2b89b0c7ca
Change-Id: I77ffc427638cf6297da48cb83449d455f7b6d220
2020-01-07 00:03:08 -08:00
markchien
771c3e9a3d
Change tetheroffloadjni to tetheringutilsjni
...
Rename tetheroffloadjni to tetheringutilsjni and move setupRaSocket
jni method from NetUtils into tetheringutilsjni.
Bug: 143195885
Test: -build, flash, boot
-atest TetheringTests
-Off/On hotspot with ipv6 upstream
Change-Id: Ib68eb6999bbe2d3ca97e68712f22b105311ef800
2020-01-07 07:42:13 +00:00
Treehugger Robot
2b89b0c7ca
Merge "android.net: Update OWNERS."
2020-01-07 07:38:36 +00:00
Lorenzo Colitti
cf77c50b11
Merge changes If28f0be6,If0f80067
...
am: 96529ad7fc
Change-Id: I108d3c36ce11af544ccfed9291dc38c690724915
2020-01-06 23:03:04 -08:00
Lorenzo Colitti
96529ad7fc
Merge changes If28f0be6,If0f80067
...
* changes:
Make LinkPropertiesTest pass, and fix an NPE.
Add the DHCP server address to LinkProperties.
2020-01-07 06:43:20 +00:00
Lorenzo Colitti
348577e09f
Make LinkPropertiesTest pass, and fix an NPE.
...
aosp/973686 added the DHCP server address to LinkProperties, but
it did not have any tests, and would throw NPE when parceling a
LinkProperties that did not have a DHCP server.
Add tests and fix the bug.
Bug: 134098566
Test: unit test now passes
Change-Id: If28f0be650963e8d9af7eb53f6940824582a2db3
2020-01-07 13:02:32 +09:00
Rick Yiu
4db03331ac
Merge "Implement the ThreadPrioritySetter interface"
...
am: bc0290a7b0
Change-Id: I333361efe7fa5dff72808394617d39270458d80b
2020-01-06 19:12:32 -08:00
Allen Su
1b0c2fcd3b
Merge "Convert some users of Time.format() to an alt."
...
am: 267b83e7d6
Change-Id: Ide4b3813fe9666259f4e94462f89c1683d2ba6ed
2020-01-06 19:09:57 -08:00
Rick Yiu
bc0290a7b0
Merge "Implement the ThreadPrioritySetter interface"
2020-01-07 02:31:17 +00:00
Allen Su
267b83e7d6
Merge "Convert some users of Time.format() to an alt."
2020-01-07 02:28:15 +00:00
Hall Liu
b128b793c7
Merge "Clean up SmsApplication and expose getDefaultSmsPackage"
...
am: 2ada7fbac2
Change-Id: Ie4ca7c239295ba9e3bfb60815ca5c7d65bf0fdc1
2020-01-06 16:45:17 -08:00
Hall Liu
2ada7fbac2
Merge "Clean up SmsApplication and expose getDefaultSmsPackage"
2020-01-07 00:36:51 +00:00
Hall Liu
4d1771a3fb
Merge "Create new APIs for overriding APNs"
...
am: 13beb87783
Change-Id: I523c37c06cb7636775131720c252f06cb2eb152f
2020-01-06 16:02:13 -08:00
Hall Liu
9ded659a50
Add setDisabledForSimNetworkLock to StatusBarManager
...
Add a new @SystemApi disable utility method to allow telephony's
mainline module to disable the status bar when the device is SIM-locked
Bug: 146834818
Bug: 138956541
Test: atest StatusBarManagerTest
Change-Id: Id3757fc560c5b70bed553f19b050524a024b4c78
2020-01-06 15:47:45 -08:00
Rahul Sabnis
e36a171b23
Add setConnectionPolicy to BluetoothPbap
...
Bug: 145943634
Test: Manual
Change-Id: I72fc624d5c6578ca0374a1e943810d97b6361250
2020-01-06 15:22:55 -08:00
Hall Liu
13beb87783
Merge "Create new APIs for overriding APNs"
2020-01-06 23:14:44 +00:00
Neil Fuller
c0f9b27214
Merge "Add new permissions"
...
am: 62ace8c46a
Change-Id: I618e2f4a608914d1bf679186880cd358a75a238d
2020-01-06 13:02:34 -08:00
Neil Fuller
62ace8c46a
Merge "Add new permissions"
2020-01-06 19:38:25 +00:00
ruibin zhang
ad2689c1a1
Add the DHCP server address to LinkProperties.
...
Bug: 134098566
Test: see subsequent CL in topic
Change-Id: If0f80067934189137c87cd379e7ae47b187562fd
2020-01-07 01:21:07 +09:00
Hall Liu
39839dc63b
Create new APIs for overriding APNs
...
Create new APIs in TelephonyManager for DevicePolicyManager to add
override APNs, and use them in DevicePolicyManagerService instead of
directly accessing the APN database.
Bug: 146834818
Test: cts-tradefed run cts --module DevicePolicyManager --test
com.android.cts.devicepolicy.DeviceOwnerTest#testOverrideApn
Test: atest TelephonyManagerTest
Change-Id: I6c6214424169c05fd452db71a8c6593f8473b9d4
Merged-In: I6c6214424169c05fd452db71a8c6593f8473b9d4
2020-01-05 14:24:22 -08:00
Rick Yiu
a7612150ff
Implement the ThreadPrioritySetter interface
...
Implement the ThreadPrioritySetter interface and register it in
runtime.
Bug: 139521784
Test: CtsLibcoreTestCases, device boot to home, thread priority set
as expected.
Change-Id: Iee33a26c0b25386dd10a51a14284cab71e71edb2
2020-01-04 02:56:38 +00:00
Yifan Hong
f585f651ad
Use @ErrorCode for UpdateEngineCallback
...
Test: TH
Change-Id: I26297984e40b66ff08e0c291bc1aa0e556fe6bcc
2020-01-03 13:08:46 -08:00
Yifan Hong
8e48e6d986
Add @ErrorCode annotation to UpdateEngine APIs
...
Test: TH
Change-Id: I3016132454ea38d2eaf69b907c726f46b2608509
2020-01-03 13:08:46 -08:00
Yifan Hong
2ce03276e7
Add UpdateEngine.cleanupSuccessfulUpdate
...
This API cleans up the merge and free up space after the
device has boot successfully into the new build for a
Virtual A/B update.
Bug: 138808328
Test: pass
Change-Id: Id4543906b06e6a8487f91955af85024d8a50a464
2020-01-03 11:18:04 -08:00
Yifan Hong
16d4554abc
Add UpdateEngine.allocateSpace
...
This API preallocates space for a Virtual A/B update.
Test: pass
Bug: 138808058
Change-Id: I34e34fbf6ac63bd189abda4a45cdac84b0e109d0
2020-01-03 11:18:04 -08:00
TreeHugger Robot
a7707c4db7
Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master
2020-01-03 17:50:01 +00:00