diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-25 08:06:44 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-25 08:06:44 +0000 |
commit | 1a59be44cc0a555481865fe5ae8c64ce6f2627c3 (patch) | |
tree | c6f0f3dc9f1fe5654a0018aa4d0985b73c3e51bf | |
parent | c84677e6b7f0a40767a0630d6135ba7d429c9119 (diff) | |
parent | 8b6e49c2682b7f99c6fc71c059eb0c5a984f9d8c (diff) | |
download | Telephony-android10-android13-mainline-tzdata-release.tar.gz |
Snap for 9214382 from 8b6e49c2682b7f99c6fc71c059eb0c5a984f9d8c to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_297100000android10-android13-mainline-tzdata-release
Change-Id: Iea973c498c2d0859941fe14641a40e431f74bc10
5 files changed, 21 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 61e318948..0218948ce 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -201,6 +201,9 @@ <uses-permission android:name="android.permission.READ_PRECISE_PHONE_STATE" /> <uses-permission android:name="android.permission.MANAGE_ROLE_HOLDERS" /> + <!-- 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 e18dc935f..2efa81c1e 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; @@ -210,6 +211,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()) { |