Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,958 Commits 3 Branches 0 Tags
477fdc1a3ba2a820544bbe61dc638bcd8ebd64ce
Commit Graph

640958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
cf7f7a04d2 Merge "Add carrier config nr_advanced_capable_pco_id_int" into sc-dev 2021-05-11 12:08:19 +00:00
Fiona Campbell
27724516ef Merge "Fix crash in BrightnessTracker write events" into sc-dev 2021-05-11 12:02:27 +00:00
Anton Hansson
8f1928f4ca Merge "Apply the same filtering for docstubs and jarstubs" am: 46dff8e09f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700027

Change-Id: Ie8bd1bc14f50744f85f4860944d84128b7fca83f
 2021-05-11 11:58:30 +00:00
Anton Hansson
46dff8e09f Merge "Apply the same filtering for docstubs and jarstubs" 2021-05-11 11:24:14 +00:00
Stanislav Zholnin
3a2903b945 Fix race condition in DiscreteRegistry test set up. 
Fix: 187471134
Test: atest android.app.appops.cts.DiscreteAppopsTest
Change-Id: Ife71625711083edce6505cc3963ba51c7e8ff590
 2021-05-11 11:06:02 +00:00
Tiger Huang
f0cf73d84b Merge "Let IME receive insets ignoring z-order" into sc-dev 2021-05-11 10:55:03 +00:00
Anton Hansson
160d104df9 Merge "Use filegroups for test-{base,mock,runner} srcs" am: af9b5f0a04 am: 06e56695cc am: 4eecbfcd41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700026

Change-Id: I5444e5d1028c8cf9cd3fa624e05ad5b102866d94
 2021-05-11 10:49:42 +00:00
Lucas Lin
98994935c1 [automerger skipped] Merge "Replace hidden API with public API" am: 7283a692b0 am: 78619286d3 am: c127bc6c68 -s ours 
am skip reason: Merged-In I671aaf5099f7cd3459588a78cb99de39a0e23f95 with SHA-1 d569b783aa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696668

Change-Id: Iabc9b8598bdeb8b0b23e9f4c39c2c421a62fe434
 2021-05-11 10:49:19 +00:00
Anton Hansson
8acd3a8e2b Merge "Fix incorrect package in PackageChangeReceiver" am: 0ee8641209 am: 03c08d1f14 am: 3da1090ce6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699739

Change-Id: Ib3596c8941803cfc7e55d47e2099d38857ade59c
 2021-05-11 10:48:48 +00:00
Wesley.CW Wang
9c368494c7 Update UsageProgressBarPref layout 
screenshot: https://screenshot.googleplex.com/9869pj4zNcqXWE6.png

Bug: 187770039
Bug: 187769839
Test: atest UsageProgressBarPreferenceTest
Change-Id: I31983d72cfe705c2328bcadaf4d048e2a4645b0b
 2021-05-11 18:48:32 +08:00
Anton Hansson
822d0ac2ba Merge "Inline two constants from CorePlatform" am: dbf1544b68 am: e3eefd6d2e am: 833e374197 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727

Change-Id: Ibac0caf69f17c8f003a4a197654c176448a9b7b9
 2021-05-11 10:48:12 +00:00
Anton Hansson
4eecbfcd41 Merge "Use filegroups for test-{base,mock,runner} srcs" am: af9b5f0a04 am: 06e56695cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700026

Change-Id: I107e919ab5b175789ed96cc1d4f26e8075bfa2c5
 2021-05-11 10:45:31 +00:00
Alex Johnston
c8dffffc26 Merge "Remove device ownership text in quick settings" into sc-dev 2021-05-11 10:32:23 +00:00
Lucas Lin
c127bc6c68 Merge "Replace hidden API with public API" am: 7283a692b0 am: 78619286d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696668

Change-Id: I73eb1314cc4c894d9c4b7455588da7557eb792fb
 2021-05-11 10:30:02 +00:00
Anton Hansson
3da1090ce6 Merge "Fix incorrect package in PackageChangeReceiver" am: 0ee8641209 am: 03c08d1f14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699739

Change-Id: I8b990f0929f557cb9b38ebb401ad98e287d39f1b
 2021-05-11 10:29:32 +00:00
Anton Hansson
833e374197 Merge "Inline two constants from CorePlatform" am: dbf1544b68 am: e3eefd6d2e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727

Change-Id: Ifa3f8535c1135b5b67fc1fc9cb4f0377be3acd86
 2021-05-11 10:29:15 +00:00
