PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 8762204 from c5fc5db0e7 to tm-release

Browse Source 
Change-Id: Ib514f7ff3a355b0bd19aef5ce7eb1fa091e23117
This commit is contained in:
Android Build Coastguard Worker
2022-06-23 23:24:43 +00:00
parent 97c538a8ce c5fc5db0e7
commit e41cbfdd30
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/enterprise/EnterprisePrivacySettings.java
View File

@@ -77,6 +77,10 @@ public class EnterprisePrivacySettings extends DashboardFragment {
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
if (mPrivacySettingsPreference instanceof PrivacySettingsFinancedPreference) {
return;
}
replaceEnterprisePreferenceScreenTitle( replaceEnterprisePreferenceScreenTitle(
MANAGED_DEVICE_INFO, R.string.enterprise_privacy_settings); MANAGED_DEVICE_INFO, R.string.enterprise_privacy_settings);

4
src/com/android/settings/network/telephony/RoamingDialogFragment.java
View File

@@ -72,7 +72,9 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements
.setIconAttribute(android.R.attr.alertDialogIcon) .setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.yes, this) .setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.no, this); .setNegativeButton(android.R.string.no, this);
return builder.create(); AlertDialog dialog = builder.create();
dialog.setCanceledOnTouchOutside(false);
return dialog;
} }
@Override @Override