1.11.9 test

roceys · Jan 12, 2014 · 16cd888 · 16cd888
1 parent 273dfe7
commit 16cd888
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 28 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="biz.bokhorst.xprivacy"
-    android:versionCode="229"
-    android:versionName="1.11.8" >
+    android:versionCode="230"
+    android:versionName="1.11.9" >
 
     <uses-sdk
         android:minSdkVersion="15"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,19 +16,23 @@ Test and beta releases will have experimental functions enabled by default.
 
 **Next release**
 
+[Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
+
+**Version 1.11.9 TEST**
+
 * Fixed usage data with a dot in the name
 * Added an easter egg (don't ask)
 * Added cell location restrictions within the phone process
 * Added phone/network type restrictions with the phone process
-* Added phone property restrictions
-* Added phone registry restrictions
-* Added phone sub info restrictions
+* Added phone property restrictions (static phone info)
+* Added phone registry restrictions (phone state listener)
+* Added phone sub info restrictions (volatile phone info)
 * Write warnings and errors to a new private log file
 * Suppressing com.google.android.gms.* method errors
 * Increase retry count for reading settings files
 * Updated Tagalog translation
 
-[Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
+Replacing the location and phone restrictions is ready for testing now.
 
 **Version 1.11.8 BETA**
 

diff --git a/assets/meta.xml b/assets/meta.xml
@@ -97,7 +97,6 @@
 	<Hook restriction="location" method="Srv.getCellLocation" permissions="ACCESS_COARSE_LOCATION,ACCESS_FINE_LOCATION" sdk="10" />
 	<Hook restriction="location" method="Srv.getNeighboringCellInfo" permissions="ACCESS_COARSE_UPDATES,ACCESS_FINE_LOCATION" sdk="10" />
 
-	<Hook restriction="location" method="listen" permissions="READ_PHONE_STATE,ACCESS_COARSE_LOCATION" sdk="10" />
 	<Hook restriction="location" method="Srv.listen" permissions="READ_PHONE_STATE,ACCESS_COARSE_LOCATION" sdk="10" />
 
 	<Hook restriction="media" method="startRecording" permissions="RECORD_AUDIO" sdk="10" />
@@ -145,27 +144,6 @@
 	<Hook restriction="overlay" method="removeView" permissions="SYSTEM_ALERT_WINDOW" sdk="1" />
 	<Hook restriction="overlay" method="updateViewLayout" permissions="SYSTEM_ALERT_WINDOW" sdk="1" />
 
-	<Hook restriction="phone" method="getDeviceId" permissions="READ_PHONE_STATE" sdk="10" />
-	<Hook restriction="phone" method="getGroupIdLevel1" permissions="READ_PHONE_STATE" sdk="18" />
-	<Hook restriction="phone" method="getIsimDomain" permissions="READ_PRIVILEGED_PHONE_STATE" sdk="14" />
-	<Hook restriction="phone" method="getIsimImpi" permissions="READ_PRIVILEGED_PHONE_STATE" sdk="14" />
-	<Hook restriction="phone" method="getIsimImpu" permissions="READ_PRIVILEGED_PHONE_STATE" sdk="14" />
-	<Hook restriction="phone" method="getLine1AlphaTag" permissions="READ_PHONE_STATE" sdk="10" />
-	<Hook restriction="phone" method="getLine1Number" permissions="READ_PHONE_STATE" sdk="10" />
-	<Hook restriction="phone" method="getMsisdn" permissions="READ_PHONE_STATE" sdk="14" />
-	<Hook restriction="phone" method="getSimSerialNumber" permissions="READ_PHONE_STATE" sdk="10" />
-	<Hook restriction="phone" method="getSubscriberId" permissions="READ_PHONE_STATE" sdk="10" />
-	<Hook restriction="phone" method="getVoiceMailAlphaTag" permissions="READ_PHONE_STATE" sdk="10" />
-	<Hook restriction="phone" method="getVoiceMailNumber" permissions="READ_PHONE_STATE" sdk="10" />
-	<Hook restriction="phone" method="listen" permissions="READ_PHONE_STATE,ACCESS_COARSE_LOCATION" sdk="10" />
-	<Hook restriction="phone" method="getNetworkCountryIso" permissions="" sdk="10" />
-	<Hook restriction="phone" method="getNetworkOperator" permissions="" sdk="10" />
-	<Hook restriction="phone" method="getNetworkOperatorName" permissions="" sdk="10" />
-	<Hook restriction="phone" method="getNetworkType" permissions="" sdk="10" />
-	<Hook restriction="phone" method="getPhoneType" permissions="" sdk="10" />
-	<Hook restriction="phone" method="getSimCountryIso" permissions="" sdk="10" />
-	<Hook restriction="phone" method="getSimOperator" permissions="" sdk="10" />
-	<Hook restriction="phone" method="getSimOperatorName" permissions="" sdk="10" />
 	<Hook restriction="phone" method="android.intent.action.NEW_OUTGOING_CALL" permissions="PROCESS_OUTGOING_CALLS" sdk="10" />
 	<Hook restriction="phone" method="android.intent.action.PHONE_STATE" permissions="READ_PHONE_STATE" sdk="10" />
 	<Hook restriction="phone" method="TelephonyProvider" permissions="WRITE_APN_SETTINGS" sdk="10" />

diff --git a/src/biz/bokhorst/xprivacy/XPrivacy.java b/src/biz/bokhorst/xprivacy/XPrivacy.java
@@ -151,6 +151,7 @@ public void handleLoadPackage(final LoadPackageParam lpparam) throws Throwable {
 
 		// Phone interface manager
 		if ("com.android.phone".equals(lpparam.packageName)) {
+			Util.log(null, Log.WARN, "Hooking " + lpparam.packageName);
 			hookAll(XPhoneInterfaceManager.getInstances(), lpparam.classLoader);
 			hookAll(XPhoneSubInfo.getInstances(), lpparam.classLoader);
 		}