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

Merge "Fix permission javadoc about whitelisting." into qt-dev am: 4918e711d3 am: e524e8e22d

Browse Source 
am: 0444e7f62e

Change-Id: Icc263b71fda34e97097d151f37c15be7b031c79a
This commit is contained in:
Hai Zhang
2019-07-23 11:19:47 -07:00
committed by android-build-merger
parent 63a345cd15 0444e7f62e
commit a196300ff1
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/res/AndroidManifest.xml
View File

@@ -727,7 +727,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"
@@ -741,7 +741,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"
@@ -755,7 +755,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"
@@ -769,7 +769,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"
@@ -783,7 +783,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"
@@ -806,7 +806,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 -->
@@ -852,7 +852,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
@@ -951,7 +951,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"
@@ -997,7 +997,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"
@@ -1021,7 +1021,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"
@@ -1037,7 +1037,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