Revert "framework: Privacy Guard"

Change-Id: I82ab85092e54c577a0817f3bedc85063c9a3054a

core/java/android/app/ActivityManagerNative.java

@@ -1888,15 +1888,6 @@ public boolean onTransact(int code, Parcel data, Parcel reply, int flags)
             return true;
         }
 
-        case IS_PRIVACY_GUARD_ENABLED_TRANSACTION: {
-            data.enforceInterface(IActivityManager.descriptor);
-            int pid = data.readInt();
-            boolean res = isPrivacyGuardEnabledForProcess(pid);
-            reply.writeNoException();
-            reply.writeInt(res ? 1 : 0);
-            return true;
-        }
-
         }
 
         return super.onTransact(code, data, reply, flags);
@@ -4322,18 +4313,5 @@ public void hang(IBinder who, boolean allowRestart) throws RemoteException {
         reply.recycle();
     }
 
-    public boolean isPrivacyGuardEnabledForProcess(int pid) throws RemoteException {
-        Parcel data = Parcel.obtain();
-        Parcel reply = Parcel.obtain();
-        data.writeInterfaceToken(IActivityManager.descriptor);
-        data.writeInt(pid);
-        mRemote.transact(IS_PRIVACY_GUARD_ENABLED_TRANSACTION, data, reply, 0);
-        reply.readException();
-        int res = reply.readInt();
-        data.recycle();
-        reply.recycle();
-        return res == 1;
-    }
-
     private IBinder mRemote;
 }

core/java/android/app/ApplicationPackageManager.java

@@ -48,7 +48,6 @@
 import android.content.res.XmlResourceParser;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Binder;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
@@ -1310,25 +1309,6 @@ public int getApplicationEnabledSetting(String packageName) {
         return PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
     }
 
-    @Override
-    public void setPrivacyGuardSetting(String packageName, boolean enabled) {
-        try {
-            mPM.setPrivacyGuardSetting(packageName, enabled, mContext.getUserId());
-        } catch (RemoteException e) {
-            // Should never happen!
-        }
-    }
-
-    @Override
-    public boolean getPrivacyGuardSetting(String packageName) {
-        try {
-            return mPM.getPrivacyGuardSetting(packageName, mContext.getUserId());
-        } catch (RemoteException e) {
-            // Should never happen!
-        }
-        return false;
-    }
-
     /**
      * @hide
      */

core/java/android/app/ContextImpl.java

@@ -1592,16 +1592,6 @@ private WallpaperManager getWallpaperManager() {
         return new DropBoxManager(service);
     }
 
