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

Commit 2be54fde 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

Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e
parents afb8f377 1813ae01

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

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