update Play Store patch to 13.3.16

6 years ago · 90a61822b2
parent 44d2f0e470
commit 90a61822b2
1 changed files with 107 additions and 103 deletions
--- a/doc/Phonesky.diff
+++ b/doc/Phonesky.diff
@ -1,15 +1,15 @@
-diff -Nupr PS_13219.orig/AndroidManifest.xml PS_13219/AndroidManifest.xml
--- PS_13219.orig/AndroidManifest.xml	2019-01-20 17:26:48.494545804 +0100
-+++ PS_13219/AndroidManifest.xml	2019-01-23 21:36:04.651751373 +0100
-@@ -82,6 +82,7 @@
-     <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+diff -Nupr PS_13316.orig/AndroidManifest.xml PS_13316/AndroidManifest.xml
+--- PS_13316.orig/AndroidManifest.xml	2019-01-25 16:24:30.180462354 +0100
+++ PS_13316/AndroidManifest.xml	2019-01-25 16:28:14.627777187 +0100
+@@ -84,6 +84,7 @@
     <uses-permission android:name="android.permission.READ_RUNTIME_PROFILES"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+     <uses-permission android:name="android.permission.REBOOT"/>
 +    <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"/>
-@@ -112,6 +113,7 @@
+@@ -114,6 +115,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">
@ -17,27 +17,27 @@ diff -Nupr PS_13219.orig/AndroidManifest.xml PS_13219/AndroidManifest.xml
         <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"/>
-@@ -497,9 +499,7 @@
+@@ -493,9 +495,7 @@
             </intent-filter>
-         </receiver>
-         <service android:exported="true" android:name="com.google.android.finsky.services.LicensingService" android:permission="com.android.vending.CHECK_LICENSE">
+         </activity>
+         <receiver android:name="com.google.android.finsky.boothandler.BootCompletedReceiver">
 -            <intent-filter>
-                <action android:name="com.android.vending.licensing.ILicensingService"/>
+-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
 -            </intent-filter>
 +            <intent-filter/>
-         </service>
-         <service android:name="com.google.android.finsky.setup.RestoreServiceV2"/>
-         <service android:name="com.google.android.finsky.setup.VpaService"/>
-@@ -924,4 +924,4 @@
+         </receiver>
+         <service android:exported="true" android:name="com.google.android.finsky.services.LicensingService" android:permission="com.android.vending.CHECK_LICENSE">
+             <intent-filter>
+@@ -925,4 +925,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_13219.orig/res/values/arrays.xml PS_13219/res/values/arrays.xml
--- PS_13219.orig/res/values/arrays.xml	2019-01-20 17:26:29.026514490 +0100
-+++ PS_13219/res/values/arrays.xml	2019-01-23 21:36:40.543853735 +0100
+diff -Nupr PS_13316.orig/res/values/arrays.xml PS_13316/res/values/arrays.xml
+--- PS_13316.orig/res/values/arrays.xml	2019-01-25 16:24:25.768476873 +0100
+++ PS_13316/res/values/arrays.xml	2019-01-25 16:27:23.567892027 +0100
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
@ -58,9 +58,9 @@ diff -Nupr PS_13219.orig/res/values/arrays.xml PS_13219/res/values/arrays.xml
 +        <item>Disable Network Type Override</item>
 +    </string-array>
 </resources>
-diff -Nupr PS_13219.orig/res/values/layouts.xml PS_13219/res/values/layouts.xml
--- PS_13219.orig/res/values/layouts.xml	2019-01-20 17:26:29.038514508 +0100
-+++ PS_13219/res/values/layouts.xml	2019-01-23 21:35:29.211651092 +0100
+diff -Nupr PS_13316.orig/res/values/layouts.xml PS_13316/res/values/layouts.xml
+--- PS_13316.orig/res/values/layouts.xml	2019-01-25 16:24:25.768476873 +0100
+++ PS_13316/res/values/layouts.xml	2019-01-25 16:26:21.360096618 +0100
@@ -9,7 +9,6 @@
     <item type="layout" name="liveops_card_full_view">@layout/liveops_card_full</item>
     <item type="layout" name="permission_row">@layout/main_permission_row</item>
@ -69,44 +69,44 @@ diff -Nupr PS_13219.orig/res/values/layouts.xml PS_13219/res/values/layouts.xml
     <item type="layout" name="update_all_activity">@layout/main_update_all_activity</item>
     <item type="layout" name="video_collection_card_view">@layout/card_view_video_collection</item>
 </resources>
