Fix crash when primary user select app installed by secondary user.
- PackageManager.getPackageInfo() can return null. When trying to check the app permission info, check for null package info and only process the permission info when package info is available. - Update usage of PackageManager.MATCH_UNINSTALLED_PACKAGES to PackageManager.MATCH_ANY_USER, as the implementation for querying packages for other users have been changed. - Add PackageManager APIs used by AppStateAppOpsBridge to IPackageManagerWrapper for test purpose. - Change UserManager.get() to Context.getSystemService() to fix test failure. Change-Id: I52de924618aa252ffaae02b8f06ebe5b1d0def61 Fix: 37409266 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -18,6 +18,8 @@ package com.android.settings.applications;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.pm.IPackageManager;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.ParceledListSlice;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.os.RemoteException;
|
||||
|
||||
@@ -39,4 +41,27 @@ public class IPackageManagerWrapperImpl implements IPackageManagerWrapper {
|
||||
throws RemoteException {
|
||||
return mPms.findPersistentPreferredActivity(intent, userId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PackageInfo getPackageInfo(String packageName, int flags, int userId)
|
||||
throws RemoteException {
|
||||
return mPms.getPackageInfo(packageName, flags, userId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getAppOpPermissionPackages(String permissionName) throws RemoteException {
|
||||
return mPms.getAppOpPermissionPackages(permissionName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPackageAvailable(String packageName, int userId) throws RemoteException {
|
||||
return mPms.isPackageAvailable(packageName, userId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(
|
||||
String[] permissions, int flags, int userId) throws RemoteException {
|
||||
return mPms.getPackagesHoldingPermissions(permissions, flags, userId);
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user