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

Commit e524e8e2 authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

Merge "Fix permission javadoc about whitelisting." into qt-dev 

am: 4918e711

Change-Id: I28a53f02f8cfc41c8ce6e23976f7efd4fdb3fa90
parents 74ddd19d 4918e711

core/res/AndroidManifest.xml

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



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

    -->

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



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

    -->

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



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

    -->

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



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

    -->

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



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

    -->

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



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.



         @hide Pending API council approval -->
@@ -851,7 +851,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 did not whitelist the permission.

      full form until the installer on record whitelists the permission.

      Specifically, if the permission is whitelisted the holder app can access

      external storage and the visual and aural media collections while if the

      permission is not whitelisted the holder app can only access to the visual
@@ -950,7 +950,7 @@ 
         <p>Protection level: dangerous



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

    -->

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



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

    -->

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



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

    -->

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



         <p> This is a hard restricted permission which cannot be held by an app until

         the installer on record did not whitelist the permission. For more details see

         the installer on record whitelists the permission. For more details see

         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.



         @deprecated Applications should use {@link android.telecom.CallRedirectionService} instead