-diff -Nupr PS_13219.orig/res/values/public.xml PS_13219/res/values/public.xml
--- PS_13219.orig/res/values/public.xml	2019-01-20 17:26:29.038514508 +0100
-+++ PS_13219/res/values/public.xml	2019-01-23 21:37:08.355933570 +0100
-@@ -9140,7 +9140,6 @@
-     <public type="layout" name="top_charts_spinner_item" id="0x7f0e052a" />
-     <public type="layout" name="top_charts_spinner_selected_item" id="0x7f0e052b" />
-     <public type="layout" name="top_review_header" id="0x7f0e052c" />
-    <public type="layout" name="tv_season_selector_item" id="0x7f0e052e" />
-     <public type="layout" name="tv_season_spinner_item" id="0x7f0e052f" />
-     <public type="layout" name="tv_season_spinner_selected_item" id="0x7f0e0530" />
-     <public type="layout" name="two_icon_messages_success_step" id="0x7f0e0531" />
-@@ -11672,6 +11671,7 @@
-     <public type="string" name="zero_rating_watch_video_dialog_message" id="0x7f13092b" />
-     <public type="string" name="zero_rating_watch_video_dialog_title" id="0x7f13092c" />
-     <public type="string" name="current_locale_sanity_check" id="0x7f13092d" />
-+    <public type="string" name="fake_signature" id="0x7f13092e" />
-     <public type="style" name="AccountDfeListDetails" id="0x7f140000" />
-     <public type="style" name="AccountDfeListPrice" id="0x7f140001" />
-     <public type="style" name="AccountDfeListStatus" id="0x7f140002" />
-@@ -13101,4 +13101,4 @@
+diff -Nupr PS_13316.orig/res/values/public.xml PS_13316/res/values/public.xml
+--- PS_13316.orig/res/values/public.xml	2019-01-25 16:24:25.768476873 +0100
+++ PS_13316/res/values/public.xml	2019-01-25 16:27:10.927933597 +0100
+@@ -9065,7 +9065,6 @@
+     <public type="layout" name="top_charts_spinner_item" id="0x7f0e0520" />
+     <public type="layout" name="top_charts_spinner_selected_item" id="0x7f0e0521" />
+     <public type="layout" name="top_review_header" id="0x7f0e0522" />
+-    <public type="layout" name="tv_season_selector_item" id="0x7f0e0524" />
+     <public type="layout" name="tv_season_spinner_item" id="0x7f0e0525" />
+     <public type="layout" name="tv_season_spinner_selected_item" id="0x7f0e0526" />
+     <public type="layout" name="two_icon_messages_success_step" id="0x7f0e0527" />
+@@ -11587,6 +11586,7 @@
+     <public type="string" name="zero_rating_watch_video_dialog_message" id="0x7f130934" />
+     <public type="string" name="zero_rating_watch_video_dialog_title" id="0x7f130935" />
+     <public type="string" name="current_locale_sanity_check" id="0x7f130936" />
+    <public type="string" name="fake_signature" id="0x7f130937" />
+     <public type="style" name="AccountLandingPageRowTitle" id="0x7f140005" />
+     <public type="style" name="AccountRow" id="0x7f140007" />
+     <public type="style" name="AccountRowBase" id="0x7f140008" />
+@@ -12971,4 +12971,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_13219.orig/res/values/strings.xml PS_13219/res/values/strings.xml
--- PS_13219.orig/res/values/strings.xml	2019-01-20 17:26:29.038514508 +0100
-+++ PS_13219/res/values/strings.xml	2019-01-23 21:36:27.611816763 +0100
-@@ -2158,4 +2158,5 @@ Check with your carrier for any limits o
+diff -Nupr PS_13316.orig/res/values/strings.xml PS_13316/res/values/strings.xml
+--- PS_13316.orig/res/values/strings.xml	2019-01-25 16:24:25.768476873 +0100
+++ PS_13316/res/values/strings.xml	2019-01-25 16:26:41.228031274 +0100
+@@ -2155,4 +2155,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_13219.orig/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali PS_13219/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali
--- PS_13219.orig/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali	2019-01-20 17:26:36.730526404 +0100
-+++ PS_13219/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali	2019-01-23 21:37:47.184045738 +0100
+diff -Nupr PS_13316.orig/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali PS_13316/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali
+--- PS_13316.orig/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali	2019-01-25 16:24:26.024476031 +0100
+++ PS_13316/smali/com/google/android/finsky/headless/GmsCoreUpdateService.smali	2019-01-25 16:28:42.752216481 +0100
@@ -60,8 +60,6 @@
     invoke-virtual {v0, v1}, Landroid/content/Intent;->setData(Landroid/net/Uri;)Landroid/content/Intent;
 
