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

Commit f9ee84db authored by Xiaohui Chen's avatar Xiaohui Chen
Browse files

Clean up UserHandle.isOwner() in settings 

Bug: 24869636
Change-Id: I9cb05a7543024136935902047952f582ae57c07c
parent 57217ae0

src/com/android/settings/ChooseLockGeneric.java

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.hardware.fingerprint.FingerprintManager.RemovalCallback; 
import android.os.Bundle;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.security.KeyStore;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;
@@ -208,7 +209,8 @@ public class ChooseLockGeneric extends SettingsActivity { 
        // what makes sense with disabled == true

        private void maybeEnableEncryption(int quality, boolean disabled) {

            DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);

            if (Process.myUserHandle().isOwner() && LockPatternUtils.isDeviceEncryptionEnabled()

            if (UserManager.get(getActivity()).isAdminUser()

                    && LockPatternUtils.isDeviceEncryptionEnabled()

                    && !dpm.getDoNotAskCredentialsOnBoot()) {

                mEncryptionRequestQuality = quality;

                mEncryptionRequestDisabled = disabled;

src/com/android/settings/DeviceAdminAdd.java

+4 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.Handler; 
import android.os.RemoteCallback;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.text.TextUtils.TruncateAt;

import android.util.EventLog;

import android.util.Log;
@@ -472,10 +473,10 @@ public class DeviceAdminAdd extends Activity { 


    private void addDeviceAdminPolicies(boolean showDescription) {

        if (!mAdminPoliciesInitialized) {

            boolean isOwner = Binder.getCallingUserHandle().isOwner();

            boolean isAdminUser = UserManager.get(this).isAdminUser();

            for (DeviceAdminInfo.PolicyInfo pi : mDeviceAdmin.getUsedPolicies()) {

                int descriptionId = isOwner ? pi.description : pi.descriptionForSecondaryUsers;

                int labelId = isOwner ? pi.label : pi.labelForSecondaryUsers;

                int descriptionId = isAdminUser ? pi.description : pi.descriptionForSecondaryUsers;

                int labelId = isAdminUser ? pi.label : pi.labelForSecondaryUsers;

                View view = AppSecurityPermissions.getPermissionItemView(this, getText(labelId),

                        showDescription ? getText(descriptionId) : "", true);

                mAdminPolicies.addView(view);