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

Commit 1df6016b authored by Rhed Jao's avatar Rhed Jao Committed by Automerger Merge Worker
Browse files

Merge "Downgrade error messages to the warning" into sc-dev am: 81f763d8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14060613

Change-Id: Ia7777aeea069d090a453972bb2a3835e6d308975
parents b36cc8ce 81f763d8

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

+4 −4
Original line number Diff line number Diff line
@@ -7198,7 +7198,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                        updateSharedLibrariesLocked(pkg, stubPkgSetting, null, null,

                                Collections.unmodifiableMap(mPackages));

                    } catch (PackageManagerException e) {

                        Slog.e(TAG, "updateAllSharedLibrariesLPw failed: ", e);

                        Slog.w(TAG, "updateAllSharedLibrariesLPw failed: ", e);

                    }

                    final int[] userIds = mUserManager.getUserIds();

                    for (final int userId : userIds) {
@@ -7450,7 +7450,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        if (matches.size() == 1) {

            return matches.get(0).getComponentInfo().packageName;

        } else if (matches.size() == 0) {

            Log.e(TAG, "There should probably be a verifier, but, none were found");

            Log.w(TAG, "There should probably be a verifier, but, none were found");

            return null;

        }

        throw new RuntimeException("There must be exactly one verifier; found " + matches);
@@ -22823,7 +22823,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        if (matches.size() == 1) {

            return matches.get(0).getComponentInfo().packageName;

        } else {

            Slog.e(TAG, "There should probably be exactly one storage manager; found "

            Slog.w(TAG, "There should probably be exactly one storage manager; found "

                    + matches.size() + ": matches=" + matches);

            return null;

        }
@@ -25015,7 +25015,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                    // already held, since it's invoked as a side-effect of

                    // executeBatchLI()

                    if (e != null) {

                        logCriticalInfo(Log.ERROR, "Failed to create app data for " + packageName

                        logCriticalInfo(Log.WARN, "Failed to create app data for " + packageName

                                + ", but trying to recover: " + e);

                        destroyAppDataLeafLIF(pkg, userId, flags);

                        try {

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

+2 −2
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ public final class Settings implements Watchable, Snappable { 
                size++;

            }

            if (mAppIds.get(index) != null) {

                PackageManagerService.reportSettingsProblem(Log.ERROR,

                PackageManagerService.reportSettingsProblem(Log.WARN,

                        "Adding duplicate app id: " + appId

                        + " name=" + name);

                return false;
@@ -1237,7 +1237,7 @@ public final class Settings implements Watchable, Snappable { 
            mAppIds.set(index, obj);

        } else {

            if (mOtherAppIds.get(appId) != null) {

                PackageManagerService.reportSettingsProblem(Log.ERROR,

                PackageManagerService.reportSettingsProblem(Log.WARN,

                        "Adding duplicate shared id: " + appId

                                + " name=" + name);

                return false;