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

Commit 4d5f0cf9 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r43' into HEAD 

Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)

Change-Id: I5620fc9e444f5b0997ca9c70100f685c1699bfe8
parents adbe5616 12332e05

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

+12 −0
Original line number Diff line number Diff line
@@ -262,6 +262,17 @@ public class UserManagerService extends IUserManager.Stub { 
                Log.w(LOG_TAG, "Unable to notify AppOpsService of UserRestrictions");

            }

        }

        UserInfo currentGuestUser = null;

        synchronized (mPackagesLock) {

            currentGuestUser = findCurrentGuestUserLocked();

        }

        if (currentGuestUser != null && !hasUserRestriction(

                UserManager.DISALLOW_CONFIG_WIFI, currentGuestUser.id)) {

            // If a guest user currently exists, apply the DISALLOW_CONFIG_WIFI option

            // to it, in case this guest was created in a previous version where this

            // user restriction was not a default guest restriction.

            setUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, true, currentGuestUser.id);

        }

    }



    @Override
@@ -509,6 +520,7 @@ public class UserManagerService extends IUserManager.Stub { 
        if (mGuestRestrictions.isEmpty()) {

            mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true);

            mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true);

            mGuestRestrictions.putBoolean(UserManager.DISALLOW_CONFIG_WIFI, true);

        }

    }