Open willrod112 opened 10 years ago
hi,
what is aospa? im maintaining the patches for CM11.
On 08/14/2014 03:59 PM, willrod112 wrote:
I manually edited TelephonyRegistry.java to included the changes, but I'm getting this after compiling
frameworks/base/services/java/com/android/server/SystemServer.java:289: cannot find symbol symbol : method addPrivacyService(android.content.Context) location: class com.android.server.ServerThread addPrivacyService(context); ^ Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. Note: Some input files use unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. 1 error
=== apply: openpdroid_4.4-cm_build.patch ==== Switched to a new branch 'openpdroid' patching file core/pathmap.mk Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 86 (offset -5 lines). patching file target/product/core_minimal.mk
=== apply: openpdroid_4.4-cm_libcore.patch ==== Switched to a new branch 'openpdroid' patching file luni/src/main/java/java/lang/PrivacyInputStream.java patching file luni/src/main/java/java/lang/PrivacyProcessManager.java patching file luni/src/main/java/java/lang/ProcessManager.java
=== apply: openpdroid_4.4-cm_frameworks_base.patch ==== Switched to a new branch 'openpdroid' patching file Android.mk Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 267 with fuzz 1 (offset -15 lines). Hunk #3 https://github.com/Lanchon/OpenPDroid-patches/issues/3 succeeded at 405 with fuzz 1 (offset -19 lines). patching file api/current.txt Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 23090 (offset -7 lines). patching file core/java/android/app/ContextImpl.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 67 (offset -3 lines). Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 123 (offset -7 lines). Hunk #6 https://github.com/OpenPDroid/OpenPDroidPatches/issues/6 succeeded at 536 with fuzz 1. Hunk #7 https://github.com/OpenPDroid/OpenPDroidPatches/issues/7 succeeded at 572 (offset -5 lines). Hunk #8 https://github.com/OpenPDroid/OpenPDroidPatches/issues/8 succeeded at 587 (offset -5 lines). Hunk #9 https://github.com/OpenPDroid/OpenPDroidPatches/issues/9 succeeded at 654 (offset -23 lines). patching file core/java/android/app/Instrumentation.java Hunk #6 https://github.com/OpenPDroid/OpenPDroidPatches/issues/6 succeeded at 1720 (offset 8 lines). Hunk #7 https://github.com/OpenPDroid/OpenPDroidPatches/issues/7 succeeded at 1806 (offset 8 lines). Hunk #8 https://github.com/OpenPDroid/OpenPDroidPatches/issues/8 succeeded at 1861 (offset 8 lines). Hunk #9 https://github.com/OpenPDroid/OpenPDroidPatches/issues/9 succeeded at 1948 (offset 8 lines). patching file core/java/android/content/ContentResolver.java patching file core/java/android/hardware/Camera.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 49 (offset 1 line). Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 198 with fuzz 2 (offset 1 line). Hunk #3 https://github.com/Lanchon/OpenPDroid-patches/issues/3 succeeded at 508 with fuzz 2 (offset -22 lines). Hunk #4 https://github.com/OpenPDroid/OpenPDroidPatches/issues/4 succeeded at 1079 (offset -22 lines). Hunk #5 https://github.com/OpenPDroid/OpenPDroidPatches/issues/5 succeeded at 1109 (offset -22 lines). Hunk #6 https://github.com/OpenPDroid/OpenPDroidPatches/issues/6 succeeded at 1139 (offset -22 lines). Hunk #7 https://github.com/OpenPDroid/OpenPDroidPatches/issues/7 succeeded at 1198 (offset -38 lines). Hunk #8 https://github.com/OpenPDroid/OpenPDroidPatches/issues/8 succeeded at 1443 (offset -44 lines). patching file core/java/android/net/NetworkInfo.java patching file core/java/android/os/SystemProperties.java patching file core/java/android/provider/Settings.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 60 (offset -1 lines). Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 3252 (offset -842 lines). Hunk #3 https://github.com/Lanchon/OpenPDroid-patches/issues/3 succeeded at 3607 (offset -842 lines). patching file core/java/android/speech/srec/MicrophoneInputStream.java patching file media/java/android/media/AudioRecord.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 24 (offset -7 lines). Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 197 (offset -7 lines). Hunk #3 https://github.com/Lanchon/OpenPDroid-patches/issues/3 succeeded at 270 (offset -7 lines). Hunk #4 https://github.com/OpenPDroid/OpenPDroidPatches/issues/4 succeeded at 675 with fuzz 2 (offset -26 lines). patching file media/java/android/media/MediaRecorder.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 23 (offset -3 lines). Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 107 (offset -3 lines). Hunk #3 https://github.com/Lanchon/OpenPDroid-patches/issues/3 succeeded at 183 (offset -3 lines). Hunk #4 https://github.com/OpenPDroid/OpenPDroidPatches/issues/4 succeeded at 218 (offset -3 lines). Hunk #5 https://github.com/OpenPDroid/OpenPDroidPatches/issues/5 succeeded at 726 (offset -23 lines). Hunk #6 https://github.com/OpenPDroid/OpenPDroidPatches/issues/6 succeeded at 767 (offset -23 lines). Hunk #7 https://github.com/OpenPDroid/OpenPDroidPatches/issues/7 succeeded at 1001 (offset -23 lines). Hunk #8 https://github.com/OpenPDroid/OpenPDroidPatches/issues/8 succeeded at 1048 (offset -23 lines). Hunk #9 https://github.com/OpenPDroid/OpenPDroidPatches/issues/9 succeeded at 1063 (offset -23 lines). Hunk #10 https://github.com/OpenPDroid/OpenPDroidPatches/issues/10 succeeded at 1082 (offset -23 lines). Hunk #11 https://github.com/OpenPDroid/OpenPDroidPatches/issues/11 succeeded at 1206 (offset -27 lines). Hunk #12 https://github.com/OpenPDroid/OpenPDroidPatches/issues/12 succeeded at 1505 (offset -27 lines). patching file preloaded-classes patching file privacy/java/android/privacy/IPrivacySettingsManager.aidl patching file privacy/java/android/privacy/PrivacyFileObserver.java patching file privacy/java/android/privacy/PrivacyPersistenceAdapter.java patching file privacy/java/android/privacy/PrivacySettings.aidl patching file privacy/java/android/privacy/PrivacySettings.java patching file privacy/java/android/privacy/PrivacySettingsManager.java patching file privacy/java/android/privacy/PrivacySettingsManagerService.java patching file privacy/java/android/privacy/PrivacySettingsStub.java patching file privacy/java/android/privacy/surrogate/PrivacyAccountManager.java patching file privacy/java/android/privacy/surrogate/PrivacyActivityManagerService.java patching file privacy/java/android/privacy/surrogate/PrivacyConnectivityManager.java patching file privacy/java/android/privacy/surrogate/PrivacyContentResolver.java patching file privacy/java/android/privacy/surrogate/PrivacyCursor.java patching file privacy/java/android/privacy/surrogate/PrivacyLocationManager.java patching file privacy/java/android/privacy/surrogate/PrivacyTelephonyManager.java patching file privacy/java/android/privacy/surrogate/PrivacyWifiManager.java patching file services/java/com/android/server/PrivacyTelephonyRegistry.java patching file services/java/com/android/server/SystemServer.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 17 (offset -2 lines). Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 225 with fuzz 1 (offset -55 lines). Hunk #3 https://github.com/Lanchon/OpenPDroid-patches/issues/3 succeeded at 284 (offset -61 lines). Hunk #4 https://github.com/OpenPDroid/OpenPDroidPatches/issues/4 succeeded at 1245 with fuzz 2 (offset -95 lines). patching file services/java/com/android/server/TelephonyRegistry.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 63 (offset -1 lines). Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 84 (offset -1 lines). Hunk #3 https://github.com/Lanchon/OpenPDroid-patches/issues/3 succeeded at 123 (offset -1 lines). Hunk #4 https://github.com/OpenPDroid/OpenPDroidPatches/issues/4 succeeded at 171 (offset -1 lines). Hunk #5 https://github.com/OpenPDroid/OpenPDroidPatches/issues/5 succeeded at 322 (offset -1 lines). Hunk #6 https://github.com/OpenPDroid/OpenPDroidPatches/issues/6 succeeded at 365 (offset -1 lines). Hunk #7 https://github.com/OpenPDroid/OpenPDroidPatches/issues/7 FAILED at 660. Hunk #8 https://github.com/OpenPDroid/OpenPDroidPatches/issues/8 succeeded at 758 (offset -21 lines). Hunk #9 https://github.com/OpenPDroid/OpenPDroidPatches/issues/9 succeeded at 772 (offset -21 lines). Hunk #10 https://github.com/OpenPDroid/OpenPDroidPatches/issues/10 succeeded at 794 (offset -21 lines). 1 out of 10 hunks FAILED -- saving rejects to file services/java/com/android/server/TelephonyRegistry.java.rej patching file services/java/com/android/server/am/BroadcastQueue.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 42 (offset -1 lines). Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 703 (offset -15 lines). Hunk #3 https://github.com/Lanchon/OpenPDroid-patches/issues/3 succeeded at 736 (offset -15 lines). Hunk #4 https://github.com/OpenPDroid/OpenPDroidPatches/issues/4 succeeded at 868 (offset -15 lines). Hunk #5 https://github.com/OpenPDroid/OpenPDroidPatches/issues/5 succeeded at 969 with fuzz 1 (offset -28 lines). patching file telephony/java/android/telephony/CellInfoGsm.java patching file telephony/java/android/telephony/PhoneStateListener.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 16 with fuzz 1 (offset -2 lines). Hunk #2 https://github.com/Lanchon/OpenPDroid-patches/issues/2 succeeded at 165 (offset -4 lines). Hunk #3 https://github.com/Lanchon/OpenPDroid-patches/issues/3 succeeded at 347 (offset -19 lines). patching file telephony/java/android/telephony/ServiceState.java Hunk #1 https://github.com/Lanchon/OpenPDroid-patches/issues/1 succeeded at 561 (offset -20 lines). patching file wifi/java/android/net/wifi/WifiInfo.java
--- services/java/com/android/server/TelephonyRegistry.java +++ services/java/com/android/server/TelephonyRegistry.java @@ -660,7 +680,11 @@ // the legacy intent broadcasting //
- private void broadcastServiceStateChanged(ServiceState state) {
- // BEGIN privacy-modified
- // made protected to allow subclassing
- // private void broadcastServiceStateChanged(ServiceState state) {
- protected void broadcastServiceStateChanged(ServiceState state) {
- // END privacy-modifiedprivate void broadcastServiceStateChanged(ServiceState state) { if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) { // Return from here as this intent will be sent anyway from MSimTelephonyRegistry return;
— Reply to this email directly or view it on GitHub https://github.com/Lanchon/OpenPDroid-patches/issues/3.
Hi, I was trying it with ParanoidAndroid https://github.com/AOSPA/manifest
btw I built it cm11 with your Openpdroid for nexus 7 works great
fyi, im maintaining a CM11 build for grouper on xda.
my patches are for CM11.
try mateors github, see if they apply. i guess you can use my scripts with his repo. On Aug 14, 2014 5:20 PM, "willrod112" notifications@github.com wrote:
Hi, I was trying it with ParanoidAndroid https://github.com/AOSPA/manifest
btw I built it cm11 with your Openpdroid for nexus 7 works great
— Reply to this email directly or view it on GitHub https://github.com/Lanchon/OpenPDroid-patches/issues/3#issuecomment-52238493 .
thanks I'll take a look at xda for yours I tried to use mateors but there was several more failed hunks, I'll probably build 2 more using cm11 for the s3 and the htc one. And looked at why the patch failed in TelephonyRegistry.java its because cm added the if statement i'll try to see what are other differences and if I figure it out will let you know else I'll just build with cm11 Thanks again
if you build CM11 and create xda projects, ill link them.
is it just one file that doesnt patch?
is so send the file, ill look into it On Aug 14, 2014 8:24 PM, "willrod112" notifications@github.com wrote:
thanks I'll take a look at xda for yours I tried to use mateors but there was several more failed hunks, I'll probably build 2 more using cm11 for the s3 and the htc one. And looked at why the patch failed in TelephonyRegistry.java its because cm added the if statement i'll try to see what are other differences and if I figure it out will let you know else I'll just build with cm11 Thanks again
— Reply to this email directly or view it on GitHub https://github.com/Lanchon/OpenPDroid-patches/issues/3#issuecomment-52257933 .
Just downloaded yours for the nexus 7 :) I'll test it out and see if i have any issues with it. I'll build the htc one m7 next and post it on xda probably until the weekend. And yes it is just that one failed hunk and the difference is just the if statement
if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) { // Return from here as this intent will be sent anyway from MSimTelephonyRegistry return;
that cyanogenmod uses
the bottom part of the original post is the TelephonyRegistry.java.rej
found this at mateor https://github.com/mateor/OpenPDroidPatches/issues/5
ok when u post that project, ill link you.
yes, there are many holes in openpdroid. "what you dont know [about android] wont hurt you" principle does not hold for OPD nor xprivacy nor any of these solutions. and then theres the google services framework big can of worms! to be secure u need an OS designed for privacy. keep eyes open for firefox OS.
bypassing OPD can be done. but most apps dont care. so in practice it works for me.
if you attach the original unmodified byte-accurate file that doesnt patch ill take a look
cheers! On Aug 15, 2014 11:43 AM, "willrod112" notifications@github.com wrote:
Just downloaded yours for the nexus 7 :) I'll test it out and see if i have any issues with it. I'll build the htc one m7 next and post it on xda probably until the weekend. And yes it is just that one failed hunk and the difference is just the if statement
if (MSimTelephonyManager.getDefault().isMultiSimEnabled()) { // Return from here as this intent will be sent anyway from MSimTelephonyRegistry return;
that cyanogenmod uses
the bottom part of the original post is the TelephonyRegistry.java.rej
found this at mateor mateor#5 https://github.com/mateor/OpenPDroidPatches/issues/5
— Reply to this email directly or view it on GitHub https://github.com/Lanchon/OpenPDroid-patches/issues/3#issuecomment-52313375 .
im very sorry i forgot to answer this. apparently there was at the time of your message a new breakage of the patches, so its not a good time to add a device. i decided to wait for M10 before generating new patches, and after that, if you are still interested, i could maybe add a branch for your device.
No problem, I finally got around to building it for the d2lte. It took me a bit cause I was setting up Jenkins. Did a nightly 8/26 and created a snapshot if you need it, the patches applied cleanly, I'll post the rom later today and if you don't mind I would like to use your post as a template.
you mean on xda? sure, go ahead. make sure you create a project, not just a thread. i'll link it from the main OPD thread.
btw just yesterday on xda i posted test overlays for all devices, that may or may not work.
here's the thread link http://forum.xda-developers.com/galaxy-s3-att/development/rom-openpdroid-patched-cyanogenmod-11-t2862061/post55127571
let me know if you want me to test it out on the htc m7 since I have not built it yet
great, thanks! i linked you from the project page.
im aplha-testing a solution for all devices. you may want to try it on your M7.
I manually edited TelephonyRegistry.java to included the changes, but I'm getting this after compiling
frameworks/base/services/java/com/android/server/SystemServer.java:289: cannot find symbol symbol : method addPrivacyService(android.content.Context) location: class com.android.server.ServerThread addPrivacyService(context); ^ Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. Note: Some input files use unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. 1 error
=== apply: openpdroid_4.4-cm_build.patch ==== Switched to a new branch 'openpdroid' patching file core/pathmap.mk Hunk #1 succeeded at 86 (offset -5 lines). patching file target/product/core_minimal.mk
=== apply: openpdroid_4.4-cm_libcore.patch ==== Switched to a new branch 'openpdroid' patching file luni/src/main/java/java/lang/PrivacyInputStream.java patching file luni/src/main/java/java/lang/PrivacyProcessManager.java patching file luni/src/main/java/java/lang/ProcessManager.java
=== apply: openpdroid_4.4-cm_frameworks_base.patch ==== Switched to a new branch 'openpdroid' patching file Android.mk Hunk #2 succeeded at 267 with fuzz 1 (offset -15 lines). Hunk #3 succeeded at 405 with fuzz 1 (offset -19 lines). patching file api/current.txt Hunk #1 succeeded at 23090 (offset -7 lines). patching file core/java/android/app/ContextImpl.java Hunk #1 succeeded at 67 (offset -3 lines). Hunk #2 succeeded at 123 (offset -7 lines). Hunk #6 succeeded at 536 with fuzz 1. Hunk #7 succeeded at 572 (offset -5 lines). Hunk #8 succeeded at 587 (offset -5 lines). Hunk #9 succeeded at 654 (offset -23 lines). patching file core/java/android/app/Instrumentation.java Hunk #6 succeeded at 1720 (offset 8 lines). Hunk #7 succeeded at 1806 (offset 8 lines). Hunk #8 succeeded at 1861 (offset 8 lines). Hunk #9 succeeded at 1948 (offset 8 lines). patching file core/java/android/content/ContentResolver.java patching file core/java/android/hardware/Camera.java Hunk #1 succeeded at 49 (offset 1 line). Hunk #2 succeeded at 198 with fuzz 2 (offset 1 line). Hunk #3 succeeded at 508 with fuzz 2 (offset -22 lines). Hunk #4 succeeded at 1079 (offset -22 lines). Hunk #5 succeeded at 1109 (offset -22 lines). Hunk #6 succeeded at 1139 (offset -22 lines). Hunk #7 succeeded at 1198 (offset -38 lines). Hunk #8 succeeded at 1443 (offset -44 lines). patching file core/java/android/net/NetworkInfo.java patching file core/java/android/os/SystemProperties.java patching file core/java/android/provider/Settings.java Hunk #1 succeeded at 60 (offset -1 lines). Hunk #2 succeeded at 3252 (offset -842 lines). Hunk #3 succeeded at 3607 (offset -842 lines). patching file core/java/android/speech/srec/MicrophoneInputStream.java patching file media/java/android/media/AudioRecord.java Hunk #1 succeeded at 24 (offset -7 lines). Hunk #2 succeeded at 197 (offset -7 lines). Hunk #3 succeeded at 270 (offset -7 lines). Hunk #4 succeeded at 675 with fuzz 2 (offset -26 lines). patching file media/java/android/media/MediaRecorder.java Hunk #1 succeeded at 23 (offset -3 lines). Hunk #2 succeeded at 107 (offset -3 lines). Hunk #3 succeeded at 183 (offset -3 lines). Hunk #4 succeeded at 218 (offset -3 lines). Hunk #5 succeeded at 726 (offset -23 lines). Hunk #6 succeeded at 767 (offset -23 lines). Hunk #7 succeeded at 1001 (offset -23 lines). Hunk #8 succeeded at 1048 (offset -23 lines). Hunk #9 succeeded at 1063 (offset -23 lines). Hunk #10 succeeded at 1082 (offset -23 lines). Hunk #11 succeeded at 1206 (offset -27 lines). Hunk #12 succeeded at 1505 (offset -27 lines). patching file preloaded-classes patching file privacy/java/android/privacy/IPrivacySettingsManager.aidl patching file privacy/java/android/privacy/PrivacyFileObserver.java patching file privacy/java/android/privacy/PrivacyPersistenceAdapter.java patching file privacy/java/android/privacy/PrivacySettings.aidl patching file privacy/java/android/privacy/PrivacySettings.java patching file privacy/java/android/privacy/PrivacySettingsManager.java patching file privacy/java/android/privacy/PrivacySettingsManagerService.java patching file privacy/java/android/privacy/PrivacySettingsStub.java patching file privacy/java/android/privacy/surrogate/PrivacyAccountManager.java patching file privacy/java/android/privacy/surrogate/PrivacyActivityManagerService.java patching file privacy/java/android/privacy/surrogate/PrivacyConnectivityManager.java patching file privacy/java/android/privacy/surrogate/PrivacyContentResolver.java patching file privacy/java/android/privacy/surrogate/PrivacyCursor.java patching file privacy/java/android/privacy/surrogate/PrivacyLocationManager.java patching file privacy/java/android/privacy/surrogate/PrivacyTelephonyManager.java patching file privacy/java/android/privacy/surrogate/PrivacyWifiManager.java patching file services/java/com/android/server/PrivacyTelephonyRegistry.java patching file services/java/com/android/server/SystemServer.java Hunk #1 succeeded at 17 (offset -2 lines). Hunk #2 succeeded at 225 with fuzz 1 (offset -55 lines). Hunk #3 succeeded at 284 (offset -61 lines). Hunk #4 succeeded at 1245 with fuzz 2 (offset -95 lines). patching file services/java/com/android/server/TelephonyRegistry.java Hunk #1 succeeded at 63 (offset -1 lines). Hunk #2 succeeded at 84 (offset -1 lines). Hunk #3 succeeded at 123 (offset -1 lines). Hunk #4 succeeded at 171 (offset -1 lines). Hunk #5 succeeded at 322 (offset -1 lines). Hunk #6 succeeded at 365 (offset -1 lines). Hunk #7 FAILED at 660. Hunk #8 succeeded at 758 (offset -21 lines). Hunk #9 succeeded at 772 (offset -21 lines). Hunk #10 succeeded at 794 (offset -21 lines). 1 out of 10 hunks FAILED -- saving rejects to file services/java/com/android/server/TelephonyRegistry.java.rej patching file services/java/com/android/server/am/BroadcastQueue.java Hunk #1 succeeded at 42 (offset -1 lines). Hunk #2 succeeded at 703 (offset -15 lines). Hunk #3 succeeded at 736 (offset -15 lines). Hunk #4 succeeded at 868 (offset -15 lines). Hunk #5 succeeded at 969 with fuzz 1 (offset -28 lines). patching file telephony/java/android/telephony/CellInfoGsm.java patching file telephony/java/android/telephony/PhoneStateListener.java Hunk #1 succeeded at 16 with fuzz 1 (offset -2 lines). Hunk #2 succeeded at 165 (offset -4 lines). Hunk #3 succeeded at 347 (offset -19 lines). patching file telephony/java/android/telephony/ServiceState.java Hunk #1 succeeded at 561 (offset -20 lines). patching file wifi/java/android/net/wifi/WifiInfo.java
--- services/java/com/android/server/TelephonyRegistry.java +++ services/java/com/android/server/TelephonyRegistry.java @@ -660,7 +680,11 @@ // the legacy intent broadcasting //