summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author longhai <longhai@xiaomi.com> 2016-11-16 03:18:08 +0000
committer android-build-merger <android-build-merger@google.com> 2016-11-16 03:18:08 +0000
commitd7e2ae5fc752453e6c992b98fea82b5eae26b0f0 (patch)
treee11f83f7543412ac5d3bd00bd7a9ec8c9a17a8ea
parent0fc7044d0b6ba0b262a89589ebdc51dbe8bfc298 (diff)
parent5c152a3d7f7bcd003a833b8ebe4a2d1eeb33df11 (diff)
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae0159 am: 2be54fde72
am: 5c152a3d7f Change-Id: Ida06ea3d42d66cb2f1cc124fe3498e579141d16c
-rw-r--r--services/core/java/com/android/server/pm/Settings.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index b0c536f04652..335af088e68a 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -1410,7 +1410,6 @@ final class Settings {
VersionInfo ver = mVersion.get(volumeUuid);
if (ver == null) {
ver = new VersionInfo();
- ver.forceCurrent();
mVersion.put(volumeUuid, ver);
}
return ver;
@@ -2795,8 +2794,8 @@ final class Settings {
"No settings file; creating initial state");
// It's enough to just touch version details to create them
// with default values
- findOrCreateVersion(StorageManager.UUID_PRIVATE_INTERNAL);
- findOrCreateVersion(StorageManager.UUID_PRIMARY_PHYSICAL);
+ findOrCreateVersion(StorageManager.UUID_PRIVATE_INTERNAL).forceCurrent();
+ findOrCreateVersion(StorageManager.UUID_PRIMARY_PHYSICAL).forceCurrent();
return false;
}
str = new FileInputStream(mSettingsFilename);