Commit Graph

96099 Commits

Author SHA1 Message Date
Neil Fuller
4fae9dd7c8 Merge "Allow for empty time suggestions" am: a241a15ccc
am: e02dcaa9d1

Change-Id: I06dd78a0a45df3761c271eb106fc15029989e2bd
2019-11-27 02:11:52 -08:00
Neil Fuller
e02dcaa9d1 Merge "Allow for empty time suggestions"
am: a241a15ccc

Change-Id: Ib6e1ddbba9c474f06475a666d025ab8e0f98189b
2019-11-27 02:04:56 -08:00
Neil Fuller
a241a15ccc Merge "Allow for empty time suggestions" 2019-11-27 09:45:53 +00:00
Sudheer Shanka
069e57e0aa Merge "Fix NetworkPolicyManager unit tests." am: da3518bc6b
am: 1381de466a

Change-Id: I474180a603338a1f980b327f183dac8131577330
2019-11-26 19:10:50 -08:00
Sudheer Shanka
1381de466a Merge "Fix NetworkPolicyManager unit tests."
am: da3518bc6b

Change-Id: I4caf3995143b5dc63925e64a05dd9dd94deec636
2019-11-26 19:05:41 -08:00
Sudheer Shanka
da3518bc6b Merge "Fix NetworkPolicyManager unit tests." 2019-11-27 02:50:56 +00:00
Sudheer Shanka
2d1ab90aa2 Fix NetworkPolicyManager unit tests.
Bug: 137859686
Test: atest core/tests/coretests/src/android/net/NetworkPolicyManagerTest.java
Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: I38a935c71bfb1f78739d508b400e43dc1b52bef5
Merged-In: I38a935c71bfb1f78739d508b400e43dc1b52bef5
(cherry picked from commit 6ec3caf218)
2019-11-27 02:50:03 +00:00
Jiyong Park
0331ee35b1 Merge "Remove @SystemApi annotation for an overriding method" am: 5c7bd75060
am: 232c2e84da

Change-Id: I9976fc35ee7f21aea3563d84cb2d871d03471517
2019-11-26 13:39:28 -08:00
Jiyong Park
232c2e84da Merge "Remove @SystemApi annotation for an overriding method"
am: 5c7bd75060

Change-Id: Icc63a9ee9e0a8752dde244f1f885141a1475c834
2019-11-26 13:33:58 -08:00
Treehugger Robot
5c7bd75060 Merge "Remove @SystemApi annotation for an overriding method" 2019-11-26 21:22:29 +00:00
Tarandeep Singh
80e02c8b2c DO NOT MERGE: Freeup lock when IME is set inactive and unbound
am: ad0a4a229a

Change-Id: Id4551d19bc2c05476c311a888a08aa8f5d449d20
2019-11-26 12:09:53 -08:00
Tarandeep Singh
7b729fa242 DO NOT MERGE: Move startInput for WINDOW_FOCUS_GAIN to background thread
am: 4b6acb4f39

Change-Id: I4e7559656280d062544a37108800cb1e0db4c08c
2019-11-26 12:09:47 -08:00
Jiyong Park
c624e7d158 Remove @SystemApi annotation for an overriding method
Context.registerReceiverForAllUsers are already marked as @SystemApi.
The same method in ContextWrapper overriding it doesn't need to be
annotated as such. In fact, that API is even not recorded in
system-current.txt.

Bug: 144424011
Test: atest CtsSystemApiAnnotationTestCases
Merged-In: I60890104bf20a2c674edd91ec6b487cca1b4e37b
Change-Id: I60890104bf20a2c674edd91ec6b487cca1b4e37b
2019-11-26 18:04:49 +00:00
Jayachandran Chinnakkannu
f72d5dbbf1 Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" am: 9dcbd6de87
am: c0ea72cf10

Change-Id: I916e810b6350be9c1a6b24f2a652e05a1fa444fa
2019-11-26 09:31:33 -08:00
Jayachandran Chinnakkannu
c0ea72cf10 Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)"
am: 9dcbd6de87

Change-Id: Iada558f0d94e08281b6e41825946e5b807618da6
2019-11-26 09:26:07 -08:00
Jayachandran Chinnakkannu
9dcbd6de87 Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" 2019-11-26 17:17:38 +00:00
Jayachandran C
f823445e53 Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)
This CL deletes the reference to this API as its used in a dead code
which is used for debugging only.

Bug: 140908357
Test: Build
Change-Id: I9fa1996ab5fdb5ab884128d06c2e92bab164dea7
2019-11-25 15:19:47 -08:00
Meng Wang
ec606bd492 Merge "System API: Context#registerReceiverForAllUsers" am: 9e590914cb
am: 5eda192492

Change-Id: Ia177e20dd70a6db34accd01dfa1e4c59f264cbc1
2019-11-25 10:16:28 -08:00
Meng Wang
5eda192492 Merge "System API: Context#registerReceiverForAllUsers"
am: 9e590914cb

Change-Id: I2d98300ad4958d19e69dcdfda83e9d5df086d43a
2019-11-25 10:07:43 -08:00
Meng Wang
9e590914cb Merge "System API: Context#registerReceiverForAllUsers" 2019-11-25 17:53:53 +00:00
Neil Fuller
18e458ef00 Merge "Remove dead code from SystemServer" am: 05eeef4188
am: 01d1dd28f1

Change-Id: Ifa10a6e2b48f596bfa6854e1a950cec060253c76
2019-11-25 06:28:07 -08:00
Neil Fuller
01d1dd28f1 Merge "Remove dead code from SystemServer"
am: 05eeef4188

