commit | 67a8d3516c80c71d81352318b33cba95f8b4cc0b | [log] [tgz] |
---|---|---|
author | Svetoslav Ganov <svetoslavganov@google.com> | Wed Mar 02 13:26:40 2016 -0800 |
committer | Svetoslav Ganov <svetoslavganov@google.com> | Wed Mar 02 13:26:43 2016 -0800 |
tree | c9cfc2db3ca4041ab08ef6a5550550282b8a3cf9 | |
parent | a52f6a17efa944adc945a61788cc3beb54c569e7 [diff] |
Fix a regression in SettingsProvider bug24990012 Change-Id: I1631d125df029f559ffc059ffcb73067389184e8
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 9842e28..a424d55 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 @@ 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) {