Anton Hansson
06e56695cc Merge "Use filegroups for test-{base,mock,runner} srcs" am: af9b5f0a04 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700026

Change-Id: I6e67d5d69e4863472eec70454cb9b338c40209a5
 2021-05-11 10:29:02 +00:00
Lucas Lin
78619286d3 Merge "Replace hidden API with public API" am: 7283a692b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696668

Change-Id: I4eaeb64157a95e91ca7af93c08a603483ceb9334
 2021-05-11 10:26:24 +00:00
Anton Hansson
af9b5f0a04 Merge "Use filegroups for test-{base,mock,runner} srcs" 2021-05-11 10:09:00 +00:00
Anton Hansson
03c08d1f14 Merge "Fix incorrect package in PackageChangeReceiver" am: 0ee8641209 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699739

Change-Id: Iaa83eecc886429b13ac569eae80a16b058670b20
 2021-05-11 10:06:13 +00:00
Lucas Lin
7283a692b0 Merge "Replace hidden API with public API" 2021-05-11 09:52:50 +00:00
Anton Hansson
0ee8641209 Merge "Fix incorrect package in PackageChangeReceiver" 2021-05-11 09:46:29 +00:00
Rubin Xu
c91f0da4fd Merge "Update SecurityLog javadoc" into sc-dev 2021-05-11 09:31:51 +00:00
Treehugger Robot
f6bb9a2050 Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" am: b369ebee31 am: 6edf32bd8e am: 04b9df477a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1701245

Change-Id: I435f82920ceaf7ebd6d2d4a8f73b0a21a23f28ef
 2021-05-11 09:25:56 +00:00
Anton Hansson
e3eefd6d2e Merge "Inline two constants from CorePlatform" am: dbf1544b68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699727

Change-Id: I9888625f7e797b23b1a860cb6f076a6860428f27
 2021-05-11 09:25:17 +00:00
Marcin Oczeretko
af586a1465 Merge "Count the overall number of missed frames" into sc-dev 2021-05-11 09:09:40 +00:00
Anton Hansson
dbf1544b68 Merge "Inline two constants from CorePlatform" 2021-05-11 09:00:57 +00:00
Hai Zhang
4d01a45c44 Remove workaround for R class conflict in Settings unit test. 
The workaround is accessing the resources dynamically with
Resources.getIdentifier(), however this makes it incompatible with R8
which will think the resource is unused and remove it, resulting in a
runtime exception. There is currently no way to have consumer ProGuard
texts in Soong, and we cannot disable R8 for PermissionController
because it would severely regress our APK size and make build unhappy.

The real cause for the original test failure is that, Settings unit
test used to include SettingsLib libraries in its static_libs, and
this caused duplicate R classes to be included in its test APK (which
is already in Settings APK) and resulted in the wrong R class being
loaded when accessing resources from Settings context.

So we should remove the SettingsLib dependencies in Settings unit test
and remove the workaround here, to correctly fix the issue and unblock
R8 usage.

Bug: 183340630
Bug: 177638625
Bug: 183342958
Test: atest SettingsSliderPreferenceControllerTest
Test: atest PrivateVolumeForgetTest
Change-Id: I404892ccb7c2004ec3f81df69c1dc4bceed150df
 2021-05-11 01:54:37 -07:00
Lorenzo Colitti
1d4fb5b91c Rename unwanted capabilities to forbidden capabilities. 
Addresses API council feedback.

Bug: 184890428
Test: atest FrameworksNetTests CtsNetTestCases
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest on R device
Change-Id: Id7c68fbf56ee08fcad8e8e3aacf037fa1885936b
 2021-05-11 17:46:13 +09:00
Bill Yi
84a229ffeb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib26fefe8ab814e184bb1ab6d669980448815b9d2
 2021-05-11 08:29:14 +00:00
Treehugger Robot
04b9df477a Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" am: b369ebee31 am: 6edf32bd8e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1701245

Change-Id: I71cc95dd57f112fba51e41a862deacdbdc1e9b6d
 2021-05-11 08:27:17 +00:00
kholoud mohamed
158dd8fc09 Allow forceUpdateUserSetupComplete for non system users 
Test: atest android.devicepolicy.cts.DevicePolicyManagerTest
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Bug: 183716601
Change-Id: Id2340ac1c6404ac41ca7b5a31c6fbb1577804595
 2021-05-11 09:25:20 +01:00
