Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1072a24c authored by Oli Lan's avatar Oli Lan Committed by Android (Google) Code Review
Browse files

Merge "Validate package name passed to setApplicationRestrictions."

parents 3d81a3d7 31a58249

services/core/java/com/android/server/pm/UserManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.content.pm.ShortcutServiceInternal; 
import android.content.pm.UserInfo;

import android.content.pm.UserInfo.UserInfoFlag;

import android.content.pm.UserProperties;

import android.content.pm.parsing.FrameworkParsingPackageUtils;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Bitmap;
@@ -5368,6 +5369,11 @@ public class UserManagerService extends IUserManager.Stub { 
    public void setApplicationRestrictions(String packageName, Bundle restrictions,

            @UserIdInt int userId) {

        checkSystemOrRoot("set application restrictions");

        String validationResult =

                FrameworkParsingPackageUtils.validateName(packageName, false, false);

        if (validationResult != null) {

            throw new IllegalArgumentException("Invalid package name: " + validationResult);

        }

        if (restrictions != null) {

            restrictions.setDefusable(true);

        }