Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: Inclusive language fix (whitelist -> allowlist) am: 648eb4f4aa am: 0916247437

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19792204

Change-Id: Ib2165c93d04a8c09852e6d2a0fa5c906daba06b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andrew Solovay
2022-09-01 01:03:00 +00:00
committed by Automerger Merge Worker
parent c98e315d33 0916247437
commit b5f7c4a95e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/res/AndroidManifest.xml
View File

@@ -920,7 +920,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
--> -->
<permission android:name="android.permission.SEND_SMS" <permission android:name="android.permission.SEND_SMS"
@@ -934,7 +934,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
--> -->
<permission android:name="android.permission.RECEIVE_SMS" <permission android:name="android.permission.RECEIVE_SMS"
@@ -948,7 +948,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
--> -->
<permission android:name="android.permission.READ_SMS" <permission android:name="android.permission.READ_SMS"
@@ -962,7 +962,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
--> -->
<permission android:name="android.permission.RECEIVE_WAP_PUSH" <permission android:name="android.permission.RECEIVE_WAP_PUSH"
@@ -976,7 +976,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
--> -->
<permission android:name="android.permission.RECEIVE_MMS" <permission android:name="android.permission.RECEIVE_MMS"
@@ -1011,7 +1011,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
@hide Pending API council approval --> @hide Pending API council approval -->
@@ -1056,7 +1056,7 @@
targetSdkVersion}</a> is 4 or higher. targetSdkVersion}</a> is 4 or higher.
<p> This is a soft restricted permission which cannot be held by an app it its <p> This is a soft restricted permission which cannot be held by an app it its
full form until the installer on record whitelists the permission. full form until the installer on record allowlists the permission.
Specifically, if the permission is allowlisted the holder app can access Specifically, if the permission is allowlisted the holder app can access
external storage and the visual and aural media collections while if the external storage and the visual and aural media collections while if the
permission is not allowlisted the holder app can only access to the visual permission is not allowlisted the holder app can only access to the visual
@@ -1236,7 +1236,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
--> -->
<permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" <permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
@@ -1298,7 +1298,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
--> -->
<permission android:name="android.permission.READ_CALL_LOG" <permission android:name="android.permission.READ_CALL_LOG"
@@ -1322,7 +1322,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
--> -->
<permission android:name="android.permission.WRITE_CALL_LOG" <permission android:name="android.permission.WRITE_CALL_LOG"
@@ -1338,7 +1338,7 @@
<p>Protection level: dangerous <p>Protection level: dangerous
<p> This is a hard restricted permission which cannot be held by an app until <p> This is a hard restricted permission which cannot be held by an app until
the installer on record whitelists the permission. For more details see the installer on record allowlists the permission. For more details see
{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
@deprecated Applications should use {@link android.telecom.CallRedirectionService} instead @deprecated Applications should use {@link android.telecom.CallRedirectionService} instead
@@ -4753,7 +4753,7 @@
android:protectionLevel="signature" /> android:protectionLevel="signature" />
<!-- @SystemApi Allows an application to allowlist restricted permissions <!-- @SystemApi Allows an application to allowlist restricted permissions
on any of the whitelists. on any of the allowlists.
@hide --> @hide -->
<permission android:name="android.permission.WHITELIST_RESTRICTED_PERMISSIONS" <permission android:name="android.permission.WHITELIST_RESTRICTED_PERMISSIONS"
android:protectionLevel="signature|installer" /> android:protectionLevel="signature|installer" />