Merge "Fix bluetooth tethering on multi-user" am: 4bb4c1a792 am: 1a0ac241e8 (9bebf767) · Commits · e / os / android_packages_modules_NetworkStack

src/com/android/server/util/PermissionUtil.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.server.util;
		import static android.os.Binder.getCallingUid;

		import android.os.Process;
		import android.os.UserHandle;

		/**
		* Utility class to check calling permissions on the network stack.
		@@ -32,7 +33,7 @@ public final class PermissionUtil {
		public static void checkNetworkStackCallingPermission() {
		// TODO: check that the calling PID is the system server.
		final int caller = getCallingUid();
		if (caller != Process.SYSTEM_UID && caller != Process.BLUETOOTH_UID) {
		if (caller != Process.SYSTEM_UID && UserHandle.getAppId(caller) != Process.BLUETOOTH_UID) {
		throw new SecurityException("Invalid caller: " + caller);
		}
		}