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

Commit 66866145 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

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

am: e7f82ec5

* commit 'e7f82ec5':
  Fix a regression in SettingsProvider
parents 379db962 e7f82ec5

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

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


    private PackageInfo getCallingPackageInfoOrThrow(int userId) {

        try {

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

            PackageInfo packageInfo = mPackageManager.getPackageInfo(

                    getCallingPackage(), 0, userId);

            if (packageInfo != null) {

                return packageInfo;

            }

        } 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) {