Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Svetoslav Ganov
2016-03-02 21:32:04 +00:00
committed by Android (Google) Code Review
parent 51e06e011d 67a8d3516c
commit e7f82ec533
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

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