Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e41cbfdd authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8762204 from c5fc5db0 to tm-release 

Change-Id: Ib514f7ff3a355b0bd19aef5ce7eb1fa091e23117
parents 97c538a8 c5fc5db0

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

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ public class EnterprisePrivacySettings extends DashboardFragment { 
    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

+3 −1
Original line number Diff line number Diff line
@@ -72,7 +72,9 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements 
                .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