Charles Munger
8292d73554
Merge "Deprecate Looper.prepareMainLooper"
...
am: b1f69203e7
Change-Id: If66e250dcaa558eef033abaed08b72642004aec6
2019-11-22 12:10:59 -08:00
Treehugger Robot
b1f69203e7
Merge "Deprecate Looper.prepareMainLooper"
2019-11-22 19:59:44 +00:00
Ytai Ben-tsvi
e74637df68
Merge changes from topic "hidl-memory-java"
...
am: 887aa66d0a
Change-Id: If36ca2aad9c3e68e5a5be49e9e1566e44f40511b
2019-11-22 10:10:44 -08:00
Ytai Ben-tsvi
887aa66d0a
Merge changes from topic "hidl-memory-java"
...
* changes:
Add HidlMemoryUtil
Add parceling support for HIDL memory in Java
2019-11-22 17:54:06 +00:00
Aaron Huang
4082917f46
Merge "Expose IpConfiguration and ProxyInfo APIs"
...
am: 920a4a5b1b
Change-Id: I7fa9b282ca87f0c442e267acb8424f6aeed5d3a0
2019-11-22 01:40:49 -08:00
Aaron Huang
920a4a5b1b
Merge "Expose IpConfiguration and ProxyInfo APIs"
2019-11-22 09:25:16 +00:00
cncn
dca2d45630
Merge "Make Notification.Builder.SetFlag public"
...
am: c8bd4aecb3
Change-Id: I3b8ff8e7c754b12778e40a9abcc829fb7a12671b
2019-11-21 18:41:27 -08:00
Treehugger Robot
c8bd4aecb3
Merge "Make Notification.Builder.SetFlag public"
2019-11-22 00:39:10 +00:00
Ytai Ben-Tsvi
a907efc3bc
Add parceling support for HIDL memory in Java
...
This change adds support for reading/writing a HidlMemory
instance into / out of a HwParcel and HwBlob, in a format that
is compatible with the hidl_memory C++ type.
This paves the way to be able to exchange shared memory blocks
between native and Java via HwBinder, which will be exposed
as adding Java support for the HIDL 'memory' type.
Change-Id: I6cbbf852218c8a631f9014e7caa7a97d17e11889
Bug: 143566068
Merged-In: I6cbbf852218c8a631f9014e7caa7a97d17e11889
2019-11-21 15:19:47 -08:00
Jordan Liu
850525ffaf
Merge "Expose SmsCbLocation and SmsCbMessage constructors"
...
am: d87727f7d9
Change-Id: I24bfb6ed5fa25a810c2a5fe78745091f5b576162
2019-11-21 15:02:37 -08:00
cncn
9d0fd9c9d6
Make Notification.Builder.SetFlag public
...
Bug: 144846447
Test: Build Successfully
Change-Id: If25bede41eec1f7e7ca3ae8fc669df1964d7da05
2019-11-21 22:55:13 +00:00
Jordan Liu
c3922ef9a4
Expose SmsCbLocation and SmsCbMessage constructors
...
Bug: 135956699
Test: manual
Change-Id: Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1
Merged-In: Ic2a58005db6f5d01b6769b84b8cf7d5f013bbbf1
2019-11-21 13:14:02 -08:00
David Su
c4df6668bb
Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID"
...
am: 1124e240c0
Change-Id: Ia0c92f1db33b0a884da7388cd31b33d51df29288
2019-11-21 11:50:57 -08:00
David Su
1124e240c0
Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID"
2019-11-21 18:44:46 +00:00
Chen Xu
da22ddac87
Merge "expose systemAPI for SmsCbLocation constructor"
...
am: 174b988133
Change-Id: Id44432a314e2becf72818f445120dbbe8367f9bc
2019-11-21 09:49:17 -08:00
Chen Xu
174b988133
Merge "expose systemAPI for SmsCbLocation constructor"
2019-11-21 17:38:41 +00:00
Makoto Onuki
d52db070cd
Merge "Explicitly take flags in createContextAsUser()"
...
am: a7948ddcb9
Change-Id: I6947903d66da1e64c461a1557e82a72a97a8848b
2019-11-21 08:05:06 -08:00
Makoto Onuki
6b1e9d2f9f
Explicitly take flags in createContextAsUser()
...
Bug: 142472686
Test: atest android.content.cts.ContextTest#testCreateContextAsUser
Change-Id: Id2e3d5ffe5887a4916e0872a7e85d62cbb439744
(cherry picked from commit e5449f0b34 )
Merged-in: Id2e3d5ffe5887a4916e0872a7e85d62cbb439744
2019-11-20 16:20:23 -08:00
Chen Xu
2105a42191
expose systemAPI for SmsCbLocation constructor
...
Bug: 135956699
Test: cts SmsCbLocationTest
Change-Id: I7b9c6fa453ee907aaa13d65e0b13de0556852313
(cherry picked from commit 8635f37b96 )
Merged-in: I7b9c6fa453ee907aaa13d65e0b13de0556852313
2019-11-20 15:53:02 -08:00
Jordan Liu
277ea3584f
Merge "Remove unneeded @RequiresPermission annotation"
...
am: 0a1b47573e
Change-Id: I47d83e0d224cb9840b326212f84c83a8e16c1a85
2019-11-20 14:22:03 -08:00
Jordan Liu
0a1b47573e
Merge "Remove unneeded @RequiresPermission annotation"
2019-11-20 22:04:20 +00:00
Makoto Onuki
056b8f00b7
Merge "Add Context.createContextAsUser()"
...
am: 63d5e4a0b9
Change-Id: I022daba2bc9234ffe7b7fa760942a58852e406b3
2019-11-20 14:04:20 -08:00
Treehugger Robot
63d5e4a0b9
Merge "Add Context.createContextAsUser()"
2019-11-20 21:53:01 +00:00
David Su
e51ae1566b
NetworkKey: migrate from ScanResult.wifiSsid to SSID
...
wifiSsid is an @hide field, migrate to getter method.
Bug: 144311098
Test: atest NetworkKeyTest
Change-Id: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
Merged-In: Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe
2019-11-20 10:41:59 -08:00
James Mattis
fa968e9691
Merge "Swap param order in registerSoftApCallback"
...
am: 1dcfd69218
Change-Id: Icfb927efccdab7adda38ca71c30564a29cad785f
2019-11-20 10:32:33 -08:00
James Mattis
1dcfd69218
Merge "Swap param order in registerSoftApCallback"
2019-11-20 18:16:53 +00:00
Meng Wang
910d4e982a
Merge "Expose IMSI encryption info APIs as system API"
...
am: 0209217e33
Change-Id: Iafce568b8ea8cfc5d499dc21b5bbdc738cbfd3fd
2019-11-20 10:07:06 -08:00
Meng Wang
0209217e33
Merge "Expose IMSI encryption info APIs as system API"
2019-11-20 17:57:08 +00:00
Aaron Huang
6763aec94c
Expose IpConfiguration and ProxyInfo APIs
...
Moving IpConfiguration methods to system API
for mainline support.
Public copy constructors of ProxyInfo and add
buildPacProxy(Uri, int) to create a new proxy
properties.
Bug: 139268426
Bug: 135998869
Test: atest android.net.cts
atest android.net.wifi.cts
atest FrameworksNetTests
./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I07bcd2a34a222ea2b3cf0d8b497f051011c41c2c
2019-11-20 20:07:05 +08:00
SongFerng Wang
c4bb6df605
Merge "isTetherApnRequired api rename as isTetheringApnRequired"
...
am: 25ea00d059
Change-Id: Id6e9d123f2dfb627402f09e0a609413f7b487af1
2019-11-20 02:11:20 -08:00
SongFerng Wang
25ea00d059
Merge "isTetherApnRequired api rename as isTetheringApnRequired"
2019-11-20 08:46:05 +00:00
Tyler Gunn
5474568b87
Merge "Add prioritized enableCarMode API in UiModeManager"
...
am: 8e7a1f8528
Change-Id: I81d8b4a457c567e19c3c8e499cc1f08e1c8af3b3
2019-11-20 00:17:34 -08:00
Tyler Gunn
8e7a1f8528
Merge "Add prioritized enableCarMode API in UiModeManager"
2019-11-20 07:08:19 +00:00
Makoto Onuki
9432f7d43c
Add Context.createContextAsUser()
...
Without it, apps (mainline modules) will need to use createPackageContext...,
which is a bit painful.
Bug: 142472686
Test: atest android.content.cts.ContextTest#testCreateContextAsUser
Change-Id: Id640e03862462724df1a4a3101f0b08faafba22f
(cherry picked from commit b844001d6a )
Merged-in: Id640e03862462724df1a4a3101f0b08faafba22f
2019-11-19 20:51:04 -08:00
Meng Wang
78301b1563
Expose IMSI encryption info APIs as system API
...
Bug: 142431997
Test: make
Change-Id: I45ca070cfc59f4a7cc87d5d530b665d9259fcb71
Merged-In: I7bd15f225ac7774ac6e31c766ee0f11302aae3d8
2019-11-19 16:23:37 -08:00
Charles Munger
080ddd5dfd
Merge "Deprecate implicit Handler constructors"
...
am: 560c3ebe1e
Change-Id: I254f85c07743883c7d350a47750dad0745c47d52
2019-11-19 16:04:15 -08:00
Brad Ebinger
5dc01f163a
Merge "Add support for disconnecting outgoing calls for emergency calls"
...
am: 252fcc7b27
Change-Id: I0f3d0a651b69e76de0ba3f3a473bd5bcbb4c4d35
2019-11-19 15:39:32 -08:00
Jordan Liu
2ca04cf384
Merge "Expose Geometry, LatLng, and maxWaitDuration"
...
am: e993fb8bb9
Change-Id: Ie8332c4a2b6ee5617b4313235932645cbb4f593d
2019-11-19 15:35:35 -08:00
Brad Ebinger
f6b214da1c
Merge "Reorder getFeatureState parameters to convention"
...
am: e11ab258b9
Change-Id: I9b0671d59bb7503d0947d354a5e5030b20010cdb
2019-11-19 15:31:34 -08:00
Charles Munger
310697d68d
Merge "Deprecate account-specific activity subclass"
...
am: b7c5d354fb
Change-Id: Ie21ab07bfe7f857c642e62b11e33085db199a021
2019-11-19 15:29:12 -08:00
Treehugger Robot
560c3ebe1e
Merge "Deprecate implicit Handler constructors"
2019-11-19 23:28:12 +00:00
Chen Xu
550006b8f8
Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL"
...
am: 04b9b718a5
Change-Id: I53213519b7702400713c9446e9b36a24f4e1fddf
2019-11-19 15:18:12 -08:00
Rahul Sabnis
3e4a53735e
Merge "Create systemapis to connect/disconnect all bt profiles"
...
am: 7700b81cb3
Change-Id: I3780cb82ad20d84ea3d8d87b85dd6d37d1e8f907
2019-11-19 15:16:53 -08:00
Tyler Gunn
f05f2c2cc2
Add prioritized enableCarMode API in UiModeManager
...
Per design doc (go/android-car-mode-design), added new system API to
enable car mode and specify a priority for the calling app.
Also modified UiModeManager to pass the package name of the caller to
UiModeManagerService.
Bug: 136109592
Test: Added new unit tests and CTS tests.
Test: Added Telecom test app functionality to verify.
Change-Id: I2848039c9ea18ba93e7694e04c4e5dc70759daa3
Merged-In: I2848039c9ea18ba93e7694e04c4e5dc70759daa3
2019-11-19 23:15:52 +00:00
Treehugger Robot
252fcc7b27
Merge "Add support for disconnecting outgoing calls for emergency calls"
2019-11-19 22:44:18 +00:00
Jordan Liu
e993fb8bb9
Merge "Expose Geometry, LatLng, and maxWaitDuration"
2019-11-19 20:55:36 +00:00
Hall Liu
dab3711435
Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
...
Change-Id: Ie08d8bb30e48a9e7ade85334c6195a791ecc0d9b
2019-11-19 12:37:24 -08:00
Jordan Liu
31a4da61b5
Remove unneeded @RequiresPermission annotation
...
Fixes: 144360225
Test: no change to behavior
Change-Id: I7b3ab01c4d232013dcc19de32cc8e2cee9b8cb5a
2019-11-19 11:47:53 -08:00
Brad Ebinger
e11ab258b9
Merge "Reorder getFeatureState parameters to convention"
2019-11-19 19:10:05 +00:00
Charles Munger
b7c5d354fb
Merge "Deprecate account-specific activity subclass"
2019-11-19 16:42:55 +00:00