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:
@@ -32,7 +32,7 @@ public abstract class AppCounter extends AsyncTask<Void, Void, Integer> {
|
|||||||
|
|
||||||
public AppCounter(Context context, PackageManagerWrapper packageManager) {
|
public AppCounter(Context context, PackageManagerWrapper packageManager) {
|
||||||
mPm = packageManager;
|
mPm = packageManager;
|
||||||
mUm = UserManager.get(context);
|
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -19,12 +19,12 @@ import android.app.AppGlobals;
|
|||||||
import android.app.AppOpsManager;
|
import android.app.AppOpsManager;
|
||||||
import android.app.AppOpsManager.PackageOps;
|
import android.app.AppOpsManager.PackageOps;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.pm.IPackageManager;
|
|
||||||
import android.content.pm.PackageInfo;
|
import android.content.pm.PackageInfo;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
|
import android.support.annotation.VisibleForTesting;
|
||||||
import android.util.ArrayMap;
|
import android.util.ArrayMap;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.util.SparseArray;
|
import android.util.SparseArray;
|
||||||
@@ -46,7 +46,7 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
|
|||||||
|
|
||||||
private static final String TAG = "AppStateAppOpsBridge";
|
private static final String TAG = "AppStateAppOpsBridge";
|
||||||
|
|
||||||
private final IPackageManager mIPackageManager;
|
private final IPackageManagerWrapper mIPackageManager;
|
||||||
private final UserManager mUserManager;
|
private final UserManager mUserManager;
|
||||||
private final List<UserHandle> mProfiles;
|
private final List<UserHandle> mProfiles;
|
||||||
private final AppOpsManager mAppOpsManager;
|
private final AppOpsManager mAppOpsManager;
|
||||||
@@ -56,9 +56,16 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
|
|||||||
|
|
||||||
public AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
|
public AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
|
||||||
int appOpsOpCode, String[] permissions) {
|
int appOpsOpCode, String[] permissions) {
|
||||||
|
this(context, appState, callback, appOpsOpCode, permissions,
|
||||||
|
new IPackageManagerWrapperImpl(AppGlobals.getPackageManager()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting(otherwise = VisibleForTesting.NONE)
|
||||||
|
AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
|
||||||
|
int appOpsOpCode, String[] permissions, IPackageManagerWrapper packageManager) {
|
||||||
super(appState, callback);
|
super(appState, callback);
|
||||||
mContext = context;
|
mContext = context;
|
||||||
mIPackageManager = AppGlobals.getPackageManager();
|
mIPackageManager = packageManager;
|
||||||
mUserManager = UserManager.get(context);
|
mUserManager = UserManager.get(context);
|
||||||
mProfiles = mUserManager.getUserProfiles();
|
mProfiles = mUserManager.getUserProfiles();
|
||||||
mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
|
mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
|
||||||
@@ -92,8 +99,9 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
|
|||||||
.getUserId(uid)));
|
.getUserId(uid)));
|
||||||
try {
|
try {
|
||||||
permissionState.packageInfo = mIPackageManager.getPackageInfo(pkg,
|
permissionState.packageInfo = mIPackageManager.getPackageInfo(pkg,
|
||||||
PackageManager.GET_PERMISSIONS | PackageManager.MATCH_UNINSTALLED_PACKAGES,
|
PackageManager.GET_PERMISSIONS | PackageManager.MATCH_ANY_USER,
|
||||||
permissionState.userHandle.getIdentifier());
|
permissionState.userHandle.getIdentifier());
|
||||||
|
if (permissionState.packageInfo != null) {
|
||||||
// Check static permission state (whatever that is declared in package manifest)
|
// Check static permission state (whatever that is declared in package manifest)
|
||||||
String[] requestedPermissions = permissionState.packageInfo.requestedPermissions;
|
String[] requestedPermissions = permissionState.packageInfo.requestedPermissions;
|
||||||
int[] permissionFlags = permissionState.packageInfo.requestedPermissionsFlags;
|
int[] permissionFlags = permissionState.packageInfo.requestedPermissionsFlags;
|
||||||
@@ -101,13 +109,15 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
|
|||||||
for (int i = 0; i < requestedPermissions.length; i++) {
|
for (int i = 0; i < requestedPermissions.length; i++) {
|
||||||
if (doesAnyPermissionMatch(requestedPermissions[i], mPermissions)) {
|
if (doesAnyPermissionMatch(requestedPermissions[i], mPermissions)) {
|
||||||
permissionState.permissionDeclared = true;
|
permissionState.permissionDeclared = true;
|
||||||
if ((permissionFlags[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0) {
|
if ((permissionFlags[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED)
|
||||||
|
!= 0) {
|
||||||
permissionState.staticPermissionGranted = true;
|
permissionState.staticPermissionGranted = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Check app op state.
|
// Check app op state.
|
||||||
List<PackageOps> ops = mAppOpsManager.getOpsForPackage(uid, pkg, mAppOpsOpCodes);
|
List<PackageOps> ops = mAppOpsManager.getOpsForPackage(uid, pkg, mAppOpsOpCodes);
|
||||||
if (ops != null && ops.size() > 0 && ops.get(0).getOps().size() > 0) {
|
if (ops != null && ops.size() > 0 && ops.get(0).getOps().size() > 0) {
|
||||||
|
@@ -17,6 +17,8 @@
|
|||||||
package com.android.settings.applications;
|
package com.android.settings.applications;
|
||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageInfo;
|
||||||
|
import android.content.pm.ParceledListSlice;
|
||||||
import android.content.pm.ResolveInfo;
|
import android.content.pm.ResolveInfo;
|
||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
|
|
||||||
@@ -41,4 +43,33 @@ public interface IPackageManagerWrapper {
|
|||||||
* @see android.content.pm.IPackageManager#findPersistentPreferredActivity
|
* @see android.content.pm.IPackageManager#findPersistentPreferredActivity
|
||||||
*/
|
*/
|
||||||
ResolveInfo findPersistentPreferredActivity(Intent intent, int userId) throws RemoteException;
|
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;
|
||||||
}
|
}
|
||||||
|
@@ -18,6 +18,8 @@ package com.android.settings.applications;
|
|||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.IPackageManager;
|
import android.content.pm.IPackageManager;
|
||||||
|
import android.content.pm.PackageInfo;
|
||||||
|
import android.content.pm.ParceledListSlice;
|
||||||
import android.content.pm.ResolveInfo;
|
import android.content.pm.ResolveInfo;
|
||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
|
|
||||||
@@ -39,4 +41,27 @@ public class IPackageManagerWrapperImpl implements IPackageManagerWrapper {
|
|||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
return mPms.findPersistentPreferredActivity(intent, userId);
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -500,7 +500,7 @@ public class RunningState {
|
|||||||
si.mRunningService = service;
|
si.mRunningService = service;
|
||||||
try {
|
try {
|
||||||
si.mServiceInfo = ActivityThread.getPackageManager().getServiceInfo(
|
si.mServiceInfo = ActivityThread.getPackageManager().getServiceInfo(
|
||||||
service.service, PackageManager.MATCH_UNINSTALLED_PACKAGES,
|
service.service, PackageManager.MATCH_ANY_USER,
|
||||||
UserHandle.getUserId(service.uid));
|
UserHandle.getUserId(service.uid));
|
||||||
|
|
||||||
if (si.mServiceInfo == null) {
|
if (si.mServiceInfo == null) {
|
||||||
|
@@ -144,7 +144,7 @@ public class SharedPreferencesLogger implements SharedPreferences {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
pm.getPackageInfo(value, PackageManager.MATCH_UNINSTALLED_PACKAGES);
|
pm.getPackageInfo(value, PackageManager.MATCH_ANY_USER);
|
||||||
logPackageName(key, value);
|
logPackageName(key, value);
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
} catch (PackageManager.NameNotFoundException e) {
|
||||||
// Clearly not a package, and it's unlikely this preference is in prefSet, so
|
// Clearly not a package, and it's unlikely this preference is in prefSet, so
|
||||||
|
@@ -0,0 +1,75 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2017 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.applications;
|
||||||
|
|
||||||
|
import static org.mockito.Matchers.anyInt;
|
||||||
|
import static org.mockito.Matchers.anyString;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.Manifest;
|
||||||
|
import android.app.AppOpsManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.RemoteException;
|
||||||
|
import android.os.UserManager;
|
||||||
|
import com.android.settings.SettingsRobolectricTestRunner;
|
||||||
|
import com.android.settings.TestConfig;
|
||||||
|
import com.android.settingslib.applications.ApplicationsState.AppEntry;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||||
|
public final class AppStateAppOpsBridgeTest {
|
||||||
|
|
||||||
|
@Mock private Context mContext;
|
||||||
|
@Mock private UserManager mUserManager;
|
||||||
|
@Mock private IPackageManagerWrapper mPackageManagerService;
|
||||||
|
@Mock private AppOpsManager mAppOpsManager;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
|
||||||
|
when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getPermissionInfo_nullPackageInfo_shouldNotCrash() throws RemoteException {
|
||||||
|
when(mPackageManagerService.getPackageInfo(anyString(), anyInt(), anyInt()))
|
||||||
|
.thenReturn(null);
|
||||||
|
TestAppStateAppOpsBridge appStateAppOpsBridge = new TestAppStateAppOpsBridge();
|
||||||
|
|
||||||
|
appStateAppOpsBridge.getPermissionInfo("pkg1", 1);
|
||||||
|
// should not crash
|
||||||
|
}
|
||||||
|
|
||||||
|
private class TestAppStateAppOpsBridge extends AppStateAppOpsBridge {
|
||||||
|
public TestAppStateAppOpsBridge() {
|
||||||
|
super(mContext, null, null, AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
|
||||||
|
new String[] {Manifest.permission.SYSTEM_ALERT_WINDOW},
|
||||||
|
mPackageManagerService);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user