Remove app location restrictions

These restrictions are replaced by Android location restrictions
Zhanghongtao · Jan 10, 2014 · 339e26c · 339e26c
1 parent 36a3e0d
commit 339e26c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 225 deletions.
diff --git a/assets/meta.xml b/assets/meta.xml
@@ -71,17 +71,6 @@
     <Hook restriction="internet" method="isConnectedOrConnecting" sdk="14" />
     <Hook restriction="internet" method="getConnectionInfo" sdk="14" />
 
-    <Hook restriction="location" method="addNmeaListener" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />
-    <Hook restriction="location" method="addProximityAlert" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />
-    <Hook restriction="location" method="getLastKnownLocation" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />
-    <Hook restriction="location" method="getProviders" dangerous="true" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />
-    <Hook restriction="location" method="isProviderEnabled" dangerous="true" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />
-    <Hook restriction="location" method="removeUpdates" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />
-    <Hook restriction="location" method="requestLocationUpdates" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />
-    <Hook restriction="location" method="requestSingleUpdate" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />
-    <Hook restriction="location" method="sendExtraCommand" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />
-    <Hook restriction="location" method="addGeofence" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="17" />
-    <Hook restriction="location" method="getLastLocation" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="17" />
     <Hook restriction="location" method="disableLocationUpdates" permissions="CONTROL_LOCATION_UPDATES" sdk="14" />
     <Hook restriction="location" method="enableLocationUpdates" permissions="CONTROL_LOCATION_UPDATES" sdk="14" />
     <Hook restriction="location" method="getCellLocation" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="14" />

diff --git a/src/biz/bokhorst/xprivacy/XLocationManager.java b/src/biz/bokhorst/xprivacy/XLocationManager.java
diff --git a/src/biz/bokhorst/xprivacy/XPrivacy.java b/src/biz/bokhorst/xprivacy/XPrivacy.java
@@ -76,8 +76,7 @@ public void initZygote(StartupParam startupParam) throws Throwable {
 		hookAll(XIoBridge.getInstances());
 
 		// Location manager service
-		if (PrivacyManager.cTestVersion)
-			hookAll(XLocationManagerService.getInstances());
+		hookAll(XLocationManagerService.getInstances());
 
 		// Media recorder
 		hookAll(XMediaRecorder.getInstances());
@@ -172,7 +171,6 @@ public void handleLoadPackage(final LoadPackageParam lpparam) throws Throwable {
 	private static boolean mBluetoothAdapterHooked = false;
 	private static boolean mClipboardManagerHooked = false;
 	private static boolean mConnectivityManagerHooked = false;
-	private static boolean mLocationManagerHooked = false;
 	private static boolean mSensorManagerHooked = false;
 	private static boolean mTelephonyManagerHooked = false;
 	private static boolean mWindowManagerHooked = false;
@@ -212,13 +210,6 @@ public static void handleGetSystemService(XHook hook, String name, Object instan
 				hookAll(XConnectivityManager.getInstances(instance));
 				mConnectivityManagerHooked = true;
 			}
-		} else if (name.equals(Context.LOCATION_SERVICE)) {
-			// Location manager
-			if (!PrivacyManager.cTestVersion)
-				if (!mLocationManagerHooked) {
-					hookAll(XLocationManager.getInstances(instance));
-					mLocationManagerHooked = true;
-				}
 		} else if (name.equals(Context.SENSOR_SERVICE)) {
 			// Sensor manager
 			if (!mSensorManagerHooked) {