summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2019-05-29 16:09:49 -0700
committerKevin Haggerty <haggertk@lineageos.org>2019-08-13 05:59:30 +0200
commit8b802e4def6f939d26f41d2dcfd4b8246c7bff0c (patch)
tree04080d2280bc068578971ae20cb4b30e2a5a8cf6
parent66789c3ae537902df5845125769b7ee11b590336 (diff)
downloadandroid_packages_services_Telecomm-cm-14.1.tar.gz
android_packages_services_Telecomm-cm-14.1.tar.bz2
android_packages_services_Telecomm-cm-14.1.zip
Add flag to default dialer change dialogcm-14.1
Add PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS to default dialer change dialog to prevent clickjacking. Fixes: 132275252 Test: manual. CTS infeasible since it's UI. Change-Id: I0d5997915a71e317d5c0d654a499d8cbd21f2299 Merged-In: I0d5997915a71e317d5c0d654a499d8cbd21f2299 (cherry picked from commit 1a02fa9e6ee08705b96fa2b32dfd2ee1d651e8ec)
-rw-r--r--src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java b/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
index 107389be..2becabcc 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.TextUtils;
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 @@ public class ChangeDefaultDialerDialog extends AlertActivity implements
}
}
+ @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()) {