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

Merge "UM.getUserHandle -> UM.getProcessUserId"

Browse Source
This commit is contained in:
Adam Bookatz
2021-10-08 02:22:28 +00:00
committed by Android (Google) Code Review
parent 433f2bca45 30dafd4140
commit 97302f6f77
7 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/Utils.java
View File

@@ -419,7 +419,7 @@ public final class Utils extends com.android.settingslib.Utils {
public static UserHandle getManagedProfile(UserManager userManager) {
final List<UserHandle> userProfiles = userManager.getUserProfiles();
for (UserHandle profile : userProfiles) {
if (profile.getIdentifier() == userManager.getUserHandle()) {
if (profile.getIdentifier() == userManager.getProcessUserId()) {
continue;
}
final UserInfo userInfo = userManager.getUserInfo(profile.getIdentifier());

8
src/com/android/settings/applications/AppStateAppOpsBridge.java
View File

@@ -301,8 +301,8 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
if (entries == null) {
return 0;
}
final ArrayMap<String, PermissionState> entriesForProfile = entries.get(mUserManager
.getUserHandle());
final ArrayMap<String, PermissionState> entriesForProfile =
entries.get(mUserManager.getProcessUserId());
if (entriesForProfile == null) {
return 0;
}
@@ -316,8 +316,8 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
}
loadPermissionsStates(entries);
loadAppOpsStates(entries);
final ArrayMap<String, PermissionState> entriesForProfile = entries.get(mUserManager
.getUserHandle());
final ArrayMap<String, PermissionState> entriesForProfile =
entries.get(mUserManager.getProcessUserId());
if (entriesForProfile == null) {
return 0;
}

2
src/com/android/settings/network/apn/ApnSettings.java
View File

@@ -301,7 +301,7 @@ public class ApnSettings extends RestrictedSettingsFragment
@Override
public EnforcedAdmin getRestrictionEnforcedAdmin() {
final UserHandle user = UserHandle.of(mUserManager.getUserHandle());
final UserHandle user = UserHandle.of(mUserManager.getProcessUserId());
if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, user)
&& !mUserManager.hasBaseUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
user)) {