Change-Id: I910fb0ac35c8de8fd500b3df0253c65b6b201fb4
2019-11-25 06:12:57 -08:00
Roshan Pius
126fb85c29 Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module" am: 5b57190f08
am: 0564779e76

Change-Id: I04580ad32eefb2ce4c8df8f1037b8457238c30eb
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

Change-Id: I73c98d9dcb43f2db1e74f6d431f07ac90ee813e6
2019-11-25 05:50:08 -08:00
Oli Lan
129a2c09ac Wait for available rollbacks in RollbackTest. am: 77a40731f8
am: 170a519878

Change-Id: I8a40c818a3ea6499f28b096a2d342b26e7153080
2019-11-25 05:43:32 -08:00
Oli Lan
eb559106bd Include NewRollbacks in result of getAvailableRollbacks. am: dc4a36105b
am: b63dfa2d3b

Change-Id: I4f35f5098c650288db33bf304ba8adbac14f4ed6
2019-11-25 05:43:25 -08:00
Oli Lan
ab81c07bb0 Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK. am: 87a504d1fc
am: 682e501c2a

Change-Id: Icad482e10141258d65b9bbc380830418e17486e8
2019-11-25 05:43:12 -08:00
Richard Uhler
38467d7eef Cleanup some obsolete TODOs and unused code. am: cda1a17516
am: 01178b4f9d

Change-Id: I8077abf3a2262e13a0c638bb2c7f8c052d22a7f6
2019-11-25 05:42:44 -08:00
Oli Lan
170a519878 Wait for available rollbacks in RollbackTest.
am: 77a40731f8

Change-Id: I83b8f07f333e318bb7fd31b2bec3f868b1848c6c
2019-11-25 05:35:57 -08:00
Oli Lan
b63dfa2d3b Include NewRollbacks in result of getAvailableRollbacks.
am: dc4a36105b

Change-Id: I6d45d8a2c408e4d8def25895846d6b7c3bf0de29
2019-11-25 05:35:35 -08:00
Oli Lan
682e501c2a Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK.
am: 87a504d1fc

Change-Id: I8636d29038d10d3f4182e130de08ad8efa294a8e
2019-11-25 05:34:25 -08:00
Dan Sandler
486ad0d659 Action chips in share sheet. (DO NOT MERGE)
am: 0d3e358628

Change-Id: I0df785ea4279811fe4f556f67dde8e3c6cef98b0
2019-11-25 05:28:10 -08:00
Richard Uhler
01178b4f9d Cleanup some obsolete TODOs and unused code.
am: cda1a17516

Change-Id: I56bce126042670678002ddbbfcf14ff9f94860c3
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
Tarandeep Singh
ad0a4a229a DO NOT MERGE: Freeup lock when IME is set inactive and unbound
Any pending windowGainedFocus future should be cancelled when IME is
switched/unbound.
Additinally, startInputInner() inside synchronized block blocked
WINDOW_FOCUS_GAIN from executing. Its fine to remove synchronization
here since startInputInner() already has relevant synchronized blocks.

Change-Id: I98cb044d8cbfb80480312a3923f168aefa9b7e7d
Fix: 144103599
Bug: 139806621
Test: Manually using the steps in bug.
(cherry picked from commit 322ee9bf9e)
2019-11-23 04:14:49 +00:00
Tarandeep Singh
4b6acb4f39 DO NOT MERGE: Move startInput for WINDOW_FOCUS_GAIN to background thread
For a typical window with Editor, IMM#startInputOrWindowGainedFocus
is called twice: first for WINDOW_FOCUS_GAIN (dummyInput), then
CHECK_FOCUS when actual editor receives focus and startsInput.
The first once can be moved to background thread and second startInput
will wait till its finished.

Bug: 139806621
Test: Manually launch activities with editors and confirm no change in
behavior.

Change-Id: I6aa4a664cfd0c86f75cee2457715317194bbe5e2
(cherry picked from commit e0172102b9)
2019-11-23 04:13:28 +00:00
Meng Wang
e3bd3babbc System API: Context#registerReceiverForAllUsers
Bug: 141193711
Test: make
Merged-In: Ie692d2ac27474b9fe11f5548bc504aa00c5ad53c
Change-Id: Ie692d2ac27474b9fe11f5548bc504aa00c5ad53c
2019-11-23 02:17:27 +00:00
Felipe Leme
5c9f648edd Merge "Fixes usage of WallpaperManager to make it optional." into qt-qpr1-dev
am: 659f477f65

Change-Id: I6946b0001c524dff8d11b2889e8b30d6a059218d
2019-11-22 16:16:59 -08:00
Charles Munger
17fac19d82 Merge "Deprecate FileUtils.closeQuietly" am: e4b84f3475
am: 769cf05c56

Change-Id: I1acede5beae3963825155e83eaa4381ea27c83c6
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

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
8c6b4a1938 Merge "Resolve API dependencies on BluetoothPan" am: bad5a30d4f
am: e89625113d

Change-Id: Ifa162b24cf19f85f15f10e0ce975bf3006979a71
2019-11-22 15:07:44 -08: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
e28f085137 Merge "Deprecate ListActivity and ExpandableListActivity" am: 0600b03d46
am: 87119ab3e2

Change-Id: Id3f4e5cc41c143161b0fc5d7b173a1baff88de5b
2019-11-22 13:55:18 -08:00