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

Commit 1813ae01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
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."
parents 41fd0f1f bc62b218

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);