Bill Yi
a075aff99a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If9dc1a738b6787818c1c43f7942129f9c561f02c
 2021-05-11 08:22:34 +00:00
Bill Yi
8e091762f4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib1de5eed1c13144a2a6f24840b3b248978e68fd8
 2021-05-11 08:19:17 +00:00
Shan Huang
6dbef56e06 Merge "Update wireless charging layout to match the new design." into sc-dev 2021-05-11 08:06:59 +00:00
Ken Chen
8dbaacfe45 Switch from networkCreate[Physical/Vpn] to networkCreate 
networkCreatePhysical and networkCreateVpn are non-extensible. In order
to pass OEM requested VPN type to Netd, we need to migrate to
networkCreate API.

Modify test code accordingly since networkCreatePhysical and
networkCreateVpn have been deprecated on Netd.

Bug: 171872481
Test: atest FrameworksNetTests
atest atest HostsideVpnTests

Change-Id: I50ab8615346c49559c16e815482e7804a1e765c8
 2021-05-11 16:06:54 +08:00
Treehugger Robot
6edf32bd8e Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" am: b369ebee31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1701245

Change-Id: Ica5e6524d2fc45db65500d36e31604deb08632a8
 2021-05-11 08:03:32 +00:00
Terry Wang
9a950ce716 Handle user stopping in AppSearch. 
When a user stops, we can close its AppSearchImpl instance to release
resources. We'll also remove it from our cache of unlocked users so
future API calls won't execute on a locked user.

Bug: 179407490
Test: atest --rebuild-module-info CtsAppSearchHostTestCases
Change-Id: I09953d32ad4aaf2989386e99c93623b58d564c27
 2021-05-11 01:00:07 -07:00
Kriti Dang
e5489584ef Merge "Removing the list of formats from the javadoc in setSurroundFormatEnabled" into sc-dev 2021-05-11 07:52:39 +00:00
TreeHugger Robot
e8ce892093 Merge "Use binder thread instead of main thread in HotwordDetectionService" into sc-dev 2021-05-11 07:50:29 +00:00
Treehugger Robot
b369ebee31 Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" 2021-05-11 07:32:37 +00:00
Chilun Huang
c4c9e2cad4 Merge "Update visibility when finishing activity" into sc-dev 2021-05-11 07:19:51 +00:00
TreeHugger Robot
5d9fa9063e Merge "Increase RESTRICTED timeout to 45 days." into sc-dev 2021-05-11 06:46:59 +00:00
Chalard Jean
2b1e74c2fd Allow any transport with TEST if the network is restricted 
This will allow CTS to add the WIFI transport and others,
letting them test a number of essential features of the
ranking algorithm.
It's relatively safe because restricted networks can never
become the default, and NOT_RESTRICTED is a default
capability so very few apps would be affected by the shell
creating such a network.

Bug: 184037351
Test: NetworkScoreTest (which is under review)
Change-Id: I21055dc613fead6130adc2122f2cdd0af9b49adf
 2021-05-11 15:42:10 +09:00
Alexander Dorokhine
7de178b090 Delete deprecated methods after dogfood transition. 
Bug: 181887768
Test: Presubmit
Change-Id: I729f6cc0acb15cfc78b4c39be165d72443c26879
 2021-05-10 23:20:10 -07:00
TreeHugger Robot
d943571aa6 Merge "Update ColorFade to use BLAST" into sc-dev 2021-05-11 06:12:27 +00:00
Tianjie Xu
6bb5e2fb57 Merge "Check null for before using LockSettingsService" am: 964fccfefd am: e3e7ed125e am: a90fe61200 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674887

Change-Id: Ief6c22eddb92b24a79155724f41bdd0ed5e4ab09
 2021-05-11 06:11:27 +00:00
Benedict Wong
ce6ab40d43 Merge "Add log prefixes to uniquely identify each VCN/gwConn" am: fae9ba6535 am: af9b507963 am: 62135157e0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700307

Change-Id: I2818b5d9fc39e50316a7cf6cbd62cc4b9993db79
 2021-05-11 06:11:06 +00:00
Benedict Wong
275bf90709 Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: f980436b32 am: 600401154a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I745687f69366657dc33bfdacd878e06affd6a8ec
 2021-05-11 06:10:32 +00:00
Alexander Dorokhine
1b90731237 Merge "Update framework from Jetpack." into sc-dev 2021-05-11 06:07:41 +00:00