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

Commit 98404fdc authored by Xiaohui Chen's avatar Xiaohui Chen
Browse files

Clean up USER_OWNER reference. 

Bug: 19913735
Change-Id: I441672b360fa0fff5453f72c88f9577b5cc8eecf
parent f52b6658

core/java/android/content/pm/PackageParser.java

+1 −1
Original line number Diff line number Diff line
@@ -4702,7 +4702,7 @@ public class PackageParser { 


    private static boolean copyNeeded(int flags, Package p,

            PackageUserState state, Bundle metaData, int userId) {

        if (userId != UserHandle.USER_OWNER) {

        if (userId != UserHandle.USER_SYSTEM) {

            // We always need to copy for other users, since we need

            // to fix up the uid.

            return true;

core/java/android/content/pm/RegisteredServicesCache.java

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ public abstract class RegisteredServicesCache<V> { 
        @Override

        public void onReceive(Context context, Intent intent) {

            // External apps can't coexist with multi-user, so scan owner

            handlePackageEvent(intent, UserHandle.USER_OWNER);

            handlePackageEvent(intent, UserHandle.USER_SYSTEM);

        }

    };

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -16022,7 +16022,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    "Call does not support special user #" + targetUserId);

        }

        // Check shell permission

        if (callingUid == Process.SHELL_UID && targetUserId >= UserHandle.USER_OWNER) {

        if (callingUid == Process.SHELL_UID && targetUserId >= UserHandle.USER_SYSTEM) {

            if (mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES,

                    targetUserId)) {

                throw new SecurityException("Shell does not have permission to access user "

services/core/java/com/android/server/content/SyncManager.java

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ public class SyncManager { 


        for (AccountAndUser account : accounts) {

            // If userId is specified, do not sync accounts of other users

            if (userId >= UserHandle.USER_OWNER && account.userId >= UserHandle.USER_OWNER

            if (userId >= UserHandle.USER_SYSTEM && account.userId >= UserHandle.USER_SYSTEM

                    && userId != account.userId) {

                continue;

            }

services/core/java/com/android/server/location/LocationBlacklist.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public final class LocationBlacklist extends ContentObserver { 
    private String[] mWhitelist = new String[0];

    private String[] mBlacklist = new String[0];



    private int mCurrentUserId = UserHandle.USER_OWNER;

    private int mCurrentUserId = UserHandle.USER_SYSTEM;

    

    public LocationBlacklist(Context context, Handler handler) {

        super(handler);