@ -116,10 +116,10 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/headless/GmsCoreUpdateS
     return-void
 .end method
 
-diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_13219/smali/com/google/android/finsky/selfupdate/i.smali
--- PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali	2019-01-20 17:26:37.026526874 +0100
-+++ PS_13219/smali/com/google/android/finsky/selfupdate/i.smali	2019-01-23 21:38:53.620239418 +0100
-@@ -649,8 +649,6 @@
+diff -Nupr PS_13316.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_13316/smali/com/google/android/finsky/selfupdate/i.smali
+--- PS_13316.orig/smali/com/google/android/finsky/selfupdate/i.smali	2019-01-25 16:24:26.048475951 +0100
+++ PS_13316/smali/com/google/android/finsky/selfupdate/i.smali	2019-01-25 16:29:29.356839210 +0100
+@@ -660,8 +660,6 @@
 
     move-result v0
 
@ -127,15 +127,15 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
     const-string v0, "Skipping DFE self-update check as there is an update already queued."
 
-     .line 23
-@@ -708,296 +706,7 @@
+     .line 24
+@@ -719,300 +717,7 @@
     move v0, v6
 
-     .line 56
+     .line 57
 -    :goto_0
     return v0
 -
-    .line 29
+-    .line 30
 -    :cond_0
 -    invoke-virtual {p0, p1}, Lcom/google/android/finsky/selfupdate/i;->a(I)Z
 -
@ -143,33 +143,37 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    if-eqz v0, :cond_7
 -
-    .line 30
+-    .line 31
 -    new-instance v2, Lcom/google/android/finsky/selfupdate/g;
 -
-    iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->g:Lcom/google/android/finsky/recoverymode/d;
+-    iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->k:Lcom/google/android/finsky/eb/g;
 -
-    iget-object v3, p0, Lcom/google/android/finsky/selfupdate/i;->h:Lcom/google/android/finsky/bc/a;
+-    iget-object v3, p0, Lcom/google/android/finsky/selfupdate/i;->g:Lcom/google/android/finsky/recoverymode/d;
 -
-    invoke-direct {v2, p3, v0, v3}, Lcom/google/android/finsky/selfupdate/g;-><init>(Lcom/google/android/finsky/bt/i;Lcom/google/android/finsky/recoverymode/d;Lcom/google/android/finsky/bc/a;)V
+-    iget-object v4, p0, Lcom/google/android/finsky/selfupdate/i;->h:Lcom/google/android/finsky/bc/a;
 -
-    .line 31
-    invoke-static {p3}, Lcom/google/android/finsky/selfupdate/g;->a(Lcom/google/android/finsky/bt/i;)Z
+-    invoke-direct {v2, p3, v0, v3, v4}, Lcom/google/android/finsky/selfupdate/g;-><init>(Lcom/google/android/finsky/bt/h;Lcom/google/android/finsky/eb/g;Lcom/google/android/finsky/recoverymode/d;Lcom/google/android/finsky/bc/a;)V
+-
+-    .line 32
+-    iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->k:Lcom/google/android/finsky/eb/g;
+-
+-    invoke-static {p3, v0}, Lcom/google/android/finsky/selfupdate/g;->a(Lcom/google/android/finsky/bt/h;Lcom/google/android/finsky/eb/g;)Z
 -
 -    move-result v0
 -
 -    if-eqz v0, :cond_2
 -
-    .line 32
+-    .line 33
 -    invoke-static {}, Landroid/os/StrictMode;->getThreadPolicy()Landroid/os/StrictMode$ThreadPolicy;
 -
 -    move-result-object v3
 -
-    .line 33
+-    .line 34
 -    new-instance v0, Landroid/os/StrictMode$ThreadPolicy$Builder;
 -
 -    invoke-direct {v0, v3}, Landroid/os/StrictMode$ThreadPolicy$Builder;-><init>(Landroid/os/StrictMode$ThreadPolicy;)V
 -
