Partial revert "Settings : Add per app internet/data control"

This reverts commit a3549a2715e47ce07297315586ea9c5798da2997

Revert changes only to:
src/com/android/settings/privacyguard/PrivacyGuardManager.java
src/com/android/settings/privacyguard/AppInfoLoader.java

We currently have inconsistent behaviour where:

*) if pg is on by default, a newly installed app will not
   have restricted network access

*) if the pg state for an app is toggled off/on it will end
   up with restricted network access

Newly installed apps where pg is on should result in the
same end state compared to flipping pg guard off/on per app.

This partial revert stops the data control setting changing
when pg state is changed on a specific app.

Change-Id: I1eba14204abe0d137ebd45c5a6a3b7db354339bb

2 files changed, 0 insertions, 23 deletions

diff --git a/src/com/android/settings/privacyguard/AppInfoLoader.java b/src/com/android/settings/privacyguard/AppInfoLoader.java
index 520bd20..6efd7a5 100644
--- a/src/com/android/settings/privacyguard/AppInfoLoader.java
+++ b/src/com/android/settings/privacyguard/AppInfoLoader.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.privacyguard;
 
-import android.Manifest;
 import android.app.AppOpsManager;
 import android.content.AsyncTaskLoader;
 import android.content.Context;
@@ -105,8 +104,6 @@ import java.util.List;
             app.uid = info.applicationInfo.uid;
             app.privacyGuardEnabled = mAppOps.getPrivacyGuardSettingForPackage(
                     app.uid, app.packageName);
-            app.hasInternetPermission = mPm.checkPermission(Manifest.permission.INTERNET,
-                    app.packageName) == PackageManager.PERMISSION_GRANTED;
             apps.add(app);
         }
 
diff --git a/src/com/android/settings/privacyguard/PrivacyGuardManager.java b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
index 4cc8214..adbe8cc 100644
--- a/src/com/android/settings/privacyguard/PrivacyGuardManager.java
+++ b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
@@ -16,10 +16,7 @@
 
 package com.android.settings.privacyguard;
 
-import android.Manifest;
 import android.app.FragmentTransaction;
-import android.content.pm.PackageManager;
-import android.net.NetworkPolicyManager;
 import android.view.animation.AnimationUtils;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -90,7 +87,6 @@ public class PrivacyGuardManager extends Fragment
 
     // Privacy Guard Fragment
     private final static String PRIVACY_GUARD_FRAGMENT_TAG = "privacy_guard_fragment";
-    private NetworkPolicyManager mPolicyManager;
 
     // holder for package data passed into the adapter
     public static final class AppInfo {
@@ -99,13 +95,6 @@ public class PrivacyGuardManager extends Fragment
         boolean enabled;
         boolean privacyGuardEnabled;
         int uid;
-        boolean hasInternetPermission;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mPolicyManager = NetworkPolicyManager.from(getActivity());
     }
 
     @Override
@@ -291,15 +280,6 @@ public class PrivacyGuardManager extends Fragment
         app.privacyGuardEnabled = !app.privacyGuardEnabled;
         mAppOps.setPrivacyGuardSettingForPackage(app.uid, app.packageName, app.privacyGuardEnabled);
 
-        if (app.hasInternetPermission) {
-            if (app.privacyGuardEnabled) {
-                mPolicyManager.addUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_DATA);
-                mPolicyManager.addUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_WLAN);
-            } else {
-                mPolicyManager.removeUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_DATA);
-                mPolicyManager.removeUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_WLAN);
-            }
-        }
         mAdapter.notifyDataSetChanged();
     }