Merge "Privacy Guard : Reimplement backed by AppOps" into cm-10.2 (97dee3d9) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.app;

		import android.Manifest;

		import com.android.internal.app.IAppOpsService;
		import com.android.internal.app.IAppOpsCallback;

		@@ -538,4 +539,20 @@ public class AppOpsManager {
		public void finishOp(int op) {
		finishOp(op, Process.myUid(), mContext.getBasePackageName());
		}

		public boolean getPrivacyGuardSettingForPackage(int uid, String packageName) {
		try {
		return mService.getPrivacyGuardSettingForPackage(uid, packageName);
		} catch (RemoteException e) {
		}
		return false;
		}

		public void setPrivacyGuardSettingForPackage(int uid, String packageName,
		boolean state) {
		try {
		mService.setPrivacyGuardSettingForPackage(uid, packageName, state);
		} catch (RemoteException e) {
		}
		}
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -5188,6 +5188,12 @@ public final class Settings {
		*/
		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.
		*
		@@ -5235,7 +5241,8 @@ public final class Settings {
		DIALPAD_AUTOCOMPLETE,
		LOCK_SCREEN_OWNER_INFO,
		LOCK_SCREEN_OWNER_INFO_ENABLED,
		ADVANCED_REBOOT
		ADVANCED_REBOOT,
		PRIVACY_GUARD_DEFAULT
		};

		/**

+4 −0

Original line number	Diff line number	Diff line
		@@ -34,4 +34,8 @@ interface IAppOpsService {
		List<AppOpsManager.PackageOps> getOpsForPackage(int uid, String packageName, in int[] ops);
		void setMode(int code, int uid, String packageName, int mode);
		void resetAllModes();

		// Privacy guard methods
		boolean getPrivacyGuardSettingForPackage(int uid, String packageName);
		void setPrivacyGuardSettingForPackage(int uid, String packageName, boolean state);
		}

0 → 100644

+1.27 KiB

Loading image diff...

0 → 100644

+1.16 KiB

Loading image diff...