Merge the 2019-08-01 SPL branch from AOSP-Partner
* aosp-partner/security-aosp-nyc-mr2-release:
Add flag to default dialer change dialog
Change-Id: Ie0a5d6dd0b2ddbe0146eb3c22ee1c8f6bac7b4a4
diff --git a/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java b/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
index 107389b..2becabc 100644
--- a/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
+++ b/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
@@ -16,6 +16,8 @@
package com.android.server.telecom.components;
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.ApplicationInfo;
@@ -34,6 +36,8 @@
import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan;
import android.util.Log;
+import android.view.WindowManager;
+import android.view.Window;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
@@ -80,6 +84,21 @@
}
}
+ @Override
+ public void onStart() {
+ super.onStart();
+ getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ }
+
+ @Override
+ public void onStop() {
+ final Window window = getWindow();
+ final WindowManager.LayoutParams attrs = window.getAttributes();
+ attrs.privateFlags &= ~PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+ window.setAttributes(attrs);
+ super.onStop();
+ }
+
private boolean canChangeToProvidedPackage(String oldPackage, String newPackage) {
final TelephonyManager tm = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
if (!tm.isVoiceCapable()) {