diff options
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 9842e28ffdba..a424d554729b 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -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) { |