Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe6d4b8 authored by Andrew Solovay's avatar Andrew Solovay Committed by Automerger Merge Worker
Browse files

docs: Inclusive language fix (whitelist -> allowlist) am: 648eb4f4 am: 4e7679a0 

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



Change-Id: I1cb7aafc754dd0d8911e9eab1f2ef78054e32378
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65627163 4e7679a0

core/res/AndroidManifest.xml

+12 −12
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ 
         <p>Protection level: dangerous



         <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)}.

    -->

    <permission android:name="android.permission.SEND_SMS"
@@ -934,7 +934,7 @@ 
         <p>Protection level: dangerous



         <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)}.

    -->

    <permission android:name="android.permission.RECEIVE_SMS"
@@ -948,7 +948,7 @@ 
         <p>Protection level: dangerous



         <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)}.

    -->

    <permission android:name="android.permission.READ_SMS"
@@ -962,7 +962,7 @@ 
         <p>Protection level: dangerous



         <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)}.

    -->

    <permission android:name="android.permission.RECEIVE_WAP_PUSH"
@@ -976,7 +976,7 @@ 
         <p>Protection level: dangerous



         <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)}.

    -->

    <permission android:name="android.permission.RECEIVE_MMS"
@@ -1011,7 +1011,7 @@ 
         <p>Protection level: dangerous



         <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)}.



         @hide Pending API council approval -->
@@ -1056,7 +1056,7 @@ 
      targetSdkVersion}</a> is 4 or higher.



      <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

      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
@@ -1236,7 +1236,7 @@ 
         <p>Protection level: dangerous



         <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)}.

    -->

    <permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
@@ -1298,7 +1298,7 @@ 
         <p>Protection level: dangerous



         <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)}.

    -->

    <permission android:name="android.permission.READ_CALL_LOG"
@@ -1322,7 +1322,7 @@ 
         <p>Protection level: dangerous



         <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)}.

    -->

    <permission android:name="android.permission.WRITE_CALL_LOG"
@@ -1338,7 +1338,7 @@ 
         <p>Protection level: dangerous



         <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)}.



         @deprecated Applications should use {@link android.telecom.CallRedirectionService} instead
@@ -4753,7 +4753,7 @@ 
                android:protectionLevel="signature" />



    <!-- @SystemApi Allows an application to allowlist restricted permissions

         on any of the whitelists.

         on any of the allowlists.

    @hide -->

    <permission android:name="android.permission.WHITELIST_RESTRICTED_PERMISSIONS"

                android:protectionLevel="signature|installer" />