Neil Fuller
18e458ef00
Merge "Remove dead code from SystemServer" am: 05eeef4188
...
am: 01d1dd28f1
2019-11-25 06:28:07 -08:00
Neil Fuller
01d1dd28f1
Merge "Remove dead code from SystemServer"
...
am: 05eeef4188
2019-11-25 06:12:57 -08:00
Roshan Pius
126fb85c29
Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module" am: 5b57190f08
...
am: 0564779e76
2019-11-25 06:05:07 -08:00
Neil Fuller
05eeef4188
Merge "Remove dead code from SystemServer"
2019-11-25 13:53:15 +00:00
Roshan Pius
0564779e76
Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module"
...
am: 5b57190f08
2019-11-25 05:50:08 -08:00
Oli Lan
129a2c09ac
Wait for available rollbacks in RollbackTest. am: 77a40731f8
...
am: 170a519878
2019-11-25 05:43:32 -08:00
Oli Lan
eb559106bd
Include NewRollbacks in result of getAvailableRollbacks. am: dc4a36105b
...
am: b63dfa2d3b
2019-11-25 05:43:25 -08:00
Oli Lan
ab81c07bb0
Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK. am: 87a504d1fc
...
am: 682e501c2a
2019-11-25 05:43:12 -08:00
Richard Uhler
38467d7eef
Cleanup some obsolete TODOs and unused code. am: cda1a17516
...
am: 01178b4f9d
2019-11-25 05:42:44 -08:00
Oli Lan
170a519878
Wait for available rollbacks in RollbackTest.
...
am: 77a40731f8
2019-11-25 05:35:57 -08:00
Oli Lan
b63dfa2d3b
Include NewRollbacks in result of getAvailableRollbacks.
...
am: dc4a36105b
2019-11-25 05:35:35 -08:00
Oli Lan
682e501c2a
Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK.
...
am: 87a504d1fc
2019-11-25 05:34:25 -08:00
Dan Sandler
486ad0d659
Action chips in share sheet. (DO NOT MERGE)
...
am: 0d3e358628
2019-11-25 05:28:10 -08:00
Richard Uhler
01178b4f9d
Cleanup some obsolete TODOs and unused code.
...
am: cda1a17516
2019-11-25 05:24:46 -08:00
Treehugger Robot
5b57190f08
Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module"
2019-11-25 06:39:04 +00:00
Bill Lin
63e6d6af01
Merge changes from topic "migrate_CtsStagedInstallTest_RollbackTest"
...
* changes:
Add multi-user test for the general non-staged case
Increase timeout in testNativeWatchdogTriggersRollback
Fix flaky testEnableRollbackTimeoutFailsRollback test
Wait for available rollbacks in RollbackTest.
Include NewRollbacks in result of getAvailableRollbacks.
Rename RollbackData to Rollback.
Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK.
Update to new RollbackUtils.sendCrashBroadcast API.
Extend ROLLBACK_COMMITTED broadcast for the multi-user case
Fix NullPointerException.
Cleanup some obsolete TODOs and unused code.
Test Native Watchdog triggers RollbackManager rollback
Uninstall testapps before running SecondaryUserRollbackTest
delete ENABLING rollback if we can't get session info for it.
Add test for rollback of userdata with multiple rollbacks
Load rollback data in RollbackManagerServiceImpl constructor.
Use "commit" for rollbacks instead of "execute".
Add TestApi to block the RollbackManagerHandlerThread.
Use Slog in RollbackManager, not Log
Make setRequestDowngrade @TestApi
Migrate RollbackTest and StagedRollbackTest to cts utils
Add .apex suffix to apex files during validation
Add host side test for secondary user rollback
Reduce ENABLE_ROLLBACK timeout to 0 for timeout test.
2019-11-25 02:56:10 +00:00
Dan Sandler
0d3e358628
Action chips in share sheet. (DO NOT MERGE)
...
Move the Copy button to a new row of chips below the
(now larger) preview. Optionally, if a proximity-sharing
service is installed, show that chip as well.
Bug: 143229724
Fixes: 144290152
Test: atest SystemUITests frameworks/base/core/tests/coretests
Change-Id: I0d6457df85bc937f72ca97da6b4b84b634a90daf
2019-11-24 23:39:49 +00:00
Roshan Pius
9518866c53
NetworkScoreManager: Add @SystemApi for wifi mainline module
...
Add formal API's for API's that the wifi mainline module uses:
a) NetworkScoreManager.requestNetworkScores - Request new network scores.
b) NetworkScoreManager.registerNetworkScoreCallback - @SystemApi wrapper
over the existing registerNetworkScoreCache.
c) NetworkKey.createFromScanResult - Create NetworkKey from ScanResult.
Also,
a) Converted the existing WifiNetworkScoreCache callback implementation to
support both the new @SystemApi (used by wifi) and the old @hide API
(used by settings).
b) Stopped invoking dump on all the callbacks from NetworkScoreService.
The dump of each callback should be invoked at their client site (i.e
wifi service should dump state of the callback it registers with the
service).
c) Added a helper method |dumpWithLatestScanResults| to help dump the
state of the WifiNetworkScoreCache from wifi service.
Bug: 144487252
Test: a) Device boots up and connects to wifi network.
b) Manually verified that network scores are being requested & updated
with the new interface.
Change-Id: Id5a66189150e7a088127519373a832f63bdd12ac
Merged-In: Id5a66189150e7a088127519373a832f63bdd12ac
(cherry-picked from c278f80c28
2019-11-24 07:04:30 +00:00
Felipe Leme
5c9f648edd
Merge "Fixes usage of WallpaperManager to make it optional." into qt-qpr1-dev
...
am: 659f477f65
2019-11-22 16:16:59 -08:00
Charles Munger
17fac19d82
Merge "Deprecate FileUtils.closeQuietly" am: e4b84f3475
...
am: 769cf05c56
2019-11-22 16:08:57 -08:00
TreeHugger Robot
659f477f65
Merge "Fixes usage of WallpaperManager to make it optional." into qt-qpr1-dev
2019-11-23 00:05:20 +00:00
Charles Munger
769cf05c56
Merge "Deprecate FileUtils.closeQuietly"
...
am: e4b84f3475
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
8c6b4a1938
Merge "Resolve API dependencies on BluetoothPan" am: bad5a30d4f
...
am: e89625113d
2019-11-22 15:07:44 -08:00
Rahul Sabnis
e89625113d
Merge "Resolve API dependencies on BluetoothPan"
...
am: bad5a30d4f
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
e28f085137
Merge "Deprecate ListActivity and ExpandableListActivity" am: 0600b03d46
...
am: 87119ab3e2
2019-11-22 13:55:18 -08:00
Charles Munger
87119ab3e2
Merge "Deprecate ListActivity and ExpandableListActivity"
...
am: 0600b03d46
2019-11-22 13:49:30 -08:00
Charles Munger
d1c3f26e59
Merge "Deprecate TimingLogger" am: aec0ab99d4
...
am: 416618a591
2019-11-22 12:57:53 -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
2019-11-22 12:51:48 -08:00
Treehugger Robot
aec0ab99d4
Merge "Deprecate TimingLogger"
2019-11-22 20:22:40 +00:00
Charles Munger
d2db9aeebc
Merge "Deprecate Looper.prepareMainLooper" am: b1f69203e7
...
am: 8292d73554
2019-11-22 12:17:06 -08:00
Charles Munger
8292d73554
Merge "Deprecate Looper.prepareMainLooper"
...
am: b1f69203e7
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
dd682aacaf
Merge changes from topic "hidl-memory-java" am: 887aa66d0a
...
am: e74637df68
2019-11-22 10:16:39 -08:00
Ytai Ben-tsvi
e74637df68
Merge changes from topic "hidl-memory-java"
...
am: 887aa66d0a
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
David Castro
1294b8b570
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev am: 3b74a86752 am: 3a6d5555cd
...
am: 56be7c0b58
2019-11-22 09:09:15 -08:00
David Castro
56be7c0b58
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev am: 3b74a86752
...
am: 3a6d5555cd
2019-11-22 09:02:02 -08:00
David Castro
3a6d5555cd
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev
...
am: 3b74a86752
2019-11-22 08:55:24 -08:00
TreeHugger Robot
3b74a86752
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev
2019-11-22 16:48:36 +00:00
Chalard Jean
eb24ef664f
Merge changes I195d894e,I7069c111 am: 87ed7d7816
...
am: aab1364ef9
2019-11-22 06:33:34 -08:00
Chalard Jean
aab1364ef9
Merge changes I195d894e,I7069c111
...
am: 87ed7d7816
2019-11-22 06:27:42 -08:00
Chalard Jean
87ed7d7816
Merge changes I195d894e,I7069c111
...
* changes:
[NS A10] Cleanup
[NS A09] Always rematch all networks to requests
2019-11-22 14:08:09 +00:00
Aaron Huang
d78b2a0b67
Merge "Expose IpConfiguration and ProxyInfo APIs" am: 920a4a5b1b
...
am: 4082917f46
2019-11-22 01:47:14 -08:00
Aaron Huang
4082917f46
Merge "Expose IpConfiguration and ProxyInfo APIs"
...
am: 920a4a5b1b
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
689403c3d5
Merge "Make Notification.Builder.SetFlag public" am: c8bd4aecb3
...
am: dca2d45630
2019-11-21 18:51:47 -08:00
cncn
dca2d45630
Merge "Make Notification.Builder.SetFlag public"
...
am: c8bd4aecb3
2019-11-21 18:41:27 -08:00
