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

Commit e7f82ec5 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Fix a regression in SettingsProvider" into nyc-dev

parents 51e06e01 67a8d351

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -1128,10 +1128,15 @@ public class SettingsProvider extends ContentProvider { 




    private PackageInfo getCallingPackageInfoOrThrow(int userId) {

    private PackageInfo getCallingPackageInfoOrThrow(int userId) {

        try {

        try {

            return mPackageManager.getPackageInfo(getCallingPackage(), 0, userId);

            PackageInfo packageInfo = mPackageManager.getPackageInfo(

                    getCallingPackage(), 0, userId);

            if (packageInfo != null) {

                return packageInfo;

            }

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw new IllegalStateException("Calling package doesn't exist");

            /* ignore */

        }

        }

        throw new IllegalStateException("Calling package doesn't exist");

    }

    }





    private int getGroupParentLocked(int userId) {

    private int getGroupParentLocked(int userId) {