461513 Commits

Author SHA1 Message Date
Al Sutton
cd2ed27f7f Add first order deps to test build file
We should have our first order dependencies specified in our build
file to help aidegen ensure that any generated IDE files aren't
missing crucial dependencies.

In this case adding mockito and truth allows IntelliJ to show the
verify(...) and assertThat(....) calls are valid and not leave them
as red-underlined undefinied calls.

Test: aidegen frameworks/base/services/robotests/backup/
Change-Id: Iea347c623dc0bbe5740d6129e710b4757c87d781
2020-01-17 12:31:02 +00:00
TreeHugger Robot
16a6ec7e26 Merge "Add device policy API to toggle Common Criteria mode" 2020-01-17 12:22:54 +00:00
Kyunglyul Hyun
c6583833d4 Revert "Revert "MediaRouter: add routing controller in MRM""
This reverts commit 7d720f70be5f104b71afa68797a95224631fa9d0.

Reason for revert: Fixed the build issue

Test: atest mediaroutertest

Change-Id: I6cae922d701640a1f43965041c653bd7a61411cb
2020-01-17 20:48:57 +09:00
Treehugger Robot
046d939399 Merge changes from topic "apps_to_system_ext"
* changes:
  Move the app to /system_ext
  Set sdk_version "current" in test package
  Move the permission.xml to /system_ext
  Move SystemUI to /system_ext
  move privapp_whitelist_com.android.storagemanager to system_ext
  Move 'privapp_whitelist_com.android.launcher3' to system_ext
  Move 'privapp_whitelist_com.android.settings' to system_ext
  move privapp_whitelist_com.android.provision to system_ext
  privapp_whitelist_com.android.emergency to system_ext
  privapp_whitelist_com.android.carrierconfig to system_ext
2020-01-17 11:44:42 +00:00
Adrian Roos
2835792aa7 API: Supress existing inconsistent Context service names
Test: make checkapi
Change-Id: I1f140dc172a405fed52f0f8d6c16f2f730ab89be
Merged-In: I1f140dc172a405fed52f0f8d6c16f2f730ab89be
2020-01-17 12:30:38 +01:00
Omer Nebil Yaveroglu
35e8f367b3 Put size limits on the number of rules that can be
pushed through a verifier.

Bug: 147865065
Test: atest FrameworksServicesTests:RuleBinarySerializerTest
Change-Id: I7767fe9bc18761988b8ef19578d491183904984b
2020-01-17 11:28:42 +00:00
Adrian Roos
d38f509e90 API: Supress existing inconsistent Context service names
Test: make checkapi
Change-Id: I1f140dc172a405fed52f0f8d6c16f2f730ab89be
2020-01-17 12:21:59 +01:00
Robert Horvath
c467ff4f51 Merge "Initialize HDMI PowerStatus to standby" 2020-01-17 11:13:53 +00:00
Robert Horvath
28d29b36a5 Merge "Go to sleep on boot when booting in quiescent mode" 2020-01-17 11:13:53 +00:00
Orion Hodson
1572fbe6cf Merge "Revert "MediaRouter: add routing controller in MRM"" 2020-01-17 11:10:26 +00:00
Kyunglyul Hyun
7d720f70be Revert "MediaRouter: add routing controller in MRM"
This reverts commit b3dacf3d566006ad5855c50c5772d20cb6c7e8c9.

Reason for revert: Build Fail (ab/6143227)

Change-Id: I456d1ffe4a9760e65f91c37cd67bb9e9daabcc8e
2020-01-17 11:03:28 +00:00
Automerger Merge Worker
aa6e958606 [automerger skipped] DO NOT MERGE Fix AppOpsServiceTest am: 05024a1523 -s ours am: 3a8e32d878 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a452a14bec588a52ba7983be2fd897a23a21b53
2020-01-17 10:59:28 +00:00
Automerger Merge Worker
3a8e32d878 [automerger skipped] DO NOT MERGE Fix AppOpsServiceTest am: 05024a1523 -s ours
am skip reason: Change-Id Ie816e0c6c81ecf25d37f05187591ca0d1edf0bc2 with SHA-1 c03b32c406 is in history

Change-Id: Ieff7e7e29c8a6dabb7a1dc0ddbd0d88d2f3613fc
2020-01-17 10:50:52 +00:00
Rubin Xu
41bdd9713d Add device policy API to toggle Common Criteria mode
Common Criteria mode puts device into a state where certain
funtionalities are tuned or turned on to meet the higher security
requirement from Common Criteria certification. Device Owner
can use the new device policy API to toggle Common Criteria mode.

