Commit Graph

10319 Commits

Author SHA1 Message Date
Alan Viverette
7d1188244c Merge "Migrate frameworks/base javadocs references to androidx" 2022-02-10 18:02:28 +00:00
Martijn Coenen
de1ab8513a Merge "Supplemental processes don't get external storage." 2022-02-10 14:22:28 +00:00
Nikita Ioffe
ecfb7fbf24 Merge changes from topics "sp-permissions", "sp-pm-uid-apis"
* changes:
  Add Process.toSupplementalUid to @TestApi
  Handle supplemental process uid range for uid-based PM apis
2022-02-10 13:12:17 +00:00
Martijn Coenen
41466ea489 Supplemental processes don't get external storage.
Bug: 217538016
Test: Inspect /storage for supplemental
Change-Id: Ibd29834b0d611a7313890fe06428cd73021ebf4f
2022-02-10 11:04:13 +01:00
Sailendra Bathi
058e30994f Merge "Fix javadoc rendering" 2022-02-10 08:53:54 +00:00
sailendrabathi
6cdf3748ab Fix javadoc rendering
Fixed CDD link rendering in javadoc for
getStorageVolumesIncludingSharedProfiles

Bug: 217627738
Test: Verify the javadoc by opening the generated html pages in browser
Change-Id: Ib5a7e52b44a6b5bc11f17fe3a8e726649c6b70bc
2022-02-10 06:12:29 +00:00
Alan Viverette
406e0f6553 Migrate frameworks/base javadocs references to androidx
Does not remove Support Library artifacts from docs classpath (ApiDocs.bp)
because they are still used in development/samples, which is not as easy
to migrate as javadoc.

Bug: 158779503
Test: make docs
Exempt-From-Owner-Approval: Mass find/replace for androidx migration
Change-Id: Icf7f53ec36a0e970413352e2ebf40ce9d60ed17e
2022-02-09 22:25:14 +00:00
Kholoud Mohamed
03c3473c6f Merge "Expose UserManager#isProfile as a public API" 2022-02-09 20:57:54 +00:00
Wenhao Wang
9756d738a0 Merge "Revert "Revert "Revert "User consent for Logcat data access"""" 2022-02-09 18:53:33 +00:00
kholoud mohamed
e4d4cbd55f Expose UserManager#isProfile as a public API
Test: N/A
Bug: 188410712
Bug: 206106797
Change-Id: Id27a56a69af7abe91f4c61cc31511fc854123704
2022-02-09 12:01:53 +00:00
Dmitri Plotnikov
58fff8488b Remove BatteryStatsHelper and BatterySipper
These classes have been superseded by BatteryUsageStats

Bug: 217618527
Test: presubmit
Change-Id: Ia562365031048ad5b541dd08196e04e53e7cc547
2022-02-09 06:26:59 +00:00
Dmitri Plotnikov
992d488c81 Move mobile stats calculations from BatteryStatsHelper to BatteryStats
Bug: 217618527
Test: adb shell dumpsys batterystats
Test: atest FrameworksCoreTests:BatteryStatsTests
Change-Id: I70a156e96a855655cde97e8b7736db3e672219c7
2022-02-09 06:26:31 +00:00
Dmitri Plotnikov
24e45284df Merge "Convert dumpsys batterystats --checkin and --proto to BatteryUsageStats API" 2022-02-09 06:26:02 +00:00
Thiébaud Weksteen
898058eb42 Merge "Migrate DynamicSystemService to @EnforcePermission" am: b845dbac21 am: 746cfb436c am: 3dd695c244 am: 1570345144
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946229

Change-Id: I08c2d542318f8b17ff00400a2a9c96620b7529f5
2022-02-09 06:20:11 +00:00
Thiébaud Weksteen
1570345144 Merge "Migrate DynamicSystemService to @EnforcePermission" am: b845dbac21 am: 746cfb436c am: 3dd695c244
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946229

Change-Id: I0f7b30c9241ddf67357ecd65d3997c1bdd579e0b
2022-02-09 05:59:59 +00:00
Thiébaud Weksteen
3dd695c244 Merge "Migrate DynamicSystemService to @EnforcePermission" am: b845dbac21 am: 746cfb436c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946229

Change-Id: I96011a6182972ca0e4faf66413139ea3abf0aeab
2022-02-09 05:49:56 +00:00
Thiébaud Weksteen
b845dbac21 Merge "Migrate DynamicSystemService to @EnforcePermission" 2022-02-09 05:21:06 +00:00
Nikita Ioffe
07308085ef Add Process.toSupplementalUid to @TestApi
Bug: 217545341
Test: m
Change-Id: Ief1029cb03c4b7e5746436a97eb5a1a69a170b60
2022-02-09 02:36:25 +00:00
Dmitri Plotnikov
706703d665 Convert dumpsys batterystats --checkin and --proto to BatteryUsageStats API
Bug: 217618527
Test: atest CtsStatsdHostTestCases:ValidationTests
Test: atest CtsDumpsysHostTestCases:BatteryStatsDumpsysTest
Change-Id: Ib601ca7ae78386d07ce478bccc4a05f116942f11
2022-02-08 16:24:10 -08:00
Dmitri Plotnikov
5d1735108a Merge "Remove some uses of deprecated BatteryStatsHelper" 2022-02-08 18:13:11 +00:00
Sailendra Bathi
f86b75c9f2 Merge "Use isCredentialSharedWithParent in LockSettingsService" 2022-02-08 16:00:52 +00:00
Daniel Chapin
761d4a0ccf Revert "Revert "Revert "User consent for Logcat data access"""
This reverts commit ec8c5511af.

