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

Clean up UserHandle.isOwner() in settings

Browse Source 
Bug: 24869636
Change-Id: I9cb05a7543024136935902047952f582ae57c07c
This commit is contained in:
Xiaohui Chen
2015-10-21 11:25:35 -07:00
parent 57217ae00a
commit f9ee84dba4
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -33,6 +33,7 @@ import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
import android.os.Bundle; import android.os.Bundle;
import android.os.Process; import android.os.Process;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager;
import android.security.KeyStore; import android.security.KeyStore;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
@@ -208,7 +209,8 @@ public class ChooseLockGeneric extends SettingsActivity {
// what makes sense with disabled == true // what makes sense with disabled == true
private void maybeEnableEncryption(int quality, boolean disabled) { private void maybeEnableEncryption(int quality, boolean disabled) {
DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE); DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);
if (Process.myUserHandle().isOwner() && LockPatternUtils.isDeviceEncryptionEnabled() if (UserManager.get(getActivity()).isAdminUser()
&& LockPatternUtils.isDeviceEncryptionEnabled()
&& !dpm.getDoNotAskCredentialsOnBoot()) { && !dpm.getDoNotAskCredentialsOnBoot()) {
mEncryptionRequestQuality = quality; mEncryptionRequestQuality = quality;
mEncryptionRequestDisabled = disabled; mEncryptionRequestDisabled = disabled;

7
src/com/android/settings/DeviceAdminAdd.java
View File

@@ -41,6 +41,7 @@ import android.os.Handler;
import android.os.RemoteCallback; import android.os.RemoteCallback;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils.TruncateAt; import android.text.TextUtils.TruncateAt;
import android.util.EventLog; import android.util.EventLog;
import android.util.Log; import android.util.Log;
@@ -472,10 +473,10 @@ public class DeviceAdminAdd extends Activity {
private void addDeviceAdminPolicies(boolean showDescription) { private void addDeviceAdminPolicies(boolean showDescription) {
if (!mAdminPoliciesInitialized) { if (!mAdminPoliciesInitialized) {
boolean isOwner = Binder.getCallingUserHandle().isOwner(); boolean isAdminUser = UserManager.get(this).isAdminUser();
for (DeviceAdminInfo.PolicyInfo pi : mDeviceAdmin.getUsedPolicies()) { for (DeviceAdminInfo.PolicyInfo pi : mDeviceAdmin.getUsedPolicies()) {
int descriptionId = isOwner ? pi.description : pi.descriptionForSecondaryUsers; int descriptionId = isAdminUser ? pi.description : pi.descriptionForSecondaryUsers;
int labelId = isOwner ? pi.label : pi.labelForSecondaryUsers; int labelId = isAdminUser ? pi.label : pi.labelForSecondaryUsers;
View view = AppSecurityPermissions.getPermissionItemView(this, getText(labelId), View view = AppSecurityPermissions.getPermissionItemView(this, getText(labelId),
showDescription ? getText(descriptionId) : "", true); showDescription ? getText(descriptionId) : "", true);
mAdminPolicies.addView(view); mAdminPolicies.addView(view);