commit f134f0a0726e8b89f1a14af2b7b25c98f7c0acbe
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 21 02:59:16 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 21 02:59:20 2017 +0000
tree e549526cd8715a497b0f0ed1e6abc8d1d61bdbd3
parent b9d2f3a35a5589aa8cdc8838638c582b0fa5dd08
parent 075cd83383938a101c359850bc78a4dbc88d1a6e

Merge changes I8bfabcb1,I563a6a31

* changes:
  Connectivity metrics: change how interface names are logged
  Connectivity metrics: serialize networkId, transports, ifname

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