-    .line 34
+-    .line 35
 -    invoke-virtual {v0}, Landroid/os/StrictMode$ThreadPolicy$Builder;->permitDiskReads()Landroid/os/StrictMode$ThreadPolicy$Builder;
 -
 -    move-result-object v0
@ -182,12 +186,12 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    move-result-object v0
 -
-    .line 35
+-    .line 36
 -    invoke-static {v0}, Landroid/os/StrictMode;->setThreadPolicy(Landroid/os/StrictMode$ThreadPolicy;)V
 -
-    .line 36
+-    .line 37
 -    :try_start_0
-    sget-object v0, Lcom/google/android/finsky/ey/a;->b:Lcom/google/android/finsky/aj/q;
+-    sget-object v0, Lcom/google/android/finsky/ex/a;->b:Lcom/google/android/finsky/aj/q;
 -
 -    invoke-virtual {v0}, Lcom/google/android/finsky/aj/q;->a()Ljava/lang/Object;
 -
@ -205,8 +209,8 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    if-gtz v0, :cond_1
 -
-    .line 37
-    sget-object v0, Lcom/google/android/finsky/ey/a;->b:Lcom/google/android/finsky/aj/q;
+-    .line 38
+-    sget-object v0, Lcom/google/android/finsky/ex/a;->b:Lcom/google/android/finsky/aj/q;
 -
 -    invoke-static {}, Lcom/google/android/finsky/utils/k;->a()J
 -
@ -220,13 +224,13 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -    :try_end_0
 -    .catchall {:try_start_0 .. :try_end_0} :catchall_0
 -
-    .line 38
+-    .line 39
 -    :cond_1
 -    invoke-static {v3}, Landroid/os/StrictMode;->setThreadPolicy(Landroid/os/StrictMode$ThreadPolicy;)V
 -
 -    if-nez p5, :cond_2
 -
-    .line 39
+-    .line 40
 -    invoke-virtual {v2}, Lcom/google/android/finsky/selfupdate/g;->a()Z
 -
 -    move-result v0
@ -246,10 +250,10 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    move-object v4, p4
 -
-    .line 40
-    invoke-virtual/range {v0 .. v5}, Lcom/google/android/finsky/selfupdate/i;->a(ILcom/google/android/finsky/api/b;Lcom/google/android/finsky/bt/i;Lcom/google/android/finsky/analytics/az;Ljava/lang/Runnable;)V
-
 -    .line 41
