commit 786525e8ea49c32b54eda5c260e125f5f2cf80e7
author Robert Greenwalt <rgreenwalt@google.com> Fri Feb 22 23:51:52 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 22 23:51:53 2013 +0000
tree fbffa395f3e1213455657cda94a4de84e919516a
parent 69a8dbbd67f8b08c62a1847d5eb0fae981ac2880
parent e436e4f8a48a6bc3094c036166cca3911a540321

Merge "Remove two new permission checks"

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 7abd530..5e4855b 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2999,7 +2999,10 @@
     }
 
     public ProxyProperties getProxy() {
-        enforceAccessPermission();
+        // this information is already available as a world read/writable jvm property
+        // so this API change wouldn't have a benifit.  It also breaks the passing
+        // of proxy info to all the JVMs.
+        // enforceAccessPermission();
         synchronized (mDefaultProxyLock) {
             return mDefaultProxyDisabled ? null : mDefaultProxy;
         }
@@ -3051,7 +3054,10 @@
     }
 
     public ProxyProperties getGlobalProxy() {
-        enforceAccessPermission();
+        // this information is already available as a world read/writable jvm property
+        // so this API change wouldn't have a benifit.  It also breaks the passing
+        // of proxy info to all the JVMs.
+        // enforceAccessPermission();
         synchronized (mGlobalProxyLock) {
             return mGlobalProxy;
         }