diff options
| author | 2021-01-22 13:50:16 +0000 | |
|---|---|---|
| committer | 2021-02-02 23:08:39 +0100 | |
| commit | fc49b64e0ca84ade9d392712cba11bdc35ad0d85 (patch) | |
| tree | 0b74931072e4fa1c6379c29eba6319e303d35673 | |
| parent | 3804d61f2acd9e499724f48df9e3300fb1dbc397 (diff) | |
Revert "Add permission for blur SystemApi"
Revert "Add permission check for blurs in SurfaceFlinger"
Revert "Remove public usages of FLAG_BLUR_BEHIND"
Revert "Add pid and uid to SF::setClientStateLocked"
Revert "Add USE_BACKGROUND_BLUR to cts expected permissions"
Revert submission 13350963-blur_system_api
Reason for revert: This topic made blurs a system api. API council voted against that and we will instead aim to make it public for S. None of these changes are relevant in that case.
Reverted Changes:
I3683db296:Remove public usages of FLAG_BLUR_BEHIND
I23b21b603:Add USE_BACKGROUND_BLUR to cts expected permission...
Id21f03793:Add pid and uid to SF::setClientStateLocked
If5d8344a5:Add permission for blur SystemApi
I70d1e1715:Add permission check for blurs in SurfaceFlinger
Icf98c3607:Make window background blurs SystemApi
I0b881ec6e:Make BackgroundBlurDrawable a SystemApi
Bug: 177523043
Test: m
Change-Id: If8c915c716dacf3319974eaf118e10f323538c4b
Merged-In: If8c915c716dacf3319974eaf118e10f323538c4b
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 0e33d1e76652..435949586199 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -263,7 +263,6 @@ package android { field public static final String UPDATE_TIME_ZONE_RULES = "android.permission.UPDATE_TIME_ZONE_RULES"; field public static final String UPGRADE_RUNTIME_PERMISSIONS = "android.permission.UPGRADE_RUNTIME_PERMISSIONS"; field public static final String USER_ACTIVITY = "android.permission.USER_ACTIVITY"; - field public static final String USE_BACKGROUND_BLUR = "android.permission.USE_BACKGROUND_BLUR"; field public static final String USE_RESERVED_DISK = "android.permission.USE_RESERVED_DISK"; field public static final String WHITELIST_AUTO_REVOKE_PERMISSIONS = "android.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS"; field public static final String WHITELIST_RESTRICTED_PERMISSIONS = "android.permission.WHITELIST_RESTRICTED_PERMISSIONS"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ddcf2530e2e2..5da03f160d1a 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -4133,11 +4133,6 @@ <permission android:name="android.permission.CONFIGURE_DISPLAY_COLOR_MODE" android:protectionLevel="signature" /> - <!-- @SystemApi Allows an application to use background blur. - @hide --> - <permission android:name="android.permission.USE_BACKGROUND_BLUR" - android:protectionLevel="signature|privileged" /> - <!-- Allows an application to control the lights on the device. @hide @SystemApi diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index ca9dcd62b3ca..5af024448987 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -116,7 +116,6 @@ <uses-permission android:name="android.permission.DISABLE_KEYGUARD" /> <uses-permission android:name="android.permission.MONITOR_INPUT" /> <uses-permission android:name="android.permission.INPUT_CONSUMER" /> - <uses-permission android:name="android.permission.USE_BACKGROUND_BLUR" /> <!-- DreamManager --> <uses-permission android:name="android.permission.READ_DREAM_STATE" /> |