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

[automerge] Enable Encryption & Creds UI for Secondary users 2p: f1255b4298

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348343

Bug: 123211155
Change-Id: Ie00fce7c07aec140dcf7598a4e31c46453a6ab3f
This commit is contained in:
Presubmit Automerger Backend
2022-03-23 19:01:32 +00:00
parent ba394bec83 f1255b4298
commit 352f747f82
4 changed files with 3 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/security/EncryptionAndCredential.java
View File

@@ -20,7 +20,6 @@ import static com.android.settings.security.EncryptionStatusPreferenceController
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserManager;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -96,9 +95,7 @@ public class EncryptionAndCredential extends DashboardFragment {
@Override
protected boolean isPageSearchEnabled(Context context) {
final UserManager um = (UserManager) context.getSystemService(
Context.USER_SERVICE);
return um.isAdminUser();
return true;
}
};
}

4
src/com/android/settings/security/EncryptionStatusPreferenceController.java
View File

@@ -44,11 +44,11 @@ public class EncryptionStatusPreferenceController extends BasePreferenceControll
public int getAvailabilityStatus() {
if (TextUtils.equals(getPreferenceKey(), PREF_KEY_ENCRYPTION_DETAIL_PAGE) &&
!mContext.getResources().getBoolean(
R.bool.config_show_encryption_and_credentials_encryption_status)) {
R.bool.config_show_encryption_and_credentials_encryption_status)) {
return UNSUPPORTED_ON_DEVICE;
}
return mUserManager.isAdminUser() ? AVAILABLE : DISABLED_FOR_USER;
return AVAILABLE;
}
@Override