-    @Override
-    public boolean isPrivacyGuardEnabled() {
-        try {
-            return ActivityManagerNative.getDefault().isPrivacyGuardEnabledForProcess(Binder.getCallingPid());
-        } catch (RemoteException e) {
-            Log.e(TAG, e.getMessage(), e);
-        }
-        return false;
-    }
-
     @Override
     public int checkPermission(String permission, int pid, int uid) {
         if (permission == null) {

core/java/android/app/IActivityManager.java

@@ -191,9 +191,7 @@ public int handleIncomingUser(int callingPid, int callingUid, int userId, boolea
 
     public void setProcessForeground(IBinder token, int pid,
             boolean isForeground) throws RemoteException;
-
-    public boolean isPrivacyGuardEnabledForProcess(int pid) throws RemoteException;
-
+
     public int checkPermission(String permission, int pid, int uid)
             throws RemoteException;
 
@@ -644,6 +642,5 @@ private WaitResult(Parcel source) {
     int KILL_UID_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+164;
     int SET_USER_IS_MONKEY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+165;
     int HANG_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+166;
-    int IS_PRIVACY_GUARD_ENABLED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+167;
     int GET_CALLING_PACKAGE_FOR_BROADCAST_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+168;
 }

core/java/android/content/Context.java

@@ -2311,16 +2311,6 @@ public abstract boolean startInstrumentation(ComponentName className,
      */
     public static final String APP_OPS_SERVICE = "appops";
 
-    /**
-     * Determine whether the application or calling application has
-     * privacy guard. This is a privacy feature intended to permit the user
-     * to control access to personal data. Applications and content providers
-     * can check this value if they wish to honor privacy guard.
-     *
-     * @hide
-     */
-    public abstract boolean isPrivacyGuardEnabled();
-
     /**
      * Determine whether the given permission is allowed for a particular
      * process and user ID running in the system.

core/java/android/content/ContextWrapper.java

@@ -519,12 +519,6 @@ public Object getSystemService(String name) {
         return mBase.getSystemService(name);
     }
 
-    /** @hide */
-    @Override
-    public boolean isPrivacyGuardEnabled() {
-        return mBase.isPrivacyGuardEnabled();
-    }
-
     @Override
     public int checkPermission(String permission, int pid, int uid) {
         return mBase.checkPermission(permission, pid, uid);

core/java/android/content/pm/IPackageManager.aidl

@@ -225,11 +225,7 @@ interface IPackageManager {
 
     int getPreferredActivities(out List<IntentFilter> outFilters,
             out List<ComponentName> outActivities, String packageName);
-
-    boolean getPrivacyGuardSetting(in String packageName, int userId);
-
-    void setPrivacyGuardSetting(in String packageName, boolean enabled, int userId);
-
+
     /**
      * As per {@link android.content.pm.PackageManager#setComponentEnabledSetting}.
      */

core/java/android/content/pm/PackageManager.java

@@ -3118,22 +3118,6 @@ public abstract void setApplicationEnabledSetting(String packageName,
      */
     public abstract int getApplicationEnabledSetting(String packageName);
 
-    /**
-     * @param packageName
-     * @return
-     *
-     * @hide
-     */
-    public abstract boolean getPrivacyGuardSetting(String packageName);
-
-    /**
-     * @param packageName
-     * @param enabled
-     *
-     * @hide
-     */
-    public abstract void setPrivacyGuardSetting(String packageName, boolean enabled);
-
     /**
      * Return whether the device has been booted into safe mode.
      */

core/java/android/content/pm/PackageUserState.java

@@ -29,7 +29,6 @@ public class PackageUserState {
     public boolean notLaunched;
     public boolean installed;
     public int enabled;
-    public boolean privacyGuard;
 
     public String lastDisableAppCaller;
 
@@ -39,15 +38,13 @@ public class PackageUserState {
     public PackageUserState() {
         installed = true;
         enabled = COMPONENT_ENABLED_STATE_DEFAULT;
-        privacyGuard = false;
     }
 
     public PackageUserState(PackageUserState o) {
         installed = o.installed;
         stopped = o.stopped;
         notLaunched = o.notLaunched;
         enabled = o.enabled;
-        privacyGuard = o.privacyGuard;
         lastDisableAppCaller = o.lastDisableAppCaller;
         disabledComponents = o.disabledComponents != null
                 ? new HashSet<String>(o.disabledComponents) : null;

core/java/android/provider/Settings.java

@@ -18,7 +18,6 @@
 
 import android.annotation.SdkConstant;
 import android.annotation.SdkConstant.SdkConstantType;
-import android.app.ActivityManagerNative;
 import android.app.SearchManager;
 import android.app.WallpaperManager;
 import android.content.ComponentName;
@@ -38,7 +37,6 @@
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.BatteryManager;
-import android.os.Binder;
 import android.os.Bundle;
 import android.os.DropBoxManager;
 import android.os.IBinder;
@@ -5189,12 +5187,6 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
          */
         public static final String ADVANCED_REBOOT = "advanced_reboot";
 
-        /**
-         * Whether newly installed apps should run with privacy guard by default
-         * @hide
-         */
-        public static final String PRIVACY_GUARD_DEFAULT = "privacy_guard_default";
-
         /**
          * This are the settings to be backed up.
          *
@@ -5242,8 +5234,7 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
             DIALPAD_AUTOCOMPLETE,
             LOCK_SCREEN_OWNER_INFO,
             LOCK_SCREEN_OWNER_INFO_ENABLED,
-            ADVANCED_REBOOT,
-            PRIVACY_GUARD_DEFAULT
+            ADVANCED_REBOOT
         };
 
         /**
@@ -5265,13 +5256,6 @@ public static final boolean isLocationProviderEnabled(ContentResolver cr, String
          * @hide
          */
         public static final boolean isLocationProviderEnabledForUser(ContentResolver cr, String provider, int userId) {
-            try {
-                if (ActivityManagerNative.getDefault().isPrivacyGuardEnabledForProcess(Binder.getCallingPid())) {
-                    return false;
-                }
-            } catch (RemoteException e) {
-                // ignore
-            }
             String allowedProviders = Settings.Secure.getStringForUser(cr,
                     LOCATION_PROVIDERS_ALLOWED, userId);
             return TextUtils.delimitedStringContains(allowedProviders, ',', provider);

core/res/AndroidManifest.xml

@@ -1925,12 +1925,6 @@
         android:description="@string/permdesc_movePackage"
         android:protectionLevel="signature|system" />
 
-    <!-- @hide Allows an application to change privacy guard state -->
-    <permission android:name="android.permission.CHANGE_PRIVACY_GUARD_STATE"
-        android:label="@string/permlab_changePrivacyGuardState"
-        android:description="@string/permdesc_changePrivacyGuardState"
-        android:protectionLevel="signature" />
-
     <!-- Allows an application to change whether an application component (other than its own) is
          enabled or not.
          <p>Not for use by third-party applications. -->

core/res/res/values/cm_strings.xml

@@ -165,12 +165,6 @@
     <string name="symbol_picker_lt">\u2264\u00ab\u2039</string>
     <string name="symbol_picker_gt">\u2265\u00bb\u203a</string>
 
-    <!-- Privacy Guard -->
-    <string name="permlab_changePrivacyGuardState">enable or disable privacy guard</string>
-    <string name="permdesc_changePrivacyGuardState">Allows the app to change whether another app runs with Privacy Guard. When an app is running with Privacy Guard, it will not have access to personal data such as contacts, call logs, or messages.</string>
-    <string name="privacy_guard_notification">Privacy Guard active</string>
-    <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> will not be able to access personal data</string>
-
     <!-- The title of the profile picker dialog. -->
     <string name="profile_picker_title">Profiles</string>
 

core/res/res/values/symbols.xml

@@ -2037,15 +2037,9 @@
   <!-- Electron Beam -->
   <java-symbol type="bool" name="config_screenOffAnimation" />
 
-  <!-- Privacy Guard -->
-  <java-symbol type="string" name="privacy_guard_notification" />
-  <java-symbol type="string" name="privacy_guard_notification_detail" />
-  <java-symbol type="drawable" name="stat_notify_privacy_guard" />
-
   <!-- Irda Service -->
   <java-symbol type="bool" name="config_enableIrdaManagerService" />
 
   <!-- Package Manager -->
   <java-symbol type="array" name="config_disabledComponents" />
-
 </resources>

services/java/com/android/server/LocationManagerService.java

@@ -732,6 +732,7 @@ private void removeProviderLocked(LocationProviderInterface provider) {
         mProvidersByName.remove(provider.getName());
     }
 
+
     /**
      * Returns "true" if access to the specified location provider is allowed by the current
      * user's settings. Access to all location providers is forbidden to non-location-provider
@@ -947,7 +948,7 @@ public List<String> getAllProviders() {
     public List<String> getProviders(Criteria criteria, boolean enabledOnly) {
         int allowedResolutionLevel = getCallerAllowedResolutionLevel();
         ArrayList<String> out;
-        int uid = Binder.getCallingUid();;
+        int uid = Binder.getCallingUid();
         long identity = Binder.clearCallingIdentity();
         try {
             synchronized (mLock) {