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:
@@ -17,6 +17,8 @@
|
||||
package com.android.settings.applications;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.ParceledListSlice;
|
||||
import android.content.pm.ResolveInfo;
|
||||
import android.os.RemoteException;
|
||||
|
||||
@@ -41,4 +43,33 @@ public interface IPackageManagerWrapper {
|
||||
* @see android.content.pm.IPackageManager#findPersistentPreferredActivity
|
||||
*/
|
||||
ResolveInfo findPersistentPreferredActivity(Intent intent, int userId) throws RemoteException;
|
||||
|
||||
/**
|
||||
* Calls {@code IPackageManager.getPackageInfo()}.
|
||||
*
|
||||
* @see android.content.pm.IPackageManager#getPackageInfo
|
||||
*/
|
||||
PackageInfo getPackageInfo(String packageName, int flags, int userId) throws RemoteException;
|
||||
|
||||
/**
|
||||
* Calls {@code IPackageManager.getAppOpPermissionPackages()}.
|
||||
*
|
||||
* @see android.content.pm.IPackageManager#getAppOpPermissionPackages
|
||||
*/
|
||||
String[] getAppOpPermissionPackages(String permissionName) throws RemoteException;
|
||||
|
||||
/**
|
||||
* Calls {@code IPackageManager.isPackageAvailable()}.
|
||||
*
|
||||
* @see android.content.pm.IPackageManager#isPackageAvailable
|
||||
*/
|
||||
boolean isPackageAvailable(String packageName, int userId) throws RemoteException;
|
||||
|
||||
/**
|
||||
* Calls {@code IPackageManager.getPackagesHoldingPermissions()}.
|
||||
*
|
||||
* @see android.content.pm.IPackageManager#getPackagesHoldingPermissions
|
||||
*/
|
||||
ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(
|
||||
String[] permissions, int flags, int userId) throws RemoteException;
|
||||
}
|
||||
|
Reference in New Issue
Block a user