summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-10-26 19:26:28 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-10-26 19:26:28 +0000
commit37da4868f5596301f390c675b87ea4ce53dc852f (patch)
treeafd41f9a589e3f189d900c5ee9631523232412d3
parent08fc60206ee0266509cdb8a5158b2ea732027ce1 (diff)
parent115a5b2850e435512b6911a0cb79913341e41657 (diff)
Merge "Don't notify isolated processes about proxy updates."
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index a513e140ba2b..0cb120b00c65 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -2033,7 +2033,9 @@ public class ActivityManagerService extends IActivityManager.Stub
synchronized (ActivityManagerService.this) {
for (int i = mLruProcesses.size() - 1 ; i >= 0 ; i--) {
ProcessRecord r = mLruProcesses.get(i);
- if (r.thread != null) {
+ // Don't dispatch to isolated processes as they can't access
+ // ConnectivityManager and don't have network privileges anyway.
+ if (r.thread != null && !r.isolated) {
try {
r.thread.setHttpProxy(host, port, exclList, pacFileUrl);
} catch (RemoteException ex) {