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

Merge "Fix PackageInstaller failure when called from different user" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-15 21:21:01 +00:00
committed by Android (Google) Code Review
parent ee35eba00e 0461f6fd4d
commit 73a8e537ca
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java
View File

@@ -30,13 +30,17 @@ import android.content.pm.IPackageManager;
import android.content.pm.PackageInstaller; import android.content.pm.PackageInstaller;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ProviderInfo; import android.content.pm.ProviderInfo;
import android.content.pm.UserInfo;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserManager;
import android.permission.IPermissionManager; import android.permission.IPermissionManager;
import android.util.Log; import android.util.Log;
import java.util.List;
/** /**
* Select which activity is the first visible activity of the installation and forward the intent to * Select which activity is the first visible activity of the installation and forward the intent to
* it. * it.
@@ -47,6 +51,7 @@ public class InstallStart extends Activity {
private static final String DOWNLOADS_AUTHORITY = "downloads"; private static final String DOWNLOADS_AUTHORITY = "downloads";
private IPackageManager mIPackageManager; private IPackageManager mIPackageManager;
private IPermissionManager mIPermissionManager; private IPermissionManager mIPermissionManager;
private UserManager mUserManager;
private boolean mAbortInstall = false; private boolean mAbortInstall = false;
@Override @Override
@@ -54,6 +59,7 @@ public class InstallStart extends Activity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mIPackageManager = AppGlobals.getPackageManager(); mIPackageManager = AppGlobals.getPackageManager();
mIPermissionManager = AppGlobals.getPermissionManager(); mIPermissionManager = AppGlobals.getPermissionManager();
mUserManager = getSystemService(UserManager.class);
Intent intent = getIntent(); Intent intent = getIntent();
String callingPackage = getCallingPackage(); String callingPackage = getCallingPackage();
@@ -144,13 +150,16 @@ public class InstallStart extends Activity {
if (packages == null) { if (packages == null) {
return false; return false;
} }
final List<UserInfo> users = mUserManager.getUsers();
for (String packageName : packages) { for (String packageName : packages) {
try { for (UserInfo user : users) {
if (uid == getPackageManager().getPackageUid(packageName, 0)) { try {
return true; if (uid == getPackageManager().getPackageUidAsUser(packageName, user.id)) {
return true;
}
} catch (PackageManager.NameNotFoundException e) {
// Ignore and try the next package
} }
} catch (PackageManager.NameNotFoundException e) {
// Ignore and try the next package
} }
} }
} catch (RemoteException rexc) { } catch (RemoteException rexc) {