diff options
| author | 2019-03-04 22:14:59 +0000 | |
|---|---|---|
| committer | 2019-03-04 22:14:59 +0000 | |
| commit | 01c9da23ce0b69a50345d26e611ace908a6a734c (patch) | |
| tree | a15d162f5e8c3ce8e1d4901202742ee8ce082497 | |
| parent | 33e1e470b47724e017cedc12c588a3438879a6fd (diff) | |
| parent | 037d4c6cd9bc933c1d38be9177be2274b804cc6a (diff) | |
Merge "Add sigpiv permission to change share target details"
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 6830b109203d..652e7eb01061 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -181,6 +181,7 @@ package android { field public static final String SHUTDOWN = "android.permission.SHUTDOWN"; field public static final String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES"; field public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"; + field public static final String SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON = "android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON"; field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS"; field public static final String TETHER_PRIVILEGED = "android.permission.TETHER_PRIVILEGED"; field public static final String TV_INPUT_HARDWARE = "android.permission.TV_INPUT_HARDWARE"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e87295a7a86a..ae3e714eb950 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -4445,15 +4445,23 @@ @hide --> <permission android:name="android.permission.RECEIVE_DEVICE_CUSTOMIZATION_READY" android:protectionLevel="signature|preinstalled" /> + <!-- @SystemApi Allows wallpaper to be rendered in ambient mode. @hide --> <permission android:name="android.permission.AMBIENT_WALLPAPER" android:protectionLevel="signature|preinstalled" /> + <!-- @SystemApi Allows sensor privacy to be modified. @hide --> <permission android:name="android.permission.MANAGE_SENSOR_PRIVACY" android:protectionLevel="signature" /> + <!-- @SystemApi Allows an activity to replace the app name and icon displayed in share targets + in the sharesheet for the Q-release and later. + @hide <p>Not for use by third-party applications.</p> --> + <permission android:name="android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON" + android:protectionLevel="signature|privileged" /> + <application android:process="system" android:persistent="true" android:hasCode="false" |