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

Commit 035ea3b0 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Use new RestrictedLockUtils API 

This is made necessary by changes to the SystemAPI the lib relies on.

Test: RunSettingsRoboTests
Bug: 116798569
Change-Id: I2812ce9e58e3fb15a5579ddc10cd0edf33d0ed44
parent 1e80322d

src/com/android/settings/MonitoringCertInfoActivity.java

+8 −1
Original line number Diff line number Diff line
@@ -46,10 +46,17 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe 


        mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());



        final UserHandle user;

        if (mUserId == UserHandle.USER_NULL) {

            user = null;

        } else {

            user = UserHandle.of(mUserId);

        }



        DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);

        final int numberOfCertificates = getIntent().getIntExtra(

                Settings.EXTRA_NUMBER_OF_CERTIFICATES, 1);

        final int titleId = RestrictedLockUtils.getProfileOrDeviceOwner(this, mUserId) != null

        final int titleId = RestrictedLockUtils.getProfileOrDeviceOwner(this, user) != null

                ? R.plurals.ssl_ca_cert_settings_button // Check certificate

                : R.plurals.ssl_ca_cert_dialog_title; // Trust or remove certificate

        final CharSequence title = getResources().getQuantityText(titleId, numberOfCertificates);

src/com/android/settings/RestrictedSettingsFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -222,8 +222,8 @@ public abstract class RestrictedSettingsFragment extends SettingsPreferenceFragm 
    public EnforcedAdmin getRestrictionEnforcedAdmin() {

        mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getActivity(),

                mRestrictionKey, UserHandle.myUserId());

        if (mEnforcedAdmin != null && mEnforcedAdmin.userId == UserHandle.USER_NULL) {

            mEnforcedAdmin.userId = UserHandle.myUserId();

        if (mEnforcedAdmin != null && mEnforcedAdmin.user == null) {

            mEnforcedAdmin.user = UserHandle.of(UserHandle.myUserId());

        }

        return mEnforcedAdmin;

    }

src/com/android/settings/TrustedCredentialsDialogBuilder.java

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ class TrustedCredentialsDialogBuilder extends AlertDialog.Builder { 
                    && !mDpm.isCaCertApproved(certHolder.getAlias(), certHolder.getUserId());



            final boolean isProfileOrDeviceOwner = RestrictedLockUtils.getProfileOrDeviceOwner(

                    mActivity, certHolder.getUserId()) != null;

                    mActivity, UserHandle.of(certHolder.getUserId())) != null;



            // Show trust button only when it requires consumer user (non-PO/DO) to approve

            CharSequence displayText = mActivity.getText(!isProfileOrDeviceOwner && mNeedsApproval

src/com/android/settings/dashboard/RestrictedDashboardFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -215,8 +215,8 @@ public abstract class RestrictedDashboardFragment extends DashboardFragment { 
    public EnforcedAdmin getRestrictionEnforcedAdmin() {

        mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getActivity(),

                mRestrictionKey, UserHandle.myUserId());

        if (mEnforcedAdmin != null && mEnforcedAdmin.userId == UserHandle.USER_NULL) {

            mEnforcedAdmin.userId = UserHandle.myUserId();

        if (mEnforcedAdmin != null && mEnforcedAdmin.user == null) {

            mEnforcedAdmin.user = UserHandle.of(UserHandle.myUserId());

        }

        return mEnforcedAdmin;

    }

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

+8 −2
Original line number Diff line number Diff line
@@ -53,12 +53,18 @@ public class ActionDisabledByAdminDialog extends Activity 


    @androidx.annotation.VisibleForTesting

    EnforcedAdmin getAdminDetailsFromIntent(Intent intent) {

        final EnforcedAdmin admin = new EnforcedAdmin(null, UserHandle.myUserId());

        final EnforcedAdmin admin = new EnforcedAdmin(null, UserHandle.of(UserHandle.myUserId()));

        if (intent == null) {

            return admin;

        }

        admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);

        admin.userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());



        int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());

        if (userId == UserHandle.USER_NULL) {

            admin.user = null;

        } else {

            admin.user = UserHandle.of(userId);

        }

        return admin;

    }