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

Commit 29ce85ba authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Don't allow guests to install from unknown sources 

Added a user restriction when creating a guest.
Made sure that guests can't install profile owners that
could undo the restriction.

Bug: 17359648
Change-Id: Icdd919e8b1cbd79a69aacb76e573ec3449f18e4c
parent b10e39e7

core/java/android/os/UserManager.java

+1 −0
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ public class UserManager { 
            try {

                Bundle guestRestrictions = mService.getDefaultGuestRestrictions();

                guestRestrictions.putBoolean(DISALLOW_SMS, true);

                guestRestrictions.putBoolean(DISALLOW_INSTALL_UNKNOWN_SOURCES, true);

                mService.setUserRestrictions(guestRestrictions, guest.id);

            } catch (RemoteException re) {

                Log.w(TAG, "Could not update guest restrictions");

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+5 −1
Original line number Diff line number Diff line
@@ -3654,11 +3654,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USERS, null);



        if (mUserManager.getUserInfo(userHandle) == null) {

        UserInfo info = mUserManager.getUserInfo(userHandle);

        if (info == null) {

            // User doesn't exist.

            throw new IllegalArgumentException(

                    "Attempted to set profile owner for invalid userId: " + userHandle);

        }

        if (info.isGuest()) {

            throw new IllegalStateException("Cannot set a profile owner on a guest");

        }



        if (who == null

                || !DeviceOwner.isInstalledForUser(who.getPackageName(), userHandle)) {