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

Commit a05a3686 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 69fe4069: am 006c6338: Merge "Fix bug in initializing preferred activities." into jb-mr2-dev 

* commit '69fe4069':
  Fix bug in initializing preferred activities.
parents 31f8b2d2 69fe4069

services/java/com/android/server/pm/PackageManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -1326,6 +1326,12 @@ public class PackageManagerService extends IPackageManager.Stub { 
                            ? (UPDATE_PERMISSIONS_REPLACE_PKG|UPDATE_PERMISSIONS_REPLACE_ALL)

                            : 0));



            // If this is the first boot, and it is a normal boot, then

            // we need to initialize the default preferred apps.

            if (!mRestoredSettings && !onlyCore) {

                mSettings.readDefaultPreferredAppsLPw(this, 0);

            }



            // can downgrade to reader

            mSettings.writeLPr();

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

+0 −3
Original line number Diff line number Diff line
@@ -1636,9 +1636,6 @@ final class Settings { 
                    mReadMessages.append("No settings file found\n");

                    PackageManagerService.reportSettingsProblem(Log.INFO,

                            "No settings file; creating initial state");

                    if (!onlyCore) {

                        readDefaultPreferredAppsLPw(service, 0);

                    }

                    mInternalSdkPlatform = mExternalSdkPlatform = sdkVersion;

                    return false;

                }