diff options
| author | Galia Peycheva <galinap@google.com> | 2021-01-22 13:50:16 +0000 |
|---|---|---|
| committer | Galia Peycheva <galinap@google.com> | 2021-02-02 23:08:29 +0100 |
| commit | 3804d61f2acd9e499724f48df9e3300fb1dbc397 (patch) | |
| tree | e0b36bc6477c7d8c39d99a5f5f598d917b463032 /core/java/android/view/WindowManager.java | |
| parent | f83b52cc13a1d36953f2ae37081fc3c866008090 (diff) | |
Revert "Make window background blurs 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: I0f7bcf34db2986d8d5e08b115a611e8e07db5917
Merged-In: I0f7bcf34db2986d8d5e08b115a611e8e07db5917
Diffstat (limited to 'core/java/android/view/WindowManager.java')
| -rw-r--r-- | core/java/android/view/WindowManager.java | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 8319b74d9cdf..63f1eedf1c50 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1511,13 +1511,9 @@ public interface WindowManager extends ViewManager { * Use {@link #dimAmount} to control the amount of dim. */ public static final int FLAG_DIM_BEHIND = 0x00000002; - /** Window flag: enable blurring behind this window. - * To set the amount of blur, use {@link #backgroundBlurRadius} - * - * @hide - */ - @RequiresPermission(permission.USE_BACKGROUND_BLUR) - @SystemApi + /** Window flag: blur everything behind this window. + * @deprecated Blurring is no longer supported. */ + @Deprecated public static final int FLAG_BLUR_BEHIND = 0x00000004; /** Window flag: this window won't ever get key input focus, so the @@ -3237,14 +3233,10 @@ public interface WindowManager extends ViewManager { public boolean preferMinimalPostProcessing = false; /** - * When {@link FLAG_BLUR_BEHIND} is set, this is the amount of blur in pixels that this - * window will use to blur behind itself. - * The range is from 0, which means no blur, to 150. + * Indicates that this window wants to have blurred content behind it. * * @hide */ - @SystemApi - @RequiresPermission(permission.USE_BACKGROUND_BLUR) public int backgroundBlurRadius = 0; /** |