Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Track current user without calling into AMS." into nyc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2016-05-05 18:01:38 +00:00
committed by Android (Google) Code Review
parent 430df0fdb6 ab15c391eb
commit 90f4ca78ee
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/MountService.java
View File

@@ -177,6 +177,11 @@ class MountService extends IMountService.Stub
} }
} }
@Override
public void onSwitchUser(int userHandle) {
mMountService.mCurrentUserId = userHandle;
}
@Override @Override
public void onUnlockUser(int userHandle) { public void onUnlockUser(int userHandle) {
mMountService.onUnlockUser(userHandle); mMountService.onUnlockUser(userHandle);
@@ -320,6 +325,8 @@ class MountService extends IMountService.Stub
@GuardedBy("mLock") @GuardedBy("mLock")
private String mMoveTargetUuid; private String mMoveTargetUuid;
private volatile int mCurrentUserId = UserHandle.USER_SYSTEM;
private VolumeInfo findVolumeByIdOrThrow(String id) { private VolumeInfo findVolumeByIdOrThrow(String id) {
synchronized (mLock) { synchronized (mLock) {
final VolumeInfo vol = mVolumes.get(id); final VolumeInfo vol = mVolumes.get(id);
@@ -1285,7 +1292,7 @@ class MountService extends IMountService.Stub
vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE; vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
} }
vol.mountUserId = ActivityManager.getCurrentUser(); vol.mountUserId = mCurrentUserId;
mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget(); mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget();
} else if (vol.type == VolumeInfo.TYPE_PRIVATE) { } else if (vol.type == VolumeInfo.TYPE_PRIVATE) {