Reason for revert: Droidfood Blocking Bug: 218267535

Change-Id: I313f3fb7fdfbefb1c62b474b09f5b14e6ca0afd5
2022-02-08 00:57:38 +00:00
Eric Biggers
b1bcec9c7d Remove HardwareAuthToken parameter from unlockUserKey
Due to the migration to synthetic passwords, the 'token' parameter to
unlockUserKey() is no longer needed.  Remove it.

Note: I didn't change unlockUser() in IActivityManager because it is
marked with UnsupportedAppUsage, so it might not be safe to change the
method signature.  It now just ignores the 'token' parameter rather than
passing it down the stack.

Test: atest com.android.server.locksettings
Bug: 184723544
Change-Id: I35ce09412f47f2f2a17a371d518a0a518b70bfb6
2022-02-05 03:28:25 +00:00
Treehugger Robot
4f7c212c39 Merge "Add constant for SC V2." am: b4bcc85925 am: ef662c60e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972646

Change-Id: I205b1b3206be894aa271cc252652c8fddba5625e
2022-02-05 01:57:57 +00:00
Eric Biggers
2a8ab47782 Remove HardwareAuthToken parameter from clearUserKeyAuth
Due to the migration to synthetic passwords, the 'token' parameter to
clearUserKeyAuth() is no longer needed.  Remove it.

Test: atest com.android.server.locksettings
Bug: 184723544
Change-Id: I739b519b0e91293acbf018020891d68b3090c175
2022-02-04 20:44:45 +00:00
Eric Biggers
6b220a95e9 Remove HardwareAuthToken parameter from addUserKeyAuth
Due to the migration to synthetic passwords, the 'token' parameter to
addUserKeyAuth() is no longer needed.  Remove it.

Test: atest com.android.server.locksettings
Bug: 184723544
Change-Id: I06e7c36787cc7f384acb7742737c3b1cfa50f0ae
2022-02-04 20:44:45 +00:00
Michael Wright
3a29070961 Add constant for SC V2.
Bug: 204295952
Test: N/A
Merged-In: Ieecebfccf9366815c93d620b70aeabc1abcd3ebd
Change-Id: I6597299374715153e8e63d43b44949df76f9ab26
2022-02-04 18:08:21 +00:00
Yasin Kilicdere
78719a9eba Merge "Remove allowedToRemoveOne boolean parameter from UM.getRemainingCreatableProfileCount()" 2022-02-04 17:00:43 +00:00
Etienne Ruffieux
c4837b1306 Merge "removed hidden Bluetooth permissions in BatteryStatsManager" 2022-02-03 19:27:06 +00:00
Etienne Ruffieux
df4be0287b removed hidden Bluetooth permissions in BatteryStatsManager
Tag: #feature
Bug: 200202780
Test: build
Change-Id: I477ec9e53ce1b945a40108ea018a42e3bcfeea32
2022-02-03 10:13:26 +00:00
Dmitri Plotnikov
1825a0f5b1 Remove some uses of deprecated BatteryStatsHelper
Bug: 217618527
Test: presubmit
Change-Id: Ieb3c0e00cc0a5e380967b795387a2f5196deb8e2
2022-02-02 16:58:12 -08:00
Wenhao Wang
ec8c5511af Revert "Revert "User consent for Logcat data access""
This reverts commit d7138b445c.
This patch fixes the breaking caused by
commit b4f8ed9bb8.

It's a workaround patch. The upcoming patch will have solid fix.

Bug: 193708292
Bug: 217482811
Bug: 217495147
Test: atest PlatformRuleTests -- --abi x86_64
Test: atest FrameworksServicesTests -- --abi x86_64
Ignore-AOSP-First: pending fix for logcat privacy issue
Change-Id: If18086130599f0ae027d16ccbb7b5b5cd73f2e72
2022-02-02 16:08:19 -08:00
Artur Satayev
d8e72d1329 Merge "Introduce Build.VERSION.KNOWN_CODENAMES." am: 4db55d2f36 am: 5901c38224 am: d9e5f4369e am: c4dcf0c319
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966780

