| | | |
Offset 66, 20 lines modified | Offset 66, 20 lines modified |
66 | import·android.net.CaptivePortalData$Builder; | 66 | import·android.net.CaptivePortalData$Builder; |
67 | import·com.android.wifi.x.com.android.modules.utils.build.SdkLevel; | 67 | import·com.android.wifi.x.com.android.modules.utils.build.SdkLevel; |
68 | import·android.net.wifi.SupplicantState; | 68 | import·android.net.wifi.SupplicantState; |
69 | import·android.os.Message; | 69 | import·android.os.Message; |
70 | import·android.net.KeepalivePacketData; | 70 | import·android.net.KeepalivePacketData; |
71 | import·android.os.PowerManager; | 71 | import·android.os.PowerManager; |
72 | import·android.os.Looper; | 72 | import·android.os.Looper; |
73 | import·android.net.Network; | |
74 | import·android.net.wifi.hotspot2.IProvisioningCallback; | 73 | import·android.net.wifi.hotspot2.IProvisioningCallback; |
75 | import·android.net.wifi.hotspot2.OsuProvider; | 74 | import·android.net.wifi.hotspot2.OsuProvider; |
76 | import·android.net.wifi.WifiInfo; | |
77 | import·android.content.Intent; | 75 | import·android.content.Intent; |
| 76 | import·android.net.wifi.WifiInfo; |
78 | import·android.net.wifi.ScanResult; | 77 | import·android.net.wifi.ScanResult; |
| 78 | import·android.net.Network; |
79 | import·com.android.server.wifi.util.WifiPermissionsUtil; | 79 | import·com.android.server.wifi.util.WifiPermissionsUtil; |
80 | import·android.net.vcn.VcnManager; | 80 | import·android.net.vcn.VcnManager; |
81 | import·java.net.URL; | 81 | import·java.net.URL; |
82 | import·android.telephony.TelephonyManager; | 82 | import·android.telephony.TelephonyManager; |
83 | import·android.net.wifi.WifiConfiguration; | 83 | import·android.net.wifi.WifiConfiguration; |
84 | import·android.os.PowerManager$WakeLock; | 84 | import·android.os.PowerManager$WakeLock; |
85 | import·com.android.server.wifi.hotspot2.PasspointManager; | 85 | import·com.android.server.wifi.hotspot2.PasspointManager; |
Offset 156, 20 lines modified | Offset 156, 19 lines modified |
156 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_OBSOLETE·=·253; | 156 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_OBSOLETE·=·253; |
157 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_OK·=·1; | 157 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_OK·=·1; |
158 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_PROCESSED·=·2; | 158 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_PROCESSED·=·2; |
159 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_REFUSED·=·255; | 159 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_REFUSED·=·255; |
160 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_UNKNOWN·=·0; | 160 | ····private·static·final·int·MESSAGE_HANDLING_STATUS_UNKNOWN·=·0; |
161 | ····private·static·final·String·NETWORKTYPE·=·"WIFI"; | 161 | ····private·static·final·String·NETWORKTYPE·=·"WIFI"; |
162 | ····public·static·final·short·NETWORK_NOT_FOUND_EVENT_THRESHOLD·=·3; | 162 | ····public·static·final·short·NETWORK_NOT_FOUND_EVENT_THRESHOLD·=·3; |
163 | ····public·static·final·int·NETWORK_STATUS_UNWANTED_DISABLE_AUTOJOIN·=·2; | 163 | ····private·static·final·int·NETWORK_STATUS_UNWANTED_DISABLE_AUTOJOIN·=·2; |
164 | ····private·static·final·int·NETWORK_STATUS_UNWANTED_DISCONNECT·=·0; | 164 | ····private·static·final·int·NETWORK_STATUS_UNWANTED_DISCONNECT·=·0; |
165 | ····private·static·final·int·NETWORK_STATUS_UNWANTED_VALIDATION_FAILED·=·1; | 165 | ····private·static·final·int·NETWORK_STATUS_UNWANTED_VALIDATION_FAILED·=·1; |
166 | ····public·static·final·short·NUM_LOG_RECS_VERBOSE·=·3000; | 166 | ····public·static·final·short·NUM_LOG_RECS_VERBOSE·=·3000; |
167 | ····public·static·final·short·NUM_LOG_RECS_VERBOSE_LOW_MEMORY·=·200; | 167 | ····public·static·final·short·NUM_LOG_RECS_VERBOSE_LOW_MEMORY·=·200; |
168 | ····public·static·final·int·PROBABILITY_WITH_INTERNET_TO_PERMANENTLY_DISABLE_NETWORK·=·60; | |
169 | ····static·final·int·RESET_SIM_REASON_DEFAULT_DATA_SIM_CHANGED·=·2; | 168 | ····static·final·int·RESET_SIM_REASON_DEFAULT_DATA_SIM_CHANGED·=·2; |
170 | ····static·final·int·RESET_SIM_REASON_SIM_INSERTED·=·1; | 169 | ····static·final·int·RESET_SIM_REASON_SIM_INSERTED·=·1; |
171 | ····static·final·int·RESET_SIM_REASON_SIM_REMOVED·=·0; | 170 | ····static·final·int·RESET_SIM_REASON_SIM_REMOVED·=·0; |
172 | ····static·final·int·ROAM_GUARD_TIMER_MSEC·=·15000; | 171 | ····static·final·int·ROAM_GUARD_TIMER_MSEC·=·15000; |
173 | ····public·static·final·String·SUPPLICANT_BSSID_ANY·=·"any"; | 172 | ····public·static·final·String·SUPPLICANT_BSSID_ANY·=·"any"; |
174 | ····private·static·final·int·SUSPEND_DUE_TO_DHCP·=·1; | 173 | ····private·static·final·int·SUSPEND_DUE_TO_DHCP·=·1; |
175 | ····private·static·final·int·SUSPEND_DUE_TO_HIGH_PERF·=·2; | 174 | ····private·static·final·int·SUSPEND_DUE_TO_HIGH_PERF·=·2; |
Offset 1919, 24 lines modified | Offset 1918, 24 lines modified |
1919 | ········//·····7:·astore_3······· | 1918 | ········//·····7:·astore_3······· |
1920 | ········//·····8:·aload_3········ | 1919 | ········//·····8:·aload_3········ |
1921 | ········//·····9:·ifnull··········13 | 1920 | ········//·····9:·ifnull··········13 |
1922 | ········//····12:·return········· | 1921 | ········//····12:·return········· |
1923 | ········//····13:·aload_2········ | 1922 | ········//····13:·aload_2········ |
1924 | ········//····14:·invokeinterface·java/util/List.stream:()invokeinterface!!!·ERROR | 1923 | ········//····14:·invokeinterface·java/util/List.stream:()invokeinterface!!!·ERROR |
1925 | ········//····19:·astore_2······· | 1924 | ········//····19:·astore_2······· |
1926 | ········//····20:·new·············Lcom/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda7; | 1925 | ········//····20:·new·············Lcom/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda6; |
1927 | ········//····23:·astore_3······· | 1926 | ········//····23:·astore_3······· |
1928 | ········//····24:·aload_3········ | 1927 | ········//····24:·aload_3········ |
1929 | ········//····25:·aload_1········ | 1928 | ········//····25:·aload_1········ |
1930 | ········//····26:·invokespecial···com/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda7.<init>:(Landroid/net/wifi/WifiConfiguration;)V | 1929 | ········//····26:·invokespecial···com/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda6.<init>:(Landroid/net/wifi/WifiConfiguration;)V |
1931 | ········//····29:·aload_2········ | 1930 | ········//····29:·aload_2········ |
1932 | ········//····30:·aload_3········ | 1931 | ········//····30:·aload_3········ |
1933 | ········//····31:·invokeinterface·invokeinterface!!!·ERROR | 1932 | ········//····31:·invokeinterface·invokeinterface!!!·ERROR |
1934 | ········//····36:·astore_2······· | 1933 | ········//····36:·astore_2······· |
1935 | ········//····37:·getstatic·······com/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda5.INSTANCE:Lcom/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda5; | 1934 | ········//····37:·getstatic·······com/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda4.INSTANCE:Lcom/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda4; |
1936 | ········//····40:·astore_3······· | 1935 | ········//····40:·astore_3······· |
1937 | ········//····41:·aload_2········ | 1936 | ········//····41:·aload_2········ |
1938 | ········//····42:·aload_3········ | 1937 | ········//····42:·aload_3········ |
1939 | ········//····43:·invokeinterface·invokeinterface!!!·ERROR | 1938 | ········//····43:·invokeinterface·invokeinterface!!!·ERROR |
1940 | ········//····48:·astore_2······· | 1939 | ········//····48:·astore_2······· |
1941 | ········//····49:·invokestatic····invokestatic···!!!·ERROR | 1940 | ········//····49:·invokestatic····invokestatic···!!!·ERROR |
1942 | ········//····52:·astore_3······· | 1941 | ········//····52:·astore_3······· |
Offset 2021, 15 lines modified | Offset 2020, 15 lines modified |
2021 | ········//···201:·ldc_w···········"Cannot·select·a·candidate·security·params·from·scan·results,try·to·select·the·first·available·security·params." | 2020 | ········//···201:·ldc_w···········"Cannot·select·a·candidate·security·params·from·scan·results,try·to·select·the·first·available·security·params." |
2022 | ········//···204:·invokestatic····android/util/Log.i:(Ljava/lang/String;Ljava/lang/String;)I | 2021 | ········//···204:·invokestatic····android/util/Log.i:(Ljava/lang/String;Ljava/lang/String;)I |
2023 | ········//···207:·pop············ | 2022 | ········//···207:·pop············ |
2024 | ········//···208:·aload_1········ | 2023 | ········//···208:·aload_1········ |
2025 | ········//···209:·invokevirtual···android/net/wifi/WifiConfiguration.getSecurityParamsList:()Ljava/util/List; | 2024 | ········//···209:·invokevirtual···android/net/wifi/WifiConfiguration.getSecurityParamsList:()Ljava/util/List; |
2026 | ········//···212:·invokeinterface·java/util/List.stream:()invokeinterface!!!·ERROR | 2025 | ········//···212:·invokeinterface·java/util/List.stream:()invokeinterface!!!·ERROR |
2027 | ········//···217:·astore_2······· | 2026 | ········//···217:·astore_2······· |
2028 | ········//···218:·getstatic·······com/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda8.INSTANCE:Lcom/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda8; | 2027 | ········//···218:·getstatic·······com/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda7.INSTANCE:Lcom/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda7; |
2029 | ········//···221:·astore_3······· | 2028 | ········//···221:·astore_3······· |
2030 | ········//···222:·aload_2········ | 2029 | ········//···222:·aload_2········ |
2031 | ········//···223:·aload_3········ | 2030 | ········//···223:·aload_3········ |
2032 | ········//···224:·invokeinterface·invokeinterface!!!·ERROR | 2031 | ········//···224:·invokeinterface·invokeinterface!!!·ERROR |
2033 | ········//···229:·invokeinterface·invokeinterface!!!·ERROR | 2032 | ········//···229:·invokeinterface·invokeinterface!!!·ERROR |
2034 | ········//···234:·aconst_null···· | 2033 | ········//···234:·aconst_null···· |
2035 | ········//···235:·invokevirtual···java/util/Optional.orElse:(Ljava/lang/Object;)Ljava/lang/Object; | 2034 | ········//···235:·invokevirtual···java/util/Optional.orElse:(Ljava/lang/Object;)Ljava/lang/Object; |
Offset 2983, 15 lines modified | Offset 2982, 15 lines modified |
2983 | ········//···110:·return········· | 2982 | ········//···110:·return········· |
2984 | ········//···111:·new·············Ljava/util/ArrayList; | 2983 | ········//···111:·new·············Ljava/util/ArrayList; |
2985 | ········//···114:·astore··········5 | 2984 | ········//···114:·astore··········5 |
2986 | ········//···116:·aload_2········ | 2985 | ········//···116:·aload_2········ |
2987 | ········//···117:·invokeinterface·java/util/Map.values:()Ljava/util/Collection; | 2986 | ········//···117:·invokeinterface·java/util/Map.values:()Ljava/util/Collection; |
2988 | ········//···122:·invokeinterface·java/util/Collection.stream:()invokeinterface!!!·ERROR | 2987 | ········//···122:·invokeinterface·java/util/Collection.stream:()invokeinterface!!!·ERROR |
2989 | ········//···127:·astore··········6 | 2988 | ········//···127:·astore··········6 |
2990 | ········//···129:·getstatic·······com/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda6.INSTANCE:Lcom/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda6; | 2989 | ········//···129:·getstatic·······com/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda5.INSTANCE:Lcom/android/server/wifi/ClientModeImpl$$ExternalSyntheticLambda5; |
2991 | ········//···132:·astore··········8 | 2990 | ········//···132:·astore··········8 |
2992 | ········//···134:·aload···········6 | 2991 | ········//···134:·aload···········6 |
2993 | ········//···136:·aload···········8 | 2992 | ········//···136:·aload···········8 |
2994 | ········//···138:·invokeinterface·invokeinterface!!!·ERROR | 2993 | ········//···138:·invokeinterface·invokeinterface!!!·ERROR |
2995 | ········//···143:·astore··········6 | 2994 | ········//···143:·astore··········6 |
2996 | ········//···145:·invokestatic····invokestatic···!!!·ERROR | 2995 | ········//···145:·invokestatic····invokestatic···!!!·ERROR |
2997 | ········//···148:·astore··········8 | 2996 | ········//···148:·astore··········8 |
Offset 4201, 15 lines modified | Offset 4200, 15 lines modified |
4201 | ········} | 4200 | ········} |
4202 | ········else·{ | 4201 | ········else·{ |
4203 | ············this.mWifiNative.simAuthFailedResponse(this.mInterfaceName); | 4202 | ············this.mWifiNative.simAuthFailedResponse(this.mInterfaceName); |
4204 | ········} | 4203 | ········} |
4205 | ····} | 4204 | ····} |
4206 | ···· | 4205 | ···· |
4207 | ····public·void·handleIfaceDestroyed()·{ | 4206 | ····public·void·handleIfaceDestroyed()·{ |
4208 | ········this.mWifiThreadRunner.post((Runnable)new·ClientModeImpl$$ExternalSyntheticLambda4(this)); | 4207 | ········this.handleNetworkDisconnect(false,·10000); |
4209 | ····} | 4208 | ····} |
4210 | ···· | 4209 | ···· |
4211 | ····void·handlePostDhcpSetup()·{ | 4210 | ····void·handlePostDhcpSetup()·{ |
4212 | ········final·int·powerSave·=·1; | 4211 | ········final·int·powerSave·=·1; |
4213 | ········this.setSuspendOptimizationsNative(powerSave,·powerSave·!=·0); | 4212 | ········this.setSuspendOptimizationsNative(powerSave,·powerSave·!=·0); |
4214 | ········this.setPowerSave(powerSave·!=·0); | 4213 | ········this.setPowerSave(powerSave·!=·0); |
4215 | ········this.mWifiP2pConnection.sendMessage(143375,·0); | 4214 | ········this.mWifiP2pConnection.sendMessage(143375,·0); |
Offset 4504, 33 lines modified | Offset 4503, 33 lines modified |
4504 | ········if·(mVcnPolicyChangeListener·!=·null)·{ | 4503 | ········if·(mVcnPolicyChangeListener·!=·null)·{ |
4505 | ············this.mVcnManager.removeVcnNetworkPolicyChangeListener((VcnManager$VcnNetworkPolicyChangeListener)mVcnPolicyChangeListener); | 4504 | ············this.mVcnManager.removeVcnNetworkPolicyChangeListener((VcnManager$VcnNetworkPolicyChangeListener)mVcnPolicyChangeListener); |
4506 | ············this.mVcnPolicyChangeListener·=·null; | 4505 | ············this.mVcnPolicyChangeListener·=·null; |
4507 | ········} | 4506 | ········} |
4508 | ····} | 4507 | ····} |
4509 | ···· | 4508 | ···· |
4510 | ····public·Network·syncGetCurrentNetwork()·{ | 4509 | ····public·Network·syncGetCurrentNetwork()·{ |
4511 | ········return·(Network)this.mWifiThreadRunner.call((Supplier)new·ClientModeImpl$$ExternalSyntheticLambda10(this),·(Object)null); | 4510 | ········return·(Network)this.mWifiThreadRunner.call((Supplier)new·ClientModeImpl$$ExternalSyntheticLambda8(this),·(Object)null); |
4512 | ····} | 4511 | ····} |
4513 | ···· | 4512 | ···· |
4514 | ····public·DhcpResultsParcelable·syncGetDhcpResultsParcelable()·{ | 4513 | ····public·DhcpResultsParcelable·syncGetDhcpResultsParcelable()·{ |
4515 | ········synchronized·(this.mDhcpResultsParcelableLock)·{ | 4514 | ········synchronized·(this.mDhcpResultsParcelableLock)·{ |
4516 | ············return·this.mDhcpResultsParcelable; | 4515 | ············return·this.mDhcpResultsParcelable; |
4517 | ········} | 4516 | ········} |
4518 | ····} | 4517 | ····} |
4519 | ···· | 4518 | ···· |
4520 | ····public·boolean·syncQueryPasspointIcon(final·long·n,·final·String·s)·{ | 4519 | ····public·boolean·syncQueryPasspointIcon(final·long·n,·final·String·s)·{ |
4521 | ········return·(boolean)this.mWifiThreadRunner.call((Supplier)new·ClientModeImpl$$ExternalSyntheticLambda12(this,·n,·s),·(Object)Boolean.FALSE); | 4520 | ········return·(boolean)this.mWifiThreadRunner.call((Supplier)new·ClientModeImpl$$ExternalSyntheticLambda11(this,·n,·s),·(Object)Boolean.FALSE); |
4522 | ····} | 4521 | ····} |
4523 | ···· | 4522 | ···· |
4524 | ····public·WifiInfo·syncRequestConnectionInfo()·{ | 4523 | ····public·WifiInfo·syncRequestConnectionInfo()·{ |
4525 | ········return·(WifiInfo)this.mWifiThreadRunner.call((Supplier)new·ClientModeImpl$$ExternalSyntheticLambda9(this),·(Object)new·WifiInfo()); | 4524 | ········return·(WifiInfo)this.mWifiThreadRunner.call((Supplier)new·ClientModeImpl$$ExternalSyntheticLambda9(this),·(Object)new·WifiInfo()); |
4526 | ····} | 4525 | ····} |
4527 | ···· | 4526 | ···· |
4528 | ····public·boolean·syncStartSubscriptionProvisioning(final·int·n,·final·OsuProvider·osuProvider,·final·IProvisioningCallback·provisioningCallback)·{ | 4527 | ····public·boolean·syncStartSubscriptionProvisioning(final·int·n,·final·OsuProvider·osuProvider,·final·IProvisioningCallback·provisioningCallback)·{ |
4529 | ········return·(boolean)this.mWifiThreadRunner.call((Supplier)new·ClientModeImpl$$ExternalSyntheticLambda11(this,·n,·osuProvider,·provisioningCallback),·(Object)Boolean.FALSE); | 4528 | ········return·(boolean)this.mWifiThreadRunner.call((Supplier)new·ClientModeImpl$$ExternalSyntheticLambda10(this,·n,·osuProvider,·provisioningCallback),·(Object)Boolean.FALSE); |
4530 | ····} | 4529 | ····} |
4531 | ···· | 4530 | ···· |
4532 | ····public·void·updateCapabilities()·{ | 4531 | ····public·void·updateCapabilities()·{ |
4533 | ········this.updateCapabilities(this.getConnectedWifiConfigurationInternal()); | 4532 | ········this.updateCapabilities(this.getConnectedWifiConfigurationInternal()); |
4534 | ····} | 4533 | ····} |
4535 | ···· | 4534 | ···· |
4536 | ····void·updateWifiConfigOnStartConnection(final·WifiConfiguration·currentMacToFactoryMac,·String·anonymousIdentity)·{ | 4535 | ····void·updateWifiConfigOnStartConnection(final·WifiConfiguration·currentMacToFactoryMac,·String·anonymousIdentity)·{ |