Play Store patches now reside in their own repo

merge-requests/23/head
Christopher Roy Bratusek 5 years ago
parent 032160134a
commit c5bb21c50a

@ -144,7 +144,7 @@ The `build-package` script additionally supports the following parameters:
The following applications are custom builds (see [F-Droid Repository](#f-droid-repository) below):
* Play Store (reason: re-signed and modified to support (in-)app-purchases with microG GmsCore)
* [microG (in-)app-purchase support patch](doc/Phonesky.diff)
* [microG (in-)app-purchase support patch](https://gitlab.com/Nanolx/microg-phonesky-iap-support)
* microG GmsCore (reason: built with additions)
* [source (with detailed changes)](https://github.com/Nanolx/android_packages_apps_GmsCore)
* microG DroidGuard Helper (reason: built with fix for non 32bit arm devices failing SafetyNet attestation)
@ -216,7 +216,7 @@ NanoDroid includes
* see the [> GApps Removal List](doc/GAppsRemoval.md#list-of-removed-location-providers)
* F-Droid and it's privileged extension
* modified Play Store to allow (in-)app-purchases with microG
* this required the Play Store to be modified, see the [> patch](doc/Phonesky.diff)
* this required the Play Store to be modified, see the [> patch](https://gitlab.com/Nanolx/microg-phonesky-iap-support)
* alternatively Yalp Store can be installed instead
* custom init scripts
* pseudo-debloat feature (Magisk Mode)

@ -1,88 +0,0 @@
diff -Nupr PS_14552.orig/AndroidManifest.xml PS_14552/AndroidManifest.xml
--- PS_14552.orig/AndroidManifest.xml 2019-04-12 19:00:01.341690801 +0200
+++ PS_14552/AndroidManifest.xml 2019-04-12 19:08:23.770709346 +0200
@@ -90,6 +90,7 @@
<uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="com.android.chrome.permission.SHOW_COMPLIANCE_SCREEN"/>
+ <uses-permission android:name="android.permission.FAKE_PACKAGE_SIGNATURE"/>
<uses-feature android:name="android.hardware.location" android:required="false"/>
<uses-feature android:name="android.hardware.location.gps" android:required="false"/>
<uses-feature android:name="android.hardware.location.network" android:required="false"/>
@@ -120,6 +121,7 @@
<permission android:name="com.google.android.finsky.permission.ACCESS_INSTANT_APP_NOTIFICATION_ENFORCEMENT" android:protectionLevel="signature"/>
<permission android:description="@LEMON_transformed_from_string/perm_play_install_referrer_api_desc" android:label="@LEMON_transformed_from_string/perm_play_install_referrer_api_label" android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE" android:protectionLevel="normal"/>
<application android:backupAgent="com.android.vending.VendingBackupAgent" android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher_play_store" android:killAfterRestore="false" android:label="@LEMON_transformed_from_string/app_long_name" android:name="com.google.android.finsky.application.classic.ClassicApplication" android:requiredForAllUsers="true" android:restoreAnyVersion="true" android:restoreNeedsApplication="true" android:restrictedAccountType="com.google" android:roundIcon="@mipmap/ic_round_launcher_play_store" android:supportsRtl="@bool/is_rtl_enabled" android:usesCleartextTraffic="true">
+ <meta-data android:name="fake-signature" android:value="@string/fake_signature"/>
<activity android:name="com.google.android.finsky.expandeddescriptionactivity.ExpandedDescriptionActivity" android:theme="@style/FinskyOverlayTheme"/>
<provider android:authorities="com.google.android.finsky.instantapps.dna.PhoneskyArchiveProvider" android:enabled="@bool/instant_apps_supported" android:exported="true" android:name="com.google.android.finsky.instantapps.dna.PhoneskyArchiveProvider" android:process=":instant_app_installer"/>
<provider android:authorities="com.google.android.finsky.instantapps.HintApiContentProvider" android:enabled="@bool/instant_apps_supported" android:exported="true" android:name="com.google.android.finsky.instantapps.HintApiContentProvider" android:process=":instant_app_installer"/>
@@ -500,9 +502,7 @@
</intent-filter>
</activity>
<receiver android:name="com.google.android.finsky.boothandler.BootCompletedReceiver">
- <intent-filter>
- <action android:name="android.intent.action.BOOT_COMPLETED"/>
- </intent-filter>
+ <intent-filter/>
</receiver>
<receiver android:exported="false" android:name="com.google.android.finsky.rollbackmanager.RollbackReceiver"/>
<service android:exported="true" android:name="com.google.android.finsky.services.LicensingService" android:permission="com.android.vending.CHECK_LICENSE">
@@ -959,4 +959,4 @@
</activity>
<activity android:enabled="false" android:excludeFromRecents="true" android:icon="@mipmap/leak_canary_icon" android:label="@LEMON_transformed_from_string/leak_canary_storage_permission_activity_label" android:name="com.squareup.leakcanary.internal.RequestStoragePermissionActivity" android:process=":leakcanary" android:roundIcon="@mipmap/leak_canary_icon" android:taskAffinity="com.squareup.leakcanary.com.squareup.leakcanary" android:theme="@style/leak_canary_Theme.Transparent"/>
</application>
-</manifest>
\ Kein Zeilenumbruch am Dateiende.
+</manifest>
diff -Nupr PS_14552.orig/res/values/public.xml PS_14552/res/values/public.xml
--- PS_14552.orig/res/values/public.xml 2019-04-12 18:59:58.025698098 +0200
+++ PS_14552/res/values/public.xml 2019-04-12 19:08:58.090761927 +0200
@@ -12069,6 +12069,7 @@
<public type="string" name="zero_rating_watch_video_dialog_message" id="0x7f1309aa" />
<public type="string" name="zero_rating_watch_video_dialog_title" id="0x7f1309ab" />
<public type="string" name="current_locale_sanity_check" id="0x7f1309ac" />
+ <public type="string" name="fake_signature" id="0x7f1309ad" />
<public type="style" name="AccountRow" id="0x7f140007" />
<public type="style" name="AccountRowBase" id="0x7f140008" />
<public type="style" name="AccountRowSubtitle" id="0x7f14000a" />
@@ -13377,4 +13378,4 @@
<public type="LEMON_transformed_from_string" name="update_subscription_instrument" id="0x7f19002c" />
<public type="LEMON_transformed_from_string" name="verify_app_chooser_label" id="0x7f19002d" />
<public type="LEMON_transformed_from_string" name="verify_app_install_scanning" id="0x7f19002e" />
-</resources>
\ Kein Zeilenumbruch am Dateiende.
+</resources>
diff -Nupr PS_14552.orig/res/values/strings.xml PS_14552/res/values/strings.xml
--- PS_14552.orig/res/values/strings.xml 2019-04-12 18:59:58.025698098 +0200
+++ PS_14552/res/values/strings.xml 2019-04-12 19:08:40.626736241 +0200
@@ -2214,4 +2214,5 @@ Check with your carrier for any limits o
<string name="zero_rating_watch_video_dialog_message">"Video streaming isn't included in free data for Play. Data charges will apply when you watch this video."</string>
<string name="zero_rating_watch_video_dialog_title">Watch video on mobile data?</string>
<string name="current_locale_sanity_check" />
+ <string name="fake_signature">308204433082032ba003020102020900c2e08746644a308d300d06092a864886f70d01010405003074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964301e170d3038303832313233313333345a170d3336303130373233313333345a3074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f696430820120300d06092a864886f70d01010105000382010d00308201080282010100ab562e00d83ba208ae0a966f124e29da11f2ab56d08f58e2cca91303e9b754d372f640a71b1dcb130967624e4656a7776a92193db2e5bfb724a91e77188b0e6a47a43b33d9609b77183145ccdf7b2e586674c9e1565b1f4c6a5955bff251a63dabf9c55c27222252e875e4f8154a645f897168c0b1bfc612eabf785769bb34aa7984dc7e2ea2764cae8307d8c17154d7ee5f64a51a44a602c249054157dc02cd5f5c0e55fbef8519fbe327f0b1511692c5a06f19d18385f5c4dbc2d6b93f68cc2979c70e18ab93866b3bd5db8999552a0e3b4c99df58fb918bedc182ba35e003c1b4b10dd244a8ee24fffd333872ab5221985edab0fc0d0b145b6aa192858e79020103a381d93081d6301d0603551d0e04160414c77d8cc2211756259a7fd382df6be398e4d786a53081a60603551d2304819e30819b8014c77d8cc2211756259a7fd382df6be398e4d786a5a178a4763074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964820900c2e08746644a308d300c0603551d13040530030101ff300d06092a864886f70d010104050003820101006dd252ceef85302c360aaace939bcff2cca904bb5d7a1661f8ae46b2994204d0ff4a68c7ed1a531ec4595a623ce60763b167297a7ae35712c407f208f0cb109429124d7b106219c084ca3eb3f9ad5fb871ef92269a8be28bf16d44c8d9a08e6cb2f005bb3fe2cb96447e868e731076ad45b33f6009ea19c161e62641aa99271dfd5228c5c587875ddb7f452758d661f6cc0cccb7352e424cc4365c523532f7325137593c4ae341f4db41edda0d0b1071a7c440f0fe9ea01cb627ca674369d084bd2fd911ff06cdbf2cfa10dc0f893ae35762919048c7efc64c7144178342f70581c9de573af55b390dd7fdb9418631895d5f759f30112687ff621410c069308a</string>
</resources>
diff -Nupr PS_14552.orig/smali/pic.smali PS_14552/smali/pic.smali
--- PS_14552.orig/smali/pic.smali 2019-04-12 18:59:58.465697126 +0200
+++ PS_14552/smali/pic.smali 2019-04-12 19:09:44.370820322 +0200
@@ -653,7 +653,7 @@
const/4 v1, 0x1
- if-lt v0, p1, :cond_0
+ if-ne v0, v0, :cond_0
const/4 v2, 0x2
diff -Nupr PS_14552.orig/smali/pil.smali PS_14552/smali/pil.smali
--- PS_14552.orig/smali/pil.smali 2019-04-12 18:59:58.465697126 +0200
+++ PS_14552/smali/pil.smali 2019-04-12 19:09:44.378820331 +0200
@@ -258,7 +258,7 @@
const/4 v1, 0x1
- if-lt v0, p1, :cond_0
+ if-ne v0, v0, :cond_0
const/4 v2, 0x2
Loading…
Cancel
Save