Change-Id: Icae3207485650b94c5abd26325ddb639a8a40646
2022-02-02 18:11:23 +00:00
Yasin Kilicdere
7ac52f42d2 Remove allowedToRemoveOne boolean parameter from UM.getRemainingCreatableProfileCount()
Bug: 217364189
Test: atest android.multiuser.cts.UserManagerTest
Change-Id: Idebeab6407eb90967dcd0ebbcfaba4b76a8f1263
2022-02-02 17:43:45 +00:00
Artur Satayev
c4dcf0c319 Merge "Introduce Build.VERSION.KNOWN_CODENAMES." am: 4db55d2f36 am: 5901c38224 am: d9e5f4369e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966780

Change-Id: Ib904befa95b89da857df5373033865a8e6c55c10
2022-02-02 17:33:44 +00:00
Artur Satayev
d9e5f4369e Merge "Introduce Build.VERSION.KNOWN_CODENAMES." am: 4db55d2f36 am: 5901c38224
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966780

Change-Id: I67b6f324752123888993560ea484383b6b81f2e6
2022-02-02 17:19:00 +00:00
Artur Satayev
4db55d2f36 Merge "Introduce Build.VERSION.KNOWN_CODENAMES." 2022-02-02 16:52:37 +00:00
satayev
434ef186e6 Introduce Build.VERSION.KNOWN_CODENAMES.
See go/mainline-sdk-codenames-issue.

Known values are to be used to distinguish multiple pre-release
codenames, and to allow in development artifacts to be installable
on released versions of the platform for testing going forward.

This does not change pre-T behaviour at large however.

Bug: 211747008
Test: presubmit
Change-Id: I0c8df8e767ea61b27bb53da53fb6c9b2c842dbbc
2022-02-02 16:52:14 +00:00
Treehugger Robot
57a7b823d1 Merge "Support "Parcel.propagateAllowBlocking" for AIDL" am: bcefef7a8c am: 7d4245bc61 am: 4dbefbccd5 am: f1bc977e8d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964223

Change-Id: Ie91a206e927a8c857cc3eb556b95bae5d49e89b3
2022-02-02 16:45:48 +00:00
Treehugger Robot
f1bc977e8d Merge "Support "Parcel.propagateAllowBlocking" for AIDL" am: bcefef7a8c am: 7d4245bc61 am: 4dbefbccd5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964223

Change-Id: Ic9c06eb3bc13a2161454cc73e96e3cca2e8f6705
2022-02-02 16:25:50 +00:00
Treehugger Robot
4dbefbccd5 Merge "Support "Parcel.propagateAllowBlocking" for AIDL" am: bcefef7a8c am: 7d4245bc61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964223

Change-Id: I77917e4f9e7c29f93817bdc2fb96e051c4abfaa9
2022-02-02 16:21:40 +00:00
Treehugger Robot
bcefef7a8c Merge "Support "Parcel.propagateAllowBlocking" for AIDL" 2022-02-02 16:11:30 +00:00
Simon Bowden
9515833d64 Merge "Directly implement areAllEffectsSupported and areAllPrimitivesSupported rather than creating and throwing away an extra array to pass into the non-All version." 2022-02-02 13:00:25 +00:00
Shubham Dubey
b771f83365 Merge "Revert "User consent for Logcat data access"" 2022-02-02 12:11:21 +00:00
Shubham Dubey
d7138b445c Revert "User consent for Logcat data access"
This reverts commit b4f8ed9bb8.

Reason for revert: Breaking Dex2oatPressureRuleTest and PreRebootLoggerTest
BUG:217482811
BUG:217495147

Change-Id: I745de0dbcaa328918b5a1c58028471fd3d8ae0ab
2022-02-02 09:25:41 +00:00
sailendrabathi
7a799535e1 Use isCredentialSharedWithParent in LockSettingsService
Created property isCredentialSharedWithParent in UserTypeDetails which
is true for managed and clone profiles. This is used in
LockSettingsService for sharing the locking credentials with its parent
user.

Bug: 214355283
Test: atest android.multiuser.cts.UserManagerTest
Test: atest LockSettingsServiceTests

Change-Id: I6ceaf498aadce7e713b20a4d24e4a29e812eb0ca
2022-02-02 06:27:02 +00:00
Xiang Wang
0c20077d1f Merge changes from topic "convert_metadata"
* changes:
  Add allowGameFpsOverride intervention flag
  Introduce new game mode config xml resource file
2022-02-02 05:43:03 +00:00
Eun-Jeong Shin
813624d64d Merge "User consent for Logcat data access" 2022-02-02 04:18:38 +00:00
Jooyung Han
eadcb18d7e Merge "Add Parcel APIs for fixed-size array" am: aa16747474 am: 14b9e5e7da am: 3b606f3c91 am: 78eabfbcaf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958141

Change-Id: I908bd99259ef6d47af0f0c1ca66fbe68703e4da9
2022-02-02 01:21:12 +00:00
Jooyung Han
78eabfbcaf Merge "Add Parcel APIs for fixed-size array" am: aa16747474 am: 14b9e5e7da am: 3b606f3c91
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958141

Change-Id: I25cd86fc750eacbb7e6fe1ab9461236433865332
2022-02-02 01:03:46 +00:00