commit 04025b437817632c0ce48332e9bbf0ee9ae7dcd1
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 21 04:22:34 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 21 04:22:40 2017 +0000
tree d103064549d7b85200b9fdfb7f7174c8638923ce
parent f134f0a0726e8b89f1a14af2b7b25c98f7c0acbe
parent 7f818778a8f4a194e0a29d402c7034b5bd1aa7b5

Merge "Connectivity metrics: add transports to validation probes"

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();
     }