commit e41cbfdd301b56e4c6f3ca38ad7116438d94f2b6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 23 23:24:43 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 23 23:24:43 2022 +0000
tree f2731a464a5e7e4190c1a39b6f3a0314bb1a1e59
parent 97c538a8ce23250a377f743832129068b20d0d38
parent c5fc5db0e7dd0e8928516136d8b9d4365adc7d1b

Snap for 8762204 from c5fc5db0e7dd0e8928516136d8b9d4365adc7d1b to tm-release

Change-Id: Ib514f7ff3a355b0bd19aef5ce7eb1fa091e23117

src/com/android/settings/enterprise/EnterprisePrivacySettings.java

diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index 92e4f4a..a154ded 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -77,6 +77,10 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        if (mPrivacySettingsPreference instanceof PrivacySettingsFinancedPreference) {
+            return;
+        }
+
         replaceEnterprisePreferenceScreenTitle(
                 MANAGED_DEVICE_INFO, R.string.enterprise_privacy_settings);
 

src/com/android/settings/network/telephony/RoamingDialogFragment.java

diff --git a/src/com/android/settings/network/telephony/RoamingDialogFragment.java b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
index bd45226..3e9875e 100644
--- a/src/com/android/settings/network/telephony/RoamingDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
@@ -72,7 +72,9 @@
                 .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(android.R.string.yes, this)
                 .setNegativeButton(android.R.string.no, this);
-        return builder.create();
+        AlertDialog dialog = builder.create();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
     }
 
     @Override