diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-10-06 21:50:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-06 21:50:19 +0000 |
commit | d4be3653354085a4418150fc77ebef1c87b08074 (patch) | |
tree | e64dd58bf00be72c9a2e5d59792ae5f9dff509fa | |
parent | 025a668cf96f0fb2f9ef2ecb8996a7786e27504a (diff) | |
parent | f3661fc7809af81cb803dfb79c641a4dda606f94 (diff) | |
download | base-d4be3653354085a4418150fc77ebef1c87b08074.tar.gz |
Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I9b7a79b6d27be475f72549b3716d8036459b3f31
-rw-r--r-- | core/java/com/android/internal/app/ResolverActivity.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 996158755c6a..070e3c101c8e 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -17,6 +17,7 @@ package com.android.internal.app; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; +import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; import android.annotation.Nullable; import android.annotation.StringRes; @@ -68,7 +69,9 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; +import android.view.Window; import android.view.WindowInsets; +import android.view.WindowManager; import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.BaseAdapter; @@ -790,8 +793,21 @@ public class ResolverActivity extends Activity { } @Override + protected void onStart() { + super.onStart(); + + this.getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); + } + + @Override protected void onStop() { super.onStop(); + + final Window window = this.getWindow(); + final WindowManager.LayoutParams attrs = window.getAttributes(); + attrs.privateFlags &= ~SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + window.setAttributes(attrs); + if (mRegistered) { mPackageMonitor.unregister(); mRegistered = false; |