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

Merge "Fix partial user cleanup on restart" into mnc-dev

Browse Source
This commit is contained in:
Amith Yamasani
2015-08-07 18:21:30 +00:00
committed by Android (Google) Code Review
parent c376afb472 a7892486c2
commit 1fbc1b3b4b
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -766,6 +766,15 @@ class MountService extends IMountService.Stub
}
}
private void addInternalVolume() {
// Create a stub volume that represents internal storage
final VolumeInfo internal = new VolumeInfo(VolumeInfo.ID_PRIVATE_INTERNAL,
VolumeInfo.TYPE_PRIVATE, null, null);
internal.state = VolumeInfo.STATE_MOUNTED;
internal.path = Environment.getDataDirectory().getAbsolutePath();
mVolumes.put(internal.id, internal);
}
private void resetIfReadyAndConnectedLocked() {
Slog.d(TAG, "Thinking about reset, mSystemReady=" + mSystemReady
+ ", mDaemonConnected=" + mDaemonConnected);
@@ -775,12 +784,7 @@ class MountService extends IMountService.Stub
mDisks.clear();
mVolumes.clear();
// Create a stub volume that represents internal storage
final VolumeInfo internal = new VolumeInfo(VolumeInfo.ID_PRIVATE_INTERNAL,
VolumeInfo.TYPE_PRIVATE, null, null);
internal.state = VolumeInfo.STATE_MOUNTED;
internal.path = Environment.getDataDirectory().getAbsolutePath();
mVolumes.put(internal.id, internal);
addInternalVolume();
try {
mConnector.execute("volume", "reset");
@@ -1412,6 +1416,8 @@ class MountService extends IMountService.Stub
userFilter.addAction(Intent.ACTION_USER_REMOVED);
mContext.registerReceiver(mUserReceiver, userFilter, null, mHandler);
addInternalVolume();
// Add ourself to the Watchdog monitors if enabled.
if (WATCHDOG_ENABLE) {
Watchdog.getInstance().addMonitor(this);

2
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -246,7 +246,7 @@ public class UserManagerService extends IUserManager.Stub {
}
for (int i = 0; i < partials.size(); i++) {
UserInfo ui = partials.get(i);
Slog.w(LOG_TAG, "Removing partially created user #" + i
Slog.w(LOG_TAG, "Removing partially created user " + ui.id
+ " (name=" + ui.name + ")");
removeUserStateLocked(ui.id);
}