summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChalard Jean <jchalard@google.com>2019-03-09 06:10:26 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-03-09 06:10:26 -0800
commit44080ef894250a4922ee9ea6ee70f63ecf31830c (patch)
tree31b8c2450622fe7486c0a06a1c65141a3b688978 /src
parent47bb7e88b6de02817c10757aa473cfe85ee21fd2 (diff)
parentdf416df062b2fb65c1186f3115171da65fc8cb7f (diff)
Merge "Give Telephony the permissions to access the network stack." am: a6f3476476 am: 1dba2f82ad
am: 5a390b36ae Change-Id: I00135c13777f08ae155381ae6365e2edc76b1c1d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/server/util/PermissionUtil.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/server/util/PermissionUtil.java b/src/com/android/server/util/PermissionUtil.java
index f6eb900..6fbeead 100644
--- a/src/com/android/server/util/PermissionUtil.java
+++ b/src/com/android/server/util/PermissionUtil.java
@@ -33,7 +33,9 @@ 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 && UserHandle.getAppId(caller) != Process.BLUETOOTH_UID) {
+ if (caller != Process.SYSTEM_UID
+ && UserHandle.getAppId(caller) != Process.BLUETOOTH_UID
+ && UserHandle.getAppId(caller) != Process.PHONE_UID) {
throw new SecurityException("Invalid caller: " + caller);
}
}