Richard Uhler
01178b4f9d
Cleanup some obsolete TODOs and unused code.
...
am: cda1a17516
Change-Id: I56bce126042670678002ddbbfcf14ff9f94860c3
2019-11-25 05:24:46 -08:00
Benedict Wong
bf9172deb4
Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig"
...
am: 091e420529
Change-Id: If8bb832c218e426210a9236c3c623da779b78f15
2019-11-22 20:10:36 -08:00
evitayan
1230075676
Expose IKE module API: Session Options & EapSessionConfig
...
am: 39202c84a1
Change-Id: I57f9ee22f7bdc88f1f6d1dd656b579c39bb4d453
2019-11-22 20:10:31 -08:00
evitayan
4e19cf4738
Expose IKE module API: IkeException, configuration & callback
...
am: c4a5883fc5
Change-Id: Ic22bf1514db08f0454ad7a3dcce5c125ce47a293
2019-11-22 20:10:25 -08:00
evitayan
327e0fcecc
Expose IKE module API: IKE ID, TS and SaProposal
...
am: 69d77da91a
Change-Id: I3cc01a28d45bbf9d7706e0522b2c8e1fc8d5a78f
2019-11-22 20:10:18 -08:00
Benedict Wong
091e420529
Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig"
...
* changes:
Expose IKE module API: IkeManager and IkeSession
Expose IKE module API: Session Options & EapSessionConfig
Expose IKE module API: IkeException, configuration & callback
Expose IKE module API: IKE ID, TS and SaProposal
2019-11-23 03:45:53 +00:00
Charles Munger
769cf05c56
Merge "Deprecate FileUtils.closeQuietly"
...
am: e4b84f3475
Change-Id: Ia2f71d7cd97b32a175d0210a8f567ae75030439e
2019-11-22 16:03:14 -08:00
Treehugger Robot
e4b84f3475
Merge "Deprecate FileUtils.closeQuietly"
2019-11-22 23:52:41 +00:00
Rahul Sabnis
e89625113d
Merge "Resolve API dependencies on BluetoothPan"
...
am: bad5a30d4f
Change-Id: Ic9e920c37c6417485f5be12ac6137bb6e0626b92
2019-11-22 15:02:16 -08:00
Treehugger Robot
bad5a30d4f
Merge "Resolve API dependencies on BluetoothPan"
2019-11-22 22:54:37 +00:00
Charles Munger
87119ab3e2
Merge "Deprecate ListActivity and ExpandableListActivity"
...
am: 0600b03d46
Change-Id: Ia077618f79c17277abe49ddd0bd8ddcc20586b0c
2019-11-22 13:49:30 -08:00
Treehugger Robot
0600b03d46
Merge "Deprecate ListActivity and ExpandableListActivity"
2019-11-22 20:53:55 +00:00
Charles Munger
416618a591
Merge "Deprecate TimingLogger"
...
am: aec0ab99d4
Change-Id: Ie6709d7e83ee68d491eac481635bcba3d44efe1e
2019-11-22 12:51:48 -08:00
Treehugger Robot
aec0ab99d4
Merge "Deprecate TimingLogger"
2019-11-22 20:22:40 +00:00
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
Rahul Sabnis
a052447ad6
Resolve API dependencies on BluetoothPan
...
Bug: 143244283
Test: Manual
Change-Id: Ie419b2f83358d06d094dcf4921c4595fc0e72857
2019-11-21 13:16:02 -08: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
Richard Uhler
0c48af84fe
Add TestApi to block the RollbackManagerHandlerThread.
...
To eliminate flakiness when testing timeout conditions for
RollbackTest.testEnableRollbackTimeoutFailsRollback.
Test: atest RollbackTest.testEnableRollbackTimeoutFailsRollback in a loop
Bug: 134373106
Change-Id: I2d1de148a83231f3fd48cc05b7320fa5fdf091ce
Merged-In: I01f3e769711ffa51fa714ff4bc81e70887f427ad
2019-11-21 16:58:45 +08:00
shafik
895901357e
Make setRequestDowngrade @TestApi
...
Test: build
Bug: 134653708
Exempt-From-Owner-Approval: Already approved in
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/8350817/
Change-Id: I732aca8011490fa5815199451566ac8b0b1a2204
Merged-In: Idf99e0810e2e9040f49f06a00722567ac15bbe18
2019-11-21 13:46: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