Bug: 137937540
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Test: atest SettingsProviderTest
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testCommonCriteriaMode
Test: atest com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testCommonCriteriaMode
Change-Id: If07c053437e980ed3317d3838cc74e5bfd44efce
2020-01-17 10:20:21 +00:00
Nikita Iashchenko
d092e7cb86 Merge "Update API surface for ICU 66.0.1" 2020-01-17 10:10:09 +00:00
Kyunglyul Hyun
38e8482f6f Merge "MediaRouter: add routing controller in MRM" 2020-01-17 09:43:24 +00:00
Hyundo Moon
dda8cdd510 Merge "MediaRouter2: Add OnCreateSessionListener" 2020-01-17 09:36:07 +00:00
Jeongik Cha
2f4deb666e Move the app to /system_ext
We plan to forbid hidden API in product partition.
So these apps have to be moved to /system_ext because it uses hidden API.
It is not permanent, so they can be moved back to /product due to
needs if there isn't hidden usage anymore.

Bug: 137908189
Test: m
Test: check whether device boots successfully
Change-Id: I0662674a66bc54ee4713e5c7ed6ad0db4d342338
Merged-In: I0662674a66bc54ee4713e5c7ed6ad0db4d342338
2020-01-17 09:16:14 +00:00
Jeongik Cha
e88936689e Set sdk_version "current" in test package
java_library com.android.test.libs.product is located in product
partition, but its sdk_version isn't set. And it will be forbidden.

So set sdk_version "current"

Test: mma
Bug: 137908189
Change-Id: I3f5a164703f0e5a1f7d43b9f28cda7fa99033186
Merged-In: I3f5a164703f0e5a1f7d43b9f28cda7fa99033186
2020-01-17 09:16:03 +00:00
Jeongik Cha
45ebd05bea Move the permission.xml to /system_ext
As mentioned in b/132780927, we plan to forbid hidden APIs usage in /product partition,
in other word, apps in /product are allowed to use only either public API or system API.
So, this app will be moved to /system_ext, of course, it is not permanent,
they can be moved back to /product if they don't use hidden API anymore.

Bug: 137908189
Test: m
Test: check whether device boots successfully
Change-Id: I623e0dcc1d3bc1a2a69a6cad34ace1f79532654e
Merged-In: I623e0dcc1d3bc1a2a69a6cad34ace1f79532654e
2020-01-17 09:15:53 +00:00
TreeHugger Robot
42b4cba128 Merge "Fix sizes of audio recording indicator" 2020-01-17 09:11:05 +00:00
Joanne Chung
b0dbf96728 Merge "TextLinks API updates." 2020-01-17 09:06:52 +00:00
Goven Liu
9863ff1fe9 Merge "[Wi-Fi] Refactor add wifi networks feature to use WifiNetworkSuggestion." 2020-01-17 08:14:52 +00:00
Rhed Jao
18dcc695de Merge "Fix a11y shortcut failed to be disabled by the warning dialog." 2020-01-17 08:11:56 +00:00
Ryan Lin
be69a3b62f Merge "Added an interface between Sysui and system_server" 2020-01-17 07:40:04 +00:00
Mingguang Xu
ec6f8ce6fd Extension API: Create System APIs to allow OEM module to override WiFi
scorer in AOSP

Create WiFi scorer interface and score change callback interface in WifiManager; Define register and unregister methods for WiFi scorer.

Test: atest android.net.wifi
Bug: 135573686, 122133502, 136312816, 135572156

Change-Id: Ib51d877a463d1f69b31b9743917ea1b3590a30f7
Signed-off-by: Mingguang Xu <mingguangxu@google.com>
2020-01-17 07:22:50 +00:00
Kyunglyul Hyun
b3dacf3d56 MediaRouter: add routing controller in MRM
This CL introduces RoutingController into MediaRouter2Manager
to enable it to control remote routing sessions.

Tests are also revised according to MRM changes.

Bug: 147787194
Test: atest mediaroutertest

Change-Id: Id4ab61fcb690fccac42df049e1fb74d89bcf3d6a
2020-01-17 15:52:00 +09:00
Siddhartha Chhabra
4b01b414c6 Merge "Added query and SearchResults." 2020-01-17 06:37:37 +00:00
Daniel Bright
8bb56fc88c Make string version of APN_TYPEs a @SystemApi
The string version of Apn Types are used in the carrier config table.
Modules besides Telephony uses this table directly and so it made sense to expose
this as a @SystemApi

Test: ApnSettingsTest
Bug: 147465477
Change-Id: I1c344b3ff482d973b8bf51a33956a7f90f291634
2020-01-16 22:34:38 -08:00
govenliu
041217c980 [Wi-Fi] Refactor add wifi networks feature to use WifiNetworkSuggestion.
WifiConfiguration used in the feature of add apps Wi-Fi networks was deprecated, need to be changed to use WifiNetworkSuggestion instead.

