summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Remi NGUYEN VAN <reminv@google.com> 2019-01-10 20:15:54 -0800
committer android-build-merger <android-build-merger@google.com> 2019-01-10 20:15:54 -0800
commitfc9a19cb135a2ace7510704ca741a23b6c72ef4b (patch)
treec272802ef4e2414b0bc49a818532280486c59903
parentc70dc011f22087083ea273b0f010078c240a0c39 (diff)
parent0ece6999d1a2b007716cf42f9ae145bef28b7171 (diff)
Merge "Allow NetworkStack to send protected broadcasts"
am: 0ece6999d1 Change-Id: I4bb08126862952bb4ba7099da1cf0db3409f6874
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 031e623f24cb..7df3f4efd876 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -75,6 +75,7 @@ import static android.os.Process.BLUETOOTH_UID;
import static android.os.Process.FIRST_APPLICATION_UID;
import static android.os.Process.FIRST_ISOLATED_UID;
import static android.os.Process.LAST_ISOLATED_UID;
+import static android.os.Process.NETWORK_STACK_UID;
import static android.os.Process.NFC_UID;
import static android.os.Process.PHONE_UID;
import static android.os.Process.PROC_CHAR;
@@ -21202,6 +21203,7 @@ public class ActivityManagerService extends IActivityManager.Stub
case BLUETOOTH_UID:
case NFC_UID:
case SE_UID:
+ case NETWORK_STACK_UID:
isCallerSystem = true;
break;
default: