diff options
| author | 2018-03-07 18:01:26 +0000 | |
|---|---|---|
| committer | 2018-03-07 18:01:26 +0000 | |
| commit | 23b73c45fb4d02feeafa61c27a865c1799b1d922 (patch) | |
| tree | b59b57851311a12f2cee10fd72d62ca027361d9a | |
| parent | 34ab4d95ca5f81c5761095b09f36d00b44e41199 (diff) | |
| parent | 0f73c659580a9a818eb5b0ed30ec6cde711b7188 (diff) | |
Merge "Remove BIND_SLICE" into pi-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/api/current.txt b/api/current.txt index 05d5ab7db794..2113d5d54f59 100644 --- a/api/current.txt +++ b/api/current.txt @@ -36,7 +36,6 @@ package android { field public static final java.lang.String BIND_QUICK_SETTINGS_TILE = "android.permission.BIND_QUICK_SETTINGS_TILE"; field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS"; field public static final java.lang.String BIND_SCREENING_SERVICE = "android.permission.BIND_SCREENING_SERVICE"; - field public static final java.lang.String BIND_SLICE = "android.permission.BIND_SLICE"; field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE"; field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE"; field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6c2db7647841..3324fc3cdbfd 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3330,13 +3330,6 @@ <permission android:name="android.permission.MANAGE_SLICE_PERMISSIONS" android:protectionLevel="signature" /> - <!-- Allows an application to bind app's slices and get their - content. This content will be surfaced to the - user and not to leave the device. - <p>Not for use by third-party applications.--> - <permission android:name="android.permission.BIND_SLICE" - android:protectionLevel="signature|privileged|development" /> - <!-- @SystemApi Private permission, to restrict who can bring up a dialog to add a new keyguard widget @hide --> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index b4de3a3203cb..b455419b23e3 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -349,7 +349,6 @@ applications that come with the platform <privapp-permissions package="com.android.systemui"> <permission name="android.permission.BATTERY_STATS"/> <permission name="android.permission.BIND_APPWIDGET"/> - <permission name="android.permission.BIND_SLICE" /> <permission name="android.permission.BLUETOOTH_PRIVILEGED"/> <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/> <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/> |