Bug: 136472483
Test: just add action, test case will be in Settings App side.
Change-Id: Ia1e4ab88dd70f951ff4e9115b1e373a9886ab565
2020-01-17 14:25:31 +08:00
Hyundo Moon
84e027d63b MediaRouter2: Add OnCreateSessionListener
Bug: 147851996
Test: atest mediaroutertest
Change-Id: If754b5b70123382900c2582c3f126da204488145
2020-01-17 15:06:50 +09:00
Rambo Wang
e35bc815b6 Annotate StringNetworkSpecifier @Deprecated and @removed
Bug: 147441267
Test: make offline-sdk-docs
Change-Id: I101021b9e32b55e0845934c04e05f6f06a642617
2020-01-16 21:45:09 -08:00
Chalard Jean
fb342fcf55 Merge "Make NetworkCapabilities authoritative for suspended state" 2020-01-17 05:08:11 +00:00
Christian Wailes
75d2977539 Merge changes I7328f304,Id3a3d0b2 into stage-aosp-master
* changes:
  Adjusts the USAP pool refill mechanism.
  Change USAP name to application name as soon as possible.
2020-01-17 05:08:02 +00:00
TreeHugger Robot
64259a3b43 Merge "Simplify the activity lifecycle from START to STOP" 2020-01-17 05:03:28 +00:00
Andrii Kulian
2b3b20c388 Merge changes from topic "app_config_compat"
* changes:
  Update resource config for default display
  Override process config to match activity config
  Set parent for WindowProcessController
2020-01-17 04:56:41 +00:00
David Su
6c82ddd688 Jarjar DnsSdTxtRecord into framework-wifi
DnsSdTxtRecord is @hide, thus need to statically
link it into framework-wifi and rename it to
prevent duplicate classes on the classpath.

Bug: 135998869
Test: boots up and connects to wifi
Change-Id: I018a8c2e8b124b11077db631e643c751a73394c5
2020-01-16 20:56:18 -08:00
David Su
c976e8663a Build framework-telephony-stubs against core_current
Build framework-telephony-stubs against
core_current so that it can be linked by
framework-wifi, which will also be built
against core_current.

Bug: 140908357
Test: device boots up
Change-Id: I20bf13a100d6dfca06c4e108a837987234ec2b38
2020-01-16 20:56:18 -08:00
Steven Thomas
777401766b Merge "Make setActiveConfig() private, remove plumbing" 2020-01-17 04:50:19 +00:00
Minche Li
a27e7a133f Merge "Update window magnifier UI when onConfigurationChanged. (1/n)" 2020-01-17 04:00:37 +00:00
Automerger Merge Worker
d4a5c9cd25 [automerger skipped] Adding atoms for metrics logging am: 5d8df1f08c am: 2a12d7c446 -s ours
am skip reason: Change-Id Ic502acc8831fe4da0b32a826171d10e9c0f9876d with SHA-1 167c3db934 is in history

Change-Id: I39493ac64ca88d768c8b6a8a0540124d0694ce8c
2020-01-17 03:51:05 +00:00
Nick Chalko
08d8aca488 Update documentation for scan commmands
Move scan type constants to ScanCallback

Test: m framework-all
Change-Id: I59313e9bb7c1d989cbcdfbce672b7289ed7a0268
Bug: 139308734
2020-01-16 19:47:04 -08:00
Tej Singh
6b9798385b Expose java puller api as @SystemAPI
Also clear calling identity before invoking the pull.

Test: make
Test: atest GtsStatsdHostTestCases
Bug: 146383532
Change-Id: I9a17d88944da0074dbbaffb0c1b99a9ce7743991
2020-01-17 03:45:49 +00:00
Automerger Merge Worker
2a12d7c446 Adding atoms for metrics logging am: 5d8df1f08c
Change-Id: I75a3c7c4a5988328daac05e9449bad1552ce41f3
2020-01-17 03:36:02 +00:00
Brad Ebinger
40cae1c0c9 Merge "Expose ImsFeature#getFeatureState as @SystemApi" 2020-01-17 03:34:05 +00:00
evitayan
0275deb3dd Add setters for IKE and Child SA lifetime
Bug: 147831552
Test: make update-api && make
Test: atest FrameworksIkeTests (passing)
Change-Id: I20f1eac709fa642867b942de278bc3557df0e2d7
2020-01-16 19:20:23 -08:00
Brad Ebinger
265173dc66 Merge "Properly catch ServiceSpecificException if IMS isn't available" 2020-01-17 03:20:19 +00:00
Mark Chien
05c43b7095 Merge "add java_api_finder plugin to tethering module" 2020-01-17 03:16:34 +00:00
TreeHugger Robot
ca878a4c66 Merge "Clean up tuner constants and update according to ag/9977359" 2020-01-17 02:54:38 +00:00
Joanne Chung
eae7bb76a9 TextLinks API updates.
1. Change TextLinks.getText() return type from String to CharSequence
2. Javadoc improvement

Bug: 147761091
Test: atest FrameworksCoreTests:android.view.textclassifier
Test: atest android.view.textclassifier.cts.TextClassifierValueObjectsTest
Change-Id: I40e4f401025f96717272a9ea2aac4c168297191e
2020-01-17 10:44:51 +08:00