Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c152a3d authored by longhai's avatar longhai Committed by android-build-merger
Browse files

Merge "Fixed the issue when some apps were gone and couldn't be installed... 

Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." am: 1813ae01
am: 2be54fde

Change-Id: I14e1d5aa6bda143e2a87bba1ea65b8384c44e3a1
parents 2e73b06f 2be54fde

services/core/java/com/android/server/pm/Settings.java

+2 −3
Original line number Diff line number Diff line
@@ -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);