summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2016-11-16 02:54:25 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-11-16 02:54:26 +0000
commit1813ae0159cda05a6882c77714f25718fc67c311 (patch)
treef2fe26adcea18bf66cb2cfabf57106550d6ed038
parent41fd0f1faf68acff5928d133aabb55bfb019a873 (diff)
parentbc62b218df0bf6b83169cd82420e2701ae13a5ea (diff)
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
-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 dfd6dfe1c775..99a6979d3436 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);