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

Merge "Remove MANAGE_USERS from setPackagesSuspended" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-21 20:01:36 +00:00
committed by Android (Google) Code Review
parent a757fd7827 14405c9ac3
commit d0897f2b65
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/PackageManager.java
View File

@@ -5574,8 +5574,7 @@ public abstract class PackageManager {
* @hide
*/
@SystemApi
@RequiresPermission(anyOf = {Manifest.permission.SUSPEND_APPS,
Manifest.permission.MANAGE_USERS})
@RequiresPermission(Manifest.permission.SUSPEND_APPS)
public String[] setPackagesSuspended(String[] packageNames, boolean suspended,
@Nullable PersistableBundle appExtras, @Nullable PersistableBundle launcherExtras,
String dialogMessage) {

10
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -14090,13 +14090,9 @@ public class PackageManagerService extends IPackageManager.Stub
public String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended,
PersistableBundle appExtras, PersistableBundle launcherExtras, String dialogMessage,
String callingPackage, int userId) {
try {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SUSPEND_APPS, null);
} catch (SecurityException e) {
mContext.enforceCallingOrSelfPermission(Manifest.permission.MANAGE_USERS,
"Callers need to have either " + Manifest.permission.SUSPEND_APPS + " or "
+ Manifest.permission.MANAGE_USERS);
}
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SUSPEND_APPS,
"setPackagesSuspendedAsUser");
final int callingUid = Binder.getCallingUid();
if (callingUid != Process.ROOT_UID && callingUid != Process.SYSTEM_UID
&& getPackageUid(callingPackage, 0, userId) != callingUid) {