diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-15 01:52:31 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-15 01:52:31 +0000 |
commit | 0cbe40005f47262875f827b70aed30d5a157a6f1 (patch) | |
tree | b70e00265a05c6224f27b7a7437710ea1f53c2aa | |
parent | db0f31d32afde649b6ed1b839004c073fe848f21 (diff) | |
parent | 1b508c878abf7fb44ecc180d4e102fd25aa920a0 (diff) | |
download | Telephony-android13-qpr1-s3-release.tar.gz |
Merge cherrypicks of [20084105] into tm-qpr1-release.android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-release
Change-Id: Ib6f63cfc52e4d8a1f13d1ce4041c62d6472e968a
5 files changed, 21 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5a3c01737..41ff21683 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -157,6 +157,9 @@ android:label="Access last known cell identity." android:protectionLevel="signature"/> + <!-- Needed to block unwanted malicious pop up overlays --> + <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/> + <application android:name="PhoneApp" android:persistent="true" android:label="@string/phoneAppLabel" diff --git a/src/com/android/phone/settings/AccessibilitySettingsActivity.java b/src/com/android/phone/settings/AccessibilitySettingsActivity.java index 99b14780d..7cc18f6be 100644 --- a/src/com/android/phone/settings/AccessibilitySettingsActivity.java +++ b/src/com/android/phone/settings/AccessibilitySettingsActivity.java @@ -20,17 +20,21 @@ import android.app.ActionBar; import android.os.Bundle; import android.preference.PreferenceActivity; import android.view.MenuItem; +import android.view.WindowManager; import com.android.phone.R; public class AccessibilitySettingsActivity extends PreferenceActivity { - @Override + @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); + getWindow().addSystemFlags( + android.view.WindowManager.LayoutParams + .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); final ActionBar actionBar = getActionBar(); if (actionBar != null) { - actionBar.setTitle(R.string.accessibility_settings_activity_title); + actionBar.setTitle(R.string.accessibility_settings_activity_title); } getFragmentManager().beginTransaction().replace( android.R.id.content, new AccessibilitySettingsFragment()).commit(); diff --git a/src/com/android/phone/settings/PhoneAccountSettingsActivity.java b/src/com/android/phone/settings/PhoneAccountSettingsActivity.java index 56f559466..e15be39a2 100644 --- a/src/com/android/phone/settings/PhoneAccountSettingsActivity.java +++ b/src/com/android/phone/settings/PhoneAccountSettingsActivity.java @@ -20,6 +20,7 @@ import android.app.ActionBar; import android.os.Bundle; import android.preference.PreferenceActivity; import android.view.MenuItem; +import android.view.WindowManager; import com.android.phone.R; @@ -28,6 +29,9 @@ public class PhoneAccountSettingsActivity extends PreferenceActivity { @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); + getWindow().addSystemFlags( + android.view.WindowManager.LayoutParams + .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); final ActionBar actionBar = getActionBar(); if (actionBar != null) { actionBar.setTitle(R.string.phone_accounts); diff --git a/src/com/android/phone/settings/PickSmsSubscriptionActivity.java b/src/com/android/phone/settings/PickSmsSubscriptionActivity.java index cfbce28a3..97dada00c 100644 --- a/src/com/android/phone/settings/PickSmsSubscriptionActivity.java +++ b/src/com/android/phone/settings/PickSmsSubscriptionActivity.java @@ -22,6 +22,7 @@ import android.content.Intent; import android.os.Bundle; import android.os.RemoteException; import android.telephony.SubscriptionManager; +import android.view.WindowManager; import android.util.Log; import com.android.internal.telephony.IIntegerConsumer; @@ -91,6 +92,9 @@ public class PickSmsSubscriptionActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + getWindow().addSystemFlags( + android.view.WindowManager.LayoutParams + .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); mPreviouslyStopped = false; } diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java index 2bd5306a9..02bf4b25d 100644 --- a/src/com/android/phone/settings/VoicemailSettingsActivity.java +++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java @@ -39,6 +39,7 @@ import android.text.TextDirectionHeuristics; import android.text.TextUtils; import android.util.Log; import android.view.MenuItem; +import android.view.WindowManager; import android.widget.ListAdapter; import android.widget.Toast; @@ -211,6 +212,9 @@ public class VoicemailSettingsActivity extends PreferenceActivity @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); + getWindow().addSystemFlags( + android.view.WindowManager.LayoutParams + .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); // Make sure we are running as the primary user only UserManager userManager = getApplicationContext().getSystemService(UserManager.class); if (!userManager.isPrimaryUser()) { |