From e700439c7754520a13e9360760c5781aecc1de64 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Fri, 1 Mar 2019 15:51:12 +0100 Subject: [PATCH] update Play Store patch 13.8.16 (lacking self-update prevention) --- doc/Phonesky.diff | 379 ++++------------------------------------------ 1 file changed, 28 insertions(+), 351 deletions(-) diff --git a/doc/Phonesky.diff b/doc/Phonesky.diff index e5ae20a..aab6c2c 100644 --- a/doc/Phonesky.diff +++ b/doc/Phonesky.diff @@ -1,15 +1,15 @@ -diff -Nupr PS_13620.orig/AndroidManifest.xml PS_13620/AndroidManifest.xml ---- PS_13620.orig/AndroidManifest.xml 2019-02-14 20:39:54.100472936 +0100 -+++ PS_13620/AndroidManifest.xml 2019-02-14 20:46:35.452731118 +0100 -@@ -86,6 +86,7 @@ - +diff -Nupr PS_13816.orig/AndroidManifest.xml PS_13816/AndroidManifest.xml +--- PS_13816.orig/AndroidManifest.xml 2019-03-01 15:31:42.177040270 +0100 ++++ PS_13816/AndroidManifest.xml 2019-03-01 15:33:42.433726765 +0100 +@@ -88,6 +88,7 @@ + + -@@ -116,6 +117,7 @@ +@@ -118,6 +119,7 @@ @@ -17,7 +17,7 @@ diff -Nupr PS_13620.orig/AndroidManifest.xml PS_13620/AndroidManifest.xml -@@ -495,9 +497,7 @@ +@@ -498,9 +500,7 @@ @@ -28,16 +28,16 @@ diff -Nupr PS_13620.orig/AndroidManifest.xml PS_13620/AndroidManifest.xml -@@ -946,4 +946,4 @@ +@@ -954,4 +954,4 @@ - \ Kein Zeilenumbruch am Dateiende. + -diff -Nupr PS_13620.orig/res/values/arrays.xml PS_13620/res/values/arrays.xml ---- PS_13620.orig/res/values/arrays.xml 2019-02-14 20:39:42.252466882 +0100 -+++ PS_13620/res/values/arrays.xml 2019-02-14 20:46:35.452731118 +0100 +diff -Nupr PS_13816.orig/res/values/arrays.xml PS_13816/res/values/arrays.xml +--- PS_13816.orig/res/values/arrays.xml 2019-03-01 15:31:30.528971463 +0100 ++++ PS_13816/res/values/arrays.xml 2019-03-01 15:34:04.021845831 +0100 @@ -1,7 +1,15 @@ @@ -58,37 +58,37 @@ diff -Nupr PS_13620.orig/res/values/arrays.xml PS_13620/res/values/arrays.xml + Disable Network Type Override + -diff -Nupr PS_13620.orig/res/values/public.xml PS_13620/res/values/public.xml ---- PS_13620.orig/res/values/public.xml 2019-02-14 20:39:42.252466882 +0100 -+++ PS_13620/res/values/public.xml 2019-02-14 20:48:16.484804668 +0100 -@@ -11403,6 +11403,7 @@ - - - -+ +diff -Nupr PS_13816.orig/res/values/public.xml PS_13816/res/values/public.xml +--- PS_13816.orig/res/values/public.xml 2019-03-01 15:31:30.528971463 +0100 ++++ PS_13816/res/values/public.xml 2019-03-01 15:34:41.714051013 +0100 +@@ -11621,6 +11621,7 @@ + + + ++ -@@ -12693,4 +12694,4 @@ +@@ -12938,4 +12939,4 @@ - \ Kein Zeilenumbruch am Dateiende. + -diff -Nupr PS_13620.orig/res/values/strings.xml PS_13620/res/values/strings.xml ---- PS_13620.orig/res/values/strings.xml 2019-02-14 20:39:42.252466882 +0100 -+++ PS_13620/res/values/strings.xml 2019-02-14 20:46:35.456731120 +0100 -@@ -2168,4 +2168,5 @@ Check with your carrier for any limits o +diff -Nupr PS_13816.orig/res/values/strings.xml PS_13816/res/values/strings.xml +--- PS_13816.orig/res/values/strings.xml 2019-03-01 15:31:30.528971463 +0100 ++++ PS_13816/res/values/strings.xml 2019-03-01 15:35:05.530178980 +0100 +@@ -2187,4 +2187,5 @@ Check with your carrier for any limits o "Video streaming isn't included in free data for Play. Data charges will apply when you watch this video." Watch video on mobile data? + 308204433082032ba003020102020900c2e08746644a308d300d06092a864886f70d01010405003074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964301e170d3038303832313233313333345a170d3336303130373233313333345a3074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f696430820120300d06092a864886f70d01010105000382010d00308201080282010100ab562e00d83ba208ae0a966f124e29da11f2ab56d08f58e2cca91303e9b754d372f640a71b1dcb130967624e4656a7776a92193db2e5bfb724a91e77188b0e6a47a43b33d9609b77183145ccdf7b2e586674c9e1565b1f4c6a5955bff251a63dabf9c55c27222252e875e4f8154a645f897168c0b1bfc612eabf785769bb34aa7984dc7e2ea2764cae8307d8c17154d7ee5f64a51a44a602c249054157dc02cd5f5c0e55fbef8519fbe327f0b1511692c5a06f19d18385f5c4dbc2d6b93f68cc2979c70e18ab93866b3bd5db8999552a0e3b4c99df58fb918bedc182ba35e003c1b4b10dd244a8ee24fffd333872ab5221985edab0fc0d0b145b6aa192858e79020103a381d93081d6301d0603551d0e04160414c77d8cc2211756259a7fd382df6be398e4d786a53081a60603551d2304819e30819b8014c77d8cc2211756259a7fd382df6be398e4d786a5a178a4763074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964820900c2e08746644a308d300c0603551d13040530030101ff300d06092a864886f70d010104050003820101006dd252ceef85302c360aaace939bcff2cca904bb5d7a1661f8ae46b2994204d0ff4a68c7ed1a531ec4595a623ce60763b167297a7ae35712c407f208f0cb109429124d7b106219c084ca3eb3f9ad5fb871ef92269a8be28bf16d44c8d9a08e6cb2f005bb3fe2cb96447e868e731076ad45b33f6009ea19c161e62641aa99271dfd5228c5c587875ddb7f452758d661f6cc0cccb7352e424cc4365c523532f7325137593c4ae341f4db41edda0d0b1071a7c440f0fe9ea01cb627ca674369d084bd2fd911ff06cdbf2cfa10dc0f893ae35762919048c7efc64c7144178342f70581c9de573af55b390dd7fdb9418631895d5f759f30112687ff621410c069308a -diff -Nupr PS_13620.orig/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali PS_13620/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali ---- PS_13620.orig/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali 2019-02-14 20:39:42.932467226 +0100 -+++ PS_13620/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali 2019-02-14 20:46:35.456731120 +0100 -@@ -60,8 +60,6 @@ +diff -Nupr PS_13816.orig/smali_classes2/com/google/android/finsky/headless/GmsCoreUpdateService.smali PS_13816/smali_classes2/com/google/android/finsky/headless/GmsCoreUpdateService.smali +--- PS_13816.orig/smali_classes2/com/google/android/finsky/headless/GmsCoreUpdateService.smali 2019-03-01 15:31:30.884973573 +0100 ++++ PS_13816/smali_classes2/com/google/android/finsky/headless/GmsCoreUpdateService.smali 2019-03-01 15:36:25.946602299 +0100 +@@ -58,8 +58,6 @@ invoke-virtual {v0, v1}, Landroid/content/Intent;->setData(Landroid/net/Uri;)Landroid/content/Intent; .line 14 @@ -97,326 +97,3 @@ diff -Nupr PS_13620.orig/smali/com/google/android/finsky/headless/GmsCoreUpdateS return-void .end method -diff -Nupr PS_13620.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_13620/smali/com/google/android/finsky/selfupdate/i.smali ---- PS_13620.orig/smali/com/google/android/finsky/selfupdate/i.smali 2019-02-14 20:39:42.948467233 +0100 -+++ PS_13620/smali/com/google/android/finsky/selfupdate/i.smali 2019-02-14 20:49:21.016852437 +0100 -@@ -719,8 +719,6 @@ - - move-result v0 - -- if-eqz v0, :cond_0 -- - const-string v0, "Skipping DFE self-update check as there is an update already queued." - - .line 24 -@@ -768,298 +766,7 @@ - move v0, v6 - - .line 57 -- :goto_0 - return v0 -- -- .line 30 -- :cond_0 -- invoke-virtual {p0, p1}, Lcom/google/android/finsky/selfupdate/i;->a(I)Z -- -- move-result v0 -- -- if-eqz v0, :cond_7 -- -- .line 31 -- new-instance v2, Lcom/google/android/finsky/selfupdate/g; -- -- iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->k:Lcom/google/android/finsky/ed/g; -- -- iget-object v3, p0, Lcom/google/android/finsky/selfupdate/i;->g:Lcom/google/android/finsky/recoverymode/c; -- -- iget-object v4, p0, Lcom/google/android/finsky/selfupdate/i;->h:Lcom/google/android/finsky/bc/a; -- -- invoke-direct {v2, p3, v0, v3, v4}, Lcom/google/android/finsky/selfupdate/g;->(Lcom/google/android/finsky/bt/h;Lcom/google/android/finsky/ed/g;Lcom/google/android/finsky/recoverymode/c;Lcom/google/android/finsky/bc/a;)V -- -- .line 32 -- iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->k:Lcom/google/android/finsky/ed/g; -- -- invoke-static {p3, v0}, Lcom/google/android/finsky/selfupdate/g;->a(Lcom/google/android/finsky/bt/h;Lcom/google/android/finsky/ed/g;)Z -- -- move-result v0 -- -- if-eqz v0, :cond_2 -- -- .line 33 -- invoke-static {}, Landroid/os/StrictMode;->getThreadPolicy()Landroid/os/StrictMode$ThreadPolicy; -- -- move-result-object v3 -- -- .line 34 -- new-instance v0, Landroid/os/StrictMode$ThreadPolicy$Builder; -- -- invoke-direct {v0, v3}, Landroid/os/StrictMode$ThreadPolicy$Builder;->(Landroid/os/StrictMode$ThreadPolicy;)V -- -- .line 35 -- invoke-virtual {v0}, Landroid/os/StrictMode$ThreadPolicy$Builder;->permitDiskReads()Landroid/os/StrictMode$ThreadPolicy$Builder; -- -- move-result-object v0 -- -- invoke-virtual {v0}, Landroid/os/StrictMode$ThreadPolicy$Builder;->permitDiskWrites()Landroid/os/StrictMode$ThreadPolicy$Builder; -- -- move-result-object v0 -- -- invoke-virtual {v0}, Landroid/os/StrictMode$ThreadPolicy$Builder;->build()Landroid/os/StrictMode$ThreadPolicy; -- -- move-result-object v0 -- -- .line 36 -- invoke-static {v0}, Landroid/os/StrictMode;->setThreadPolicy(Landroid/os/StrictMode$ThreadPolicy;)V -- -- .line 37 -- :try_start_0 -- sget-object v0, Lcom/google/android/finsky/ez/a;->b:Lcom/google/android/finsky/aj/q; -- -- invoke-virtual {v0}, Lcom/google/android/finsky/aj/q;->a()Ljava/lang/Object; -- -- move-result-object v0 -- -- check-cast v0, Ljava/lang/Long; -- -- invoke-virtual {v0}, Ljava/lang/Long;->longValue()J -- -- move-result-wide v4 -- -- const-wide/16 v8, 0x0 -- -- cmp-long v0, v4, v8 -- -- if-gtz v0, :cond_1 -- -- .line 38 -- sget-object v0, Lcom/google/android/finsky/ez/a;->b:Lcom/google/android/finsky/aj/q; -- -- invoke-static {}, Lcom/google/android/finsky/utils/k;->a()J -- -- move-result-wide v4 -- -- invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; -- -- move-result-object v4 -- -- invoke-virtual {v0, v4}, Lcom/google/android/finsky/aj/q;->a(Ljava/lang/Object;)V -- :try_end_0 -- .catchall {:try_start_0 .. :try_end_0} :catchall_0 -- -- .line 39 -- :cond_1 -- invoke-static {v3}, Landroid/os/StrictMode;->setThreadPolicy(Landroid/os/StrictMode$ThreadPolicy;)V -- -- if-nez p5, :cond_2 -- -- .line 40 -- invoke-virtual {v2}, Lcom/google/android/finsky/selfupdate/g;->a()Z -- -- move-result v0 -- -- if-eqz v0, :cond_4 -- -- :cond_2 -- const/4 v5, 0x0 -- -- move-object v0, p0 -- -- move v1, p1 -- -- move-object v2, p2 -- -- move-object v3, p3 -- -- move-object v4, p4 -- -- .line 41 -- invoke-virtual/range {v0 .. v5}, Lcom/google/android/finsky/selfupdate/i;->a(ILcom/google/android/finsky/api/e;Lcom/google/android/finsky/bt/h;Lcom/google/android/finsky/analytics/az;Ljava/lang/Runnable;)V -- -- .line 42 -- :try_start_1 -- iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->i:Lcom/google/android/finsky/scheduler/cv; -- -- const v1, 0xbeef -- -- invoke-virtual {v0, v1}, Lcom/google/android/finsky/scheduler/cv;->c(I)Z -- -- move-result v0 -- -- if-eqz v0, :cond_3 -- -- .line 43 -- iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->i:Lcom/google/android/finsky/scheduler/cv; -- -- .line 44 -- const v1, 0xbeef -- -- invoke-virtual {v0, v1}, Lcom/google/android/finsky/scheduler/cv;->b(I)Lcom/google/android/finsky/ai/f; -- -- move-result-object v0 -- -- invoke-interface {v0}, Lcom/google/android/finsky/ai/f;->a()Lcom/google/common/util/concurrent/ap; -- -- move-result-object v0 -- -- .line 45 -- new-instance v1, Lcom/google/android/finsky/selfupdate/j; -- -- invoke-direct {v1, p0, v0, p4}, Lcom/google/android/finsky/selfupdate/j;->(Lcom/google/android/finsky/selfupdate/i;Lcom/google/common/util/concurrent/ap;Lcom/google/android/finsky/analytics/az;)V -- -- .line 46 -- sget-object v2, Lcom/google/android/finsky/bs/n;->a:Ljava/util/concurrent/Executor; -- -- .line 47 -- invoke-virtual {v0, v1, v2}, Lcom/google/common/util/concurrent/d;->a(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V -- :try_end_1 -- .catchall {:try_start_1 .. :try_end_1} :catchall_1 -- -- :cond_3 -- :goto_1 -- move v0, v6 -- -- goto/16 :goto_0 -- -- .line 48 -- :cond_4 -- iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->i:Lcom/google/android/finsky/scheduler/cv; -- -- invoke-virtual {v0, v1}, Lcom/google/android/finsky/scheduler/cv;->c(I)Z -- -- move-result v0 -- -- if-nez v0, :cond_6 -- -- .line 49 -- new-instance v5, Lcom/google/android/finsky/scheduler/b/c; -- -- invoke-direct {v5}, Lcom/google/android/finsky/scheduler/b/c;->()V -- -- const-string v0, "self_update_to_version" -- -- .line 50 -- invoke-virtual {v5, v0, p1}, Lcom/google/android/finsky/scheduler/b/c;->b(Ljava/lang/String;I)Lcom/google/android/finsky/scheduler/b/c; -- -- .line 51 -- invoke-interface {p2}, Lcom/google/android/finsky/api/e;->c()Ljava/lang/String; -- -- move-result-object v0 -- -- if-eqz v0, :cond_5 -- -- const-string v0, "self_update_account_name" -- -- .line 52 -- invoke-interface {p2}, Lcom/google/android/finsky/api/e;->c()Ljava/lang/String; -- -- move-result-object v2 -- -- invoke-virtual {v5, v0, v2}, Lcom/google/android/finsky/scheduler/b/c;->a(Ljava/lang/String;Ljava/lang/String;)Lcom/google/android/finsky/scheduler/b/c; -- -- .line 53 -- :cond_5 -- iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->i:Lcom/google/android/finsky/scheduler/cv; -- -- const-string v2, "self_update_job" -- -- const-class v3, Lcom/google/android/finsky/selfupdate/SelfUpdateInstallJob; -- -- .line 54 -- invoke-static {}, Lcom/google/android/finsky/selfupdate/g;->b()Lcom/google/android/finsky/scheduler/b/a; -- -- move-result-object v4 -- -- sget v6, Lcom/google/android/finsky/scheduler/cu;->a:I -- -- .line 55 -- invoke-virtual/range {v0 .. v6}, Lcom/google/android/finsky/scheduler/cv;->a(ILjava/lang/String;Ljava/lang/Class;Lcom/google/android/finsky/scheduler/b/a;Lcom/google/android/finsky/scheduler/b/c;I)Lcom/google/android/finsky/ai/f; -- -- move-result-object v0 -- -- .line 56 -- invoke-interface {v0}, Lcom/google/android/finsky/ai/f;->a()Lcom/google/common/util/concurrent/ap; -- -- move-result-object v2 -- -- .line 57 -- new-instance v0, Lcom/google/android/finsky/selfupdate/k; -- -- move-object v1, p0 -- -- move-object v3, p4 -- -- move v4, p1 -- -- move-object v5, p2 -- -- move-object v6, p3 -- -- invoke-direct/range {v0 .. v6}, Lcom/google/android/finsky/selfupdate/k;->(Lcom/google/android/finsky/selfupdate/i;Lcom/google/common/util/concurrent/ap;Lcom/google/android/finsky/analytics/az;ILcom/google/android/finsky/api/e;Lcom/google/android/finsky/bt/h;)V -- -- iget-object v1, p0, Lcom/google/android/finsky/selfupdate/i;->j:Ljava/util/concurrent/Executor; -- -- invoke-virtual {v2, v0, v1}, Lcom/google/common/util/concurrent/d;->a(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V -- -- move v0, v7 -- -- goto/16 :goto_0 -- -- :cond_6 -- move v0, v6 -- -- goto/16 :goto_0 -- -- :cond_7 -- move v0, v7 -- -- goto/16 :goto_0 -- -- :catchall_0 -- move-exception v0 -- -- .line 58 -- invoke-static {v3}, Landroid/os/StrictMode;->setThreadPolicy(Landroid/os/StrictMode$ThreadPolicy;)V -- -- throw v0 -- -- :catchall_1 -- move-exception v0 -- -- const-string v1, "Could not cancel existing self update job." -- -- .line 59 -- new-array v2, v7, [Ljava/lang/Object; -- -- invoke-static {v1, v2}, Lcom/google/android/finsky/utils/FinskyLog;->d(Ljava/lang/String;[Ljava/lang/Object;)V -- -- const/16 v1, 0x107c -- -- .line 60 -- invoke-virtual {p0, v1}, Lcom/google/android/finsky/selfupdate/i;->b(I)Lcom/google/android/finsky/analytics/j; -- -- move-result-object v1 -- -- .line 61 -- invoke-virtual {v1, v0}, Lcom/google/android/finsky/analytics/j;->a(Ljava/lang/Throwable;)Lcom/google/android/finsky/analytics/j; -- -- .line 62 -- invoke-virtual {p4, v1}, Lcom/google/android/finsky/analytics/az;->a(Lcom/google/android/finsky/analytics/j;)Lcom/google/android/finsky/analytics/az; -- -- goto :goto_1 - .end method - - .method final b(I)Lcom/google/android/finsky/analytics/j; -diff -Nupr PS_13620.orig/smali/com/google/android/finsky/selfupdate/p.smali PS_13620/smali/com/google/android/finsky/selfupdate/p.smali ---- PS_13620.orig/smali/com/google/android/finsky/selfupdate/p.smali 2019-02-14 20:39:42.948467233 +0100 -+++ PS_13620/smali/com/google/android/finsky/selfupdate/p.smali 2019-02-14 20:46:35.456731120 +0100 -@@ -308,7 +308,7 @@ - const/4 v0, 0x1 - - .line 24 -- iget-boolean v2, p0, Lcom/google/android/finsky/selfupdate/p;->d:Z -+ const/4 v2, 0x1 - - if-eqz v2, :cond_0 -