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

Commit 5ad4a9a3 authored by Jeremy Klein's avatar Jeremy Klein Committed by android-build-merger
Browse files

Merge "In isTetheringSupported, call isAdmin user from system." am: 4a895309 am: 23d6ba12 

am: 0b8756e7

Change-Id: I76d02e97382c0332e3d93383d60e8e7fc9951a08
parents 8ab4f6ea 0b8756e7

services/core/java/com/android/server/ConnectivityService.java

+11 −1
Original line number Original line Diff line number Diff line
@@ -3085,7 +3085,17 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        boolean tetherEnabledInSettings = (Settings.Global.getInt(mContext.getContentResolver(),

        boolean tetherEnabledInSettings = (Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.TETHER_SUPPORTED, defaultVal) != 0)

                Settings.Global.TETHER_SUPPORTED, defaultVal) != 0)

                && !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING);

                && !mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING);

        return tetherEnabledInSettings && mUserManager.isAdminUser() &&



        // Elevate to system UID to avoid caller requiring MANAGE_USERS permission.

        boolean adminUser = false;

        final long token = Binder.clearCallingIdentity();

        try {

            adminUser = mUserManager.isAdminUser();

        } finally {

            Binder.restoreCallingIdentity(token);

        }



        return tetherEnabledInSettings && adminUser &&

               mTethering.hasTetherableConfiguration();

               mTethering.hasTetherableConfiguration();

    }

    }