+-    invoke-virtual/range {v0 .. v5}, Lcom/google/android/finsky/selfupdate/i;->a(ILcom/google/android/finsky/api/b;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;
 -
@ -261,10 +265,10 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    if-eqz v0, :cond_3
 -
-    .line 42
+-    .line 43
 -    iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->i:Lcom/google/android/finsky/scheduler/cv;
 -
-    .line 43
+-    .line 44
 -    const v1, 0xbeef
 -
 -    invoke-virtual {v0, v1}, Lcom/google/android/finsky/scheduler/cv;->b(I)Lcom/google/android/finsky/ai/f;
@ -275,15 +279,15 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    move-result-object v0
 -
-    .line 44
+-    .line 45
 -    new-instance v1, Lcom/google/android/finsky/selfupdate/j;
 -
 -    invoke-direct {v1, p0, v0, p4}, Lcom/google/android/finsky/selfupdate/j;-><init>(Lcom/google/android/finsky/selfupdate/i;Lcom/google/common/util/concurrent/an;Lcom/google/android/finsky/analytics/az;)V
 -
-    .line 45
+-    .line 46
 -    sget-object v2, Lcom/google/android/finsky/bs/n;->a:Ljava/util/concurrent/Executor;
 -
-    .line 46
+-    .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
@ -294,7 +298,7 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    goto/16 :goto_0
 -
-    .line 47
+-    .line 48
 -    :cond_4
 -    iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->i:Lcom/google/android/finsky/scheduler/cv;
 -
@ -304,17 +308,17 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    if-nez v0, :cond_6
 -
-    .line 48
+-    .line 49
 -    new-instance v5, Lcom/google/android/finsky/scheduler/b/c;
 -
 -    invoke-direct {v5}, Lcom/google/android/finsky/scheduler/b/c;-><init>()V
 -
 -    const-string v0, "self_update_to_version"
 -
-    .line 49
+-    .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 50
+-    .line 51
 -    invoke-interface {p2}, Lcom/google/android/finsky/api/b;->c()Ljava/lang/String;
 -
 -    move-result-object v0
@ -323,14 +327,14 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    const-string v0, "self_update_account_name"
 -
-    .line 51
+-    .line 52
 -    invoke-interface {p2}, Lcom/google/android/finsky/api/b;->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 52
+-    .line 53
 -    :cond_5
 -    iget-object v0, p0, Lcom/google/android/finsky/selfupdate/i;->i:Lcom/google/android/finsky/scheduler/cv;
 -
@ -338,24 +342,24 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    const-class v3, Lcom/google/android/finsky/selfupdate/SelfUpdateInstallJob;
 -
-    .line 53
+-    .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 54
+-    .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 55
+-    .line 56
 -    invoke-interface {v0}, Lcom/google/android/finsky/ai/f;->a()Lcom/google/common/util/concurrent/an;
 -
 -    move-result-object v2
 -
-    .line 56
+-    .line 57
 -    new-instance v0, Lcom/google/android/finsky/selfupdate/k;
 -
 -    move-object v1, p0
@ -368,7 +372,7 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    move-object v6, p3
 -
-    invoke-direct/range {v0 .. v6}, Lcom/google/android/finsky/selfupdate/k;-><init>(Lcom/google/android/finsky/selfupdate/i;Lcom/google/common/util/concurrent/an;Lcom/google/android/finsky/analytics/az;ILcom/google/android/finsky/api/b;Lcom/google/android/finsky/bt/i;)V
+-    invoke-direct/range {v0 .. v6}, Lcom/google/android/finsky/selfupdate/k;-><init>(Lcom/google/android/finsky/selfupdate/i;Lcom/google/common/util/concurrent/an;Lcom/google/android/finsky/analytics/az;ILcom/google/android/finsky/api/b;Lcom/google/android/finsky/bt/h;)V
 -
 -    iget-object v1, p0, Lcom/google/android/finsky/selfupdate/i;->j:Ljava/util/concurrent/Executor;
 -
@ -391,7 +395,7 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -    :catchall_0
 -    move-exception v0
 -
-    .line 57
+-    .line 58
 -    invoke-static {v3}, Landroid/os/StrictMode;->setThreadPolicy(Landroid/os/StrictMode$ThreadPolicy;)V
 -
 -    throw v0
@ -401,34 +405,34 @@ diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/i.smali PS_1
 -
 -    const-string v1, "Could not cancel existing self update job."
 -
-    .line 58
+-    .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 59
-    invoke-virtual {p0, v1}, Lcom/google/android/finsky/selfupdate/i;->b(I)Lcom/google/android/finsky/analytics/k;
+-    .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 60
-    invoke-virtual {v1, v0}, Lcom/google/android/finsky/analytics/k;->a(Ljava/lang/Throwable;)Lcom/google/android/finsky/analytics/k;
+-    .line 61
+-    invoke-virtual {v1, v0}, Lcom/google/android/finsky/analytics/j;->a(Ljava/lang/Throwable;)Lcom/google/android/finsky/analytics/j;
 -
 -    move-result-object v0
 -
-    .line 61
-    invoke-virtual {p4, v0}, Lcom/google/android/finsky/analytics/az;->a(Lcom/google/android/finsky/analytics/k;)Lcom/google/android/finsky/analytics/az;
+-    .line 62
+-    invoke-virtual {p4, v0}, 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/k;
-diff -Nupr PS_13219.orig/smali/com/google/android/finsky/selfupdate/p.smali PS_13219/smali/com/google/android/finsky/selfupdate/p.smali
--- PS_13219.orig/smali/com/google/android/finsky/selfupdate/p.smali	2019-01-20 17:26:37.026526874 +0100
-+++ PS_13219/smali/com/google/android/finsky/selfupdate/p.smali	2019-01-23 21:39:45.876393165 +0100
-@@ -315,7 +315,7 @@
+ .method final b(I)Lcom/google/android/finsky/analytics/j;
+diff -Nupr PS_13316.orig/smali/com/google/android/finsky/selfupdate/p.smali PS_13316/smali/com/google/android/finsky/selfupdate/p.smali
+--- PS_13316.orig/smali/com/google/android/finsky/selfupdate/p.smali	2019-01-25 16:24:26.048475951 +0100
+++ PS_13316/smali/com/google/android/finsky/selfupdate/p.smali	2019-01-25 16:30:30.605490171 +0100
+@@ -306,7 +306,7 @@
     .line 24
     move-object/from16 v0, p0