commit b9d2f3a35a5589aa8cdc8838638c582b0fa5dd08
author Jeremy Klein <jlklein@google.com> Tue Mar 21 00:10:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 21 00:10:46 2017 +0000
tree f38e7c36f3f2d8aa9cc8d36f5702658fe52462f0
parent 2dbe719d4f5c7ea894d91e7a1b3654f5fe53d26e
parent 29ac9a546c4082323512d8bc6c33fc796a496e4f

Merge "In isTetheringSupported, call isAdmin user from system." am: 4a8953094f am: 29ac9a546c
am: 0b8756e735

Change-Id: I76d02e97382c0332e3d93383d60e8e7fc9951a08

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index a4f9f21..d02b726 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3085,7 +3085,17 @@
         boolean tetherEnabledInSettings = (Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.TETHER_SUPPORTED, defaultVal) != 0)
                 && !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();
     }