Introduce system user and primary user.
Bug: 19913735
Change-Id: I2c7855915d778cf80a7154314321ddd90e2eaaac
diff --git a/core/java/android/content/pm/UserInfo.java b/core/java/android/content/pm/UserInfo.java
index c03be32..4d9c176 100644
--- a/core/java/android/content/pm/UserInfo.java
+++ b/core/java/android/content/pm/UserInfo.java
@@ -37,8 +37,8 @@
*/
/**
- * Primary user. Only one user can have this flag set. Meaning of this
- * flag TBD.
+ * Primary user. Only one user can have this flag set. It identifies the first human user
+ * on a device.
*/
public static final int FLAG_PRIMARY = 0x00000001;
diff --git a/core/java/android/os/IUserManager.aidl b/core/java/android/os/IUserManager.aidl
index aa4b051..9f5184d 100644
--- a/core/java/android/os/IUserManager.aidl
+++ b/core/java/android/os/IUserManager.aidl
@@ -34,6 +34,7 @@
void setUserName(int userHandle, String name);
void setUserIcon(int userHandle, in Bitmap icon);
ParcelFileDescriptor getUserIcon(int userHandle);
+ UserInfo getPrimaryUser();
List<UserInfo> getUsers(boolean excludeDying);
List<UserInfo> getProfiles(int userHandle, boolean enabledOnly);
boolean canAddMoreManagedProfiles();
diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java
index 6874e77..40fe2d1 100644
--- a/core/java/android/os/UserHandle.java
+++ b/core/java/android/os/UserHandle.java
@@ -55,12 +55,26 @@
/** @hide An undefined user id */
public static final int USER_NULL = -10000;
- /** @hide A user id constant to indicate the "owner" user of the device */
+ /**
+ * @hide A user id constant to indicate the "owner" user of the device
+ * @deprecated Consider using either USER_SYSTEM constant or
+ * UserInfo.isPrimary().
+ */
public static final int USER_OWNER = 0;
- /** @hide A user handle to indicate the primary/owner user of the device */
+ /**
+ * @hide A user handle to indicate the primary/owner user of the device
+ * @deprecated Consider using either SYSTEM constant or
+ * UserInfo.isPrimary().
+ */
public static final UserHandle OWNER = new UserHandle(USER_OWNER);
+ /** @hide A user id constant to indicate the "system" user of the device */
+ public static final int USER_SYSTEM = 0;
+
+ /** @hide A user handle to indicate the "system" user of the device */
+ public static final UserHandle SYSTEM = new UserHandle(USER_SYSTEM);
+
/**
* @hide Enable multi-user related side effects. Set this to false if
* there are problems with single user use-cases.
@@ -120,7 +134,7 @@
if (MU_ENABLED) {
return uid / PER_USER_RANGE;
} else {
- return 0;
+ return UserHandle.USER_SYSTEM;
}
}
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 9770941..64e3772 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -558,6 +558,18 @@
}
/**
+ * Used to check if this process is running under the primary user. The primary user
+ * is the first human user on a device.
+ *
+ * @return whether this process is running under the primary user.
+ * @hide
+ */
+ public boolean isPrimaryUser() {
+ UserInfo user = getUserInfo(UserHandle.myUserId());
+ return user != null ? user.isPrimary() : false;
+ }
+
+ /**
* Used to check if this process is running under the system user. The system user
* is the initial user that is implicitly created on first boot and hosts most of the
* system services.
@@ -565,9 +577,8 @@
* @return whether this process is running under the system user.
*/
public boolean isSystemUser() {
- return UserHandle.myUserId() == UserHandle.USER_OWNER;
+ return UserHandle.myUserId() == UserHandle.USER_SYSTEM;
}
-
/**
* Used to check if the user making this call is linked to another user. Linked users may have
* a reduced number of available apps, app restrictions and account restrictions.
@@ -956,6 +967,22 @@
}
/**
+ * Returns information for Primary user.
+ * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
+ *
+ * @return the Primary user, null if not found.
+ * @hide
+ */
+ public UserInfo getPrimaryUser() {
+ try {
+ return mService.getPrimaryUser();
+ } catch (RemoteException re) {
+ Log.w(TAG, "Could not get Primary user", re);
+ return null;
+ }
+ }
+
+ /**
* Checks whether it's possible to add more users. Caller must hold the MANAGE_USERS
* permission.
*
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index b1319cf..5dd5a72 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -209,7 +209,7 @@
mUsersDir = new File(dataDir, USER_INFO_DIR);
mUsersDir.mkdirs();
// Make zeroth user directory, for services to migrate their files to that location
- File userZeroDir = new File(mUsersDir, "0");
+ File userZeroDir = new File(mUsersDir, String.valueOf(UserHandle.USER_SYSTEM));
userZeroDir.mkdirs();
mBaseUserPath = baseUserPath;
FileUtils.setPermissions(mUsersDir.toString(),
@@ -243,7 +243,7 @@
}
}
}
- onUserForeground(UserHandle.USER_OWNER);
+ onUserForeground(UserHandle.USER_SYSTEM);
mAppOpsService = IAppOpsService.Stub.asInterface(
ServiceManager.getService(Context.APP_OPS_SERVICE));
for (int i = 0; i < mUserIds.length; ++i) {
@@ -256,6 +256,20 @@
}
@Override
+ public UserInfo getPrimaryUser() {
+ checkManageUsersPermission("query users");
+ synchronized (mPackagesLock) {
+ for (int i = 0; i < mUsers.size(); i++) {
+ UserInfo ui = mUsers.valueAt(i);
+ if (ui.isPrimary()) {
+ return ui;
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
public List<UserInfo> getUsers(boolean excludeDying) {
checkManageUsersPermission("query users");
synchronized (mPackagesLock) {
@@ -810,22 +824,23 @@
}
private void fallbackToSingleUserLocked() {
- // Create the primary user
- UserInfo primary = new UserInfo(UserHandle.USER_OWNER,
+ // Create the system user
+ // TODO: UserInfo.FLAG_PRIMARY flag should be set on the first human user.
+ UserInfo system = new UserInfo(UserHandle.USER_SYSTEM,
mContext.getResources().getString(com.android.internal.R.string.owner_name), null,
UserInfo.FLAG_ADMIN | UserInfo.FLAG_PRIMARY | UserInfo.FLAG_INITIALIZED);
- mUsers.put(0, primary);
+ mUsers.put(system.id, system);
mNextSerialNumber = MIN_USER_ID;
mUserVersion = USER_VERSION;
Bundle restrictions = new Bundle();
- mUserRestrictions.append(UserHandle.USER_OWNER, restrictions);
+ mUserRestrictions.append(UserHandle.USER_SYSTEM, restrictions);
updateUserIdsLocked();
initDefaultGuestRestrictions();
writeUserListLocked();
- writeUserLocked(primary);
+ writeUserLocked(system);
}
private void scheduleWriteUserLocked(UserInfo userInfo) {
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index d575516..2663260 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -403,7 +403,6 @@
NsdService serviceDiscovery= null;
WindowManagerService wm = null;
BluetoothManagerService bluetooth = null;
- UsbService usb = null;
SerialService serial = null;
NetworkTimeUpdateService networkTimeUpdater = null;
CommonTimeManagementService commonTimeMgmtService = null;
@@ -413,7 +412,6 @@
AudioService audioService = null;
MmsServiceBroker mmsService = null;
EntropyMixer entropyMixer = null;
- CameraService cameraService = null;
boolean disableStorage = SystemProperties.getBoolean("config.disable_storage", false);
boolean disableBluetooth = SystemProperties.getBoolean("config.disable_bluetooth", false);
@@ -1206,6 +1204,6 @@
intent.setComponent(new ComponentName("com.android.systemui",
"com.android.systemui.SystemUIService"));
//Slog.d(TAG, "Starting service: " + intent);
- context.startServiceAsUser(intent, UserHandle.OWNER);
+ context.startServiceAsUser(intent, UserHandle.SYSTEM);
}
}