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

Commit 006c6338 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix bug in initializing preferred activities." into jb-mr2-dev

parents a3598346 4d491a60

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

+6 −0
Original line number Diff line number Diff line
@@ -1323,6 +1323,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
@@ -1603,9 +1603,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;

                }