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

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

Browse Source 
am: 5c152a3d7f

Change-Id: Ida06ea3d42d66cb2f1cc124fe3498e579141d16c
This commit is contained in:
longhai
2016-11-16 03:18:08 +00:00
committed by android-build-merger
parent 0fc7044d0b 5c152a3d7f
commit d7e2ae5fc7
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/Settings.java
View File

@@ -1410,7 +1410,6 @@ final class Settings {
VersionInfo ver = mVersion.get(volumeUuid); VersionInfo ver = mVersion.get(volumeUuid);
if (ver == null) { if (ver == null) {
ver = new VersionInfo(); ver = new VersionInfo();
ver.forceCurrent();
mVersion.put(volumeUuid, ver); mVersion.put(volumeUuid, ver);
} }
return ver; return ver;
@@ -2795,8 +2794,8 @@ final class Settings {
"No settings file; creating initial state"); "No settings file; creating initial state");
// It's enough to just touch version details to create them // It's enough to just touch version details to create them
// with default values // with default values
findOrCreateVersion(StorageManager.UUID_PRIVATE_INTERNAL); findOrCreateVersion(StorageManager.UUID_PRIVATE_INTERNAL).forceCurrent();
findOrCreateVersion(StorageManager.UUID_PRIMARY_PHYSICAL); findOrCreateVersion(StorageManager.UUID_PRIMARY_PHYSICAL).forceCurrent();
return false; return false;
} }
str = new FileInputStream(mSettingsFilename); str = new FileInputStream(mSettingsFilename);