Commit Graph

95811 Commits

Author SHA1 Message Date
Suprabh Shukla
040206bfcc Merge "Adding version code R for development"
am: b578bdbe43

Change-Id: I704d797eb4c3c0f2ffc449cb32681e68fcf7cc16
2019-11-29 09:18:22 -08:00
Treehugger Robot
b578bdbe43 Merge "Adding version code R for development" 2019-11-29 17:10:43 +00:00
Felix
1397337346 Merge "core/Build: ro.system when comparing fingerprint"
am: 82fee58478

Change-Id: I527f1ff7c5e9dda76ec36dbe6fb1d041e6a36437
2019-11-28 18:45:32 -08:00
Treehugger Robot
82fee58478 Merge "core/Build: ro.system when comparing fingerprint" 2019-11-29 02:36:48 +00:00
Suprabh Shukla
6a509cf4a5 Adding version code R for development
Test: Builds

Bug: 129975435
Change-Id: I26ef76266b2f52746ca08a45f5013c580cecd4fb
Merged-In: I26ef76266b2f52746ca08a45f5013c580cecd4fb
(cherry picked from commit 1d081c503c)
2019-11-28 14:29:12 +00:00
Aaron Huang
21d23db938 Merge "Add IpConfiguration parcelable interface implementation to system API"
am: 76101baf9a

Change-Id: I3ead12ee9162c16f8f5937cfc74f38071cef41c9
2019-11-28 02:09:43 -08:00
Aaron Huang
76101baf9a Merge "Add IpConfiguration parcelable interface implementation to system API" 2019-11-28 09:56:58 +00:00
Neil Fuller
b07f90adb8 Merge "Add a new method to set time"
am: 5f01cb6ddc

Change-Id: If92a40f84971a663f99d7d764cd45e8d3510bfda
2019-11-28 00:54:46 -08:00
Neil Fuller
5f01cb6ddc Merge "Add a new method to set time" 2019-11-28 08:47:32 +00:00
Aaron Huang
42daacaea7 Add IpConfiguration parcelable interface implementation to system API
API lint robot warnings that parcelable requires writeToParcel
and describeContents.

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: I7acf000c468788c3fdcb47f8601762e7804ab940
2019-11-28 07:25:40 +00:00
Meng Wang
f275072086 Merge "Move android.service.euicc.* into telephony"
am: 4d1971e880

Change-Id: I7b06c381b0afc3ecee0e9632e9faf0e2834ed881
2019-11-27 13:38:38 -08:00
Meng Wang
3963cb45d1 Merge "Move CarrierIdentifier/CarrierService to telephony"
am: 306786abd4

Change-Id: I20c8065c746f4ce025ef45ef4dc6ad0726f83b22
2019-11-27 13:34:51 -08:00
Meng Wang
9b84a44f04 Merge "Move android.provider.Telephony to frameworks/base/core"
am: 4d0df870cd

Change-Id: I1015777c7fa0e5b67ea3d9da4c14036842b527aa
2019-11-27 13:31:23 -08:00
Meng Wang
4d1971e880 Merge "Move android.service.euicc.* into telephony" 2019-11-27 21:23:59 +00:00
Meng Wang
306786abd4 Merge "Move CarrierIdentifier/CarrierService to telephony" 2019-11-27 21:23:31 +00:00
Meng Wang
4d0df870cd Merge "Move android.provider.Telephony to frameworks/base/core" 2019-11-27 21:23:09 +00:00
Meng Wang
2b8d61158d Move android.service.euicc.* into telephony
Bug: 145232482
Test: make
Change-Id: I9dc5c904761f688e7abecea47647da29f6cec512
2019-11-27 19:15:55 +00:00
Meng Wang
a9ed606636 Move CarrierIdentifier/CarrierService to telephony
Bug: 145232482
Test: make
Change-Id: I9ba0618bb6f95f5caadc3ac9ac75e97efa5573c6
2019-11-27 19:15:37 +00:00
Meng Wang
6b2264a1cb Move android.provider.Telephony to frameworks/base/core
Bug: 145232482
Test: make
Change-Id: I49a9e8b1b5e3c99f0ed84638fc9f79202b0189b3
2019-11-27 11:06:43 -08:00
Tony Mak
fbe852495c Fix a broken test by mocking PackageManager
There is no email app in AOSP, and thus the test fails.
Mocking the package manager output to fix the test

Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/TextClassifierTest.java

Fixes: 139536812
Fixes: 145209230
Fixes: 145287677

Change-Id: I86026724c81f9d928eb652f25fc968911f93001b
Merged-In: Ie2dd599528074266d45044b1785a1b7d71caa1d3

Exempt-From-Owner-Approval: Re-enabling test in TEST_MAPPING
for AOSP.
2019-11-27 18:28:06 +00:00
Neil Fuller
3aedd49238 Add a new method to set time
Before this change there are a various components that set the system
clock by directly calling AlarmManager.setTime(). This change exposes a
new method on TimeDetector to use when setting the device time manually
(e.g. via settings) and modifies some callers to use it.

The intent is to later restrict the number of distinct processes that
can manipulate the device system clock directly so that all time changes
go through the time detector service, which can enforce policy, log
the reasons for changes, and so on.

Bug: 140712361
Test: atest com.android.server.timedetector
Change-Id: I9300dba868ed61249d0848b0dd4b953996161bda
Merged-In: I9300dba868ed61249d0848b0dd4b953996161bda
(cherry picked from commit e376756b0c)
2019-11-27 16:34:53 +00: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
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
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
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
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
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
01d1dd28f1 Merge "Remove dead code from SystemServer"
am: 05eeef4188

Change-Id: I910fb0ac35c8de8fd500b3df0253c65b6b201fb4
2019-11-25 06:12:57 -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
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
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
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
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
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