Skip to content

Commit 320f54c

Browse files
author
mochangming
committed
Upload updates
1 parent 70fe4df commit 320f54c

5 files changed

Lines changed: 79 additions & 119 deletions

File tree

‎framework.jar.out/smali/android/net/wifi/ScanResult$1.smali‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,20 @@
4040

4141
# virtual methods
4242
.method public createFromParcel(Landroid/os/Parcel;)Landroid/net/wifi/ScanResult;
43-
.locals 14
43+
.locals 12
4444
.param p1, "in" # Landroid/os/Parcel;
4545

4646
.prologue
47-
const/4 v12, 0x0
48-
49-
const/4 v11, 0x1
50-
5147
const/4 v1, 0x0
5248

5349
.local v1, "wifiSsid":Landroid/net/wifi/WifiSsid;
5450
invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
5551

5652
move-result v0
5753

58-
if-ne v0, v11, :cond_0
54+
const/4 v2, 0x1
55+
56+
if-ne v0, v2, :cond_0
5957

6058
sget-object v0, Landroid/net/wifi/WifiSsid;->CREATOR:Landroid/os/Parcelable$Creator;
6159

@@ -98,35 +96,17 @@
9896

9997
move-result v9
10098

101-
invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
102-
103-
move-result v10
104-
105-
if-ne v10, v11, :cond_1
106-
107-
move v10, v11
99+
invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
108100

109-
:goto_0
110-
invoke-virtual {p1}, Landroid/os/Parcel;->readInt()I
101+
move-result-object v10
111102

112-
move-result v13
103+
invoke-virtual {p1}, Landroid/os/Parcel;->readString()Ljava/lang/String;
113104

114-
if-ne v13, v11, :cond_2
105+
move-result-object v11
115106

116-
:goto_1
117-
invoke-direct/range {v0 .. v11}, Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;IIJIIZZ)V
107+
invoke-direct/range {v0 .. v11}, Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;IIJIILjava/lang/String;Ljava/lang/String;)V
118108

119109
return-object v0
120-
121-
:cond_1
122-
move v10, v12
123-
124-
goto :goto_0
125-
126-
:cond_2
127-
move v11, v12
128-
129-
goto :goto_1
130110
.end method
131111

132112
.method public bridge synthetic createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;

‎framework.jar.out/smali/android/net/wifi/ScanResult.smali‎

Lines changed: 32 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@
3434

3535
.field public frequency:I
3636

37-
.field public isWpsConfigured:Z
38-
39-
.field public isXiaomiRouter:Z
40-
4137
.field public level:I
4238

4339
.field public timestamp:J
4440

4541
.field public wifiSsid:Landroid/net/wifi/WifiSsid;
4642

43+
.field public wpsDeviceName:Ljava/lang/String;
44+
45+
.field public wpsState:Ljava/lang/String;
46+
4747

4848
# direct methods
4949
.method static constructor <clinit>()V
@@ -104,13 +104,13 @@
104104

105105
iput v0, p0, Landroid/net/wifi/ScanResult;->distanceSdCm:I
106106

107-
iget-boolean v0, p1, Landroid/net/wifi/ScanResult;->isWpsConfigured:Z
107+
iget-object v0, p1, Landroid/net/wifi/ScanResult;->wpsState:Ljava/lang/String;
108108

109-
iput-boolean v0, p0, Landroid/net/wifi/ScanResult;->isWpsConfigured:Z
109+
iput-object v0, p0, Landroid/net/wifi/ScanResult;->wpsState:Ljava/lang/String;
110110

111-
iget-boolean v0, p1, Landroid/net/wifi/ScanResult;->isXiaomiRouter:Z
111+
iget-object v0, p1, Landroid/net/wifi/ScanResult;->wpsDeviceName:Ljava/lang/String;
112112

113-
iput-boolean v0, p0, Landroid/net/wifi/ScanResult;->isXiaomiRouter:Z
113+
iput-object v0, p0, Landroid/net/wifi/ScanResult;->wpsDeviceName:Ljava/lang/String;
114114

115115
:cond_0
116116
return-void
@@ -157,9 +157,9 @@
157157

158158
const/4 v1, 0x0
159159

160-
iput-boolean v1, p0, Landroid/net/wifi/ScanResult;->isWpsConfigured:Z
160+
iput-object v1, p0, Landroid/net/wifi/ScanResult;->wpsState:Ljava/lang/String;
161161

162-
iput-boolean v1, p0, Landroid/net/wifi/ScanResult;->isXiaomiRouter:Z
162+
iput-object v1, p0, Landroid/net/wifi/ScanResult;->wpsDeviceName:Ljava/lang/String;
163163

164164
return-void
165165

@@ -169,23 +169,23 @@
169169
goto :goto_0
170170
.end method
171171

172-
.method public constructor <init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;IIJZZ)V
172+
.method public constructor <init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;IIJLjava/lang/String;Ljava/lang/String;)V
173173
.locals 2
174174
.param p1, "wifiSsid" # Landroid/net/wifi/WifiSsid;
175175
.param p2, "BSSID" # Ljava/lang/String;
176176
.param p3, "caps" # Ljava/lang/String;
177177
.param p4, "level" # I
178178
.param p5, "frequency" # I
179179
.param p6, "tsf" # J
180-
.param p8, "isWpsConfigured" # Z
181-
.param p9, "isXiaomiRouter" # Z
180+
.param p8, "wpsState" # Ljava/lang/String;
181+
.param p9, "wpsDeviceName" # Ljava/lang/String;
182182

183183
.prologue
184184
invoke-direct/range {p0 .. p7}, Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;IIJ)V
185185

186-
iput-boolean p8, p0, Landroid/net/wifi/ScanResult;->isWpsConfigured:Z
186+
iput-object p8, p0, Landroid/net/wifi/ScanResult;->wpsState:Ljava/lang/String;
187187

188-
iput-boolean p9, p0, Landroid/net/wifi/ScanResult;->isXiaomiRouter:Z
188+
iput-object p9, p0, Landroid/net/wifi/ScanResult;->wpsDeviceName:Ljava/lang/String;
189189

190190
return-void
191191
.end method
@@ -231,9 +231,9 @@
231231

232232
const/4 v0, 0x0
233233

234-
iput-boolean v0, p0, Landroid/net/wifi/ScanResult;->isWpsConfigured:Z
234+
iput-object v0, p0, Landroid/net/wifi/ScanResult;->wpsState:Ljava/lang/String;
235235

236-
iput-boolean v0, p0, Landroid/net/wifi/ScanResult;->isXiaomiRouter:Z
236+
iput-object v0, p0, Landroid/net/wifi/ScanResult;->wpsDeviceName:Ljava/lang/String;
237237

238238
return-void
239239

@@ -243,7 +243,7 @@
243243
goto :goto_0
244244
.end method
245245

246-
.method public constructor <init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;IIJIIZZ)V
246+
.method public constructor <init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;IIJIILjava/lang/String;Ljava/lang/String;)V
247247
.locals 1
248248
.param p1, "wifiSsid" # Landroid/net/wifi/WifiSsid;
249249
.param p2, "BSSID" # Ljava/lang/String;
@@ -253,15 +253,15 @@
253253
.param p6, "tsf" # J
254254
.param p8, "distCm" # I
255255
.param p9, "distSdCm" # I
256-
.param p10, "isWpsConfigured" # Z
257-
.param p11, "isXiaomiRouter" # Z
256+
.param p10, "wpsState" # Ljava/lang/String;
257+
.param p11, "wpsDeviceName" # Ljava/lang/String;
258258

259259
.prologue
260260
invoke-direct/range {p0 .. p9}, Landroid/net/wifi/ScanResult;-><init>(Landroid/net/wifi/WifiSsid;Ljava/lang/String;Ljava/lang/String;IIJII)V
261261

262-
iput-boolean p10, p0, Landroid/net/wifi/ScanResult;->isWpsConfigured:Z
262+
iput-object p10, p0, Landroid/net/wifi/ScanResult;->wpsState:Ljava/lang/String;
263263

264-
iput-boolean p11, p0, Landroid/net/wifi/ScanResult;->isXiaomiRouter:Z
264+
iput-object p11, p0, Landroid/net/wifi/ScanResult;->wpsDeviceName:Ljava/lang/String;
265265

266266
return-void
267267
.end method
@@ -425,27 +425,27 @@
425425

426426
invoke-virtual {v2, v3}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
427427

428-
const-string v2, ", isWpsConfigured :"
428+
const-string v2, ", wpsState :"
429429

430430
invoke-virtual {v1, v2}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
431431

432432
move-result-object v2
433433

434-
iget-boolean v3, p0, Landroid/net/wifi/ScanResult;->isWpsConfigured:Z
434+
iget-object v3, p0, Landroid/net/wifi/ScanResult;->wpsState:Ljava/lang/String;
435435

436-
invoke-virtual {v2, v3}, Ljava/lang/StringBuffer;->append(Z)Ljava/lang/StringBuffer;
436+
invoke-virtual {v2, v3}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
437437

438438
move-result-object v2
439439

440-
const-string v3, ", isXiaomiRouter :"
440+
const-string v3, ", wpsDeviceName :"
441441

442442
invoke-virtual {v2, v3}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
443443

444444
move-result-object v2
445445

446-
iget-boolean v3, p0, Landroid/net/wifi/ScanResult;->isXiaomiRouter:Z
446+
iget-object v3, p0, Landroid/net/wifi/ScanResult;->wpsDeviceName:Ljava/lang/String;
447447

448-
invoke-virtual {v2, v3}, Ljava/lang/StringBuffer;->append(Z)Ljava/lang/StringBuffer;
448+
invoke-virtual {v2, v3}, Ljava/lang/StringBuffer;->append(Ljava/lang/String;)Ljava/lang/StringBuffer;
449449

450450
invoke-virtual {v1}, Ljava/lang/StringBuffer;->toString()Ljava/lang/String;
451451

@@ -528,23 +528,13 @@
528528

529529
invoke-virtual {p1, v0}, Landroid/os/Parcel;->writeInt(I)V
530530

531-
iget-boolean v0, p0, Landroid/net/wifi/ScanResult;->isWpsConfigured:Z
532-
533-
if-eqz v0, :cond_miui_0
534-
535-
const/4 v0, 0x1
536-
537-
:goto_miui_0
538-
invoke-virtual {p1, v0}, Landroid/os/Parcel;->writeInt(I)V
531+
iget-object v0, p0, Landroid/net/wifi/ScanResult;->wpsState:Ljava/lang/String;
539532

540-
iget-boolean v0, p0, Landroid/net/wifi/ScanResult;->isXiaomiRouter:Z
533+
invoke-virtual {p1, v0}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
541534

542-
if-eqz v0, :cond_miui_1
543-
544-
const/4 v0, 0x1
535+
iget-object v0, p0, Landroid/net/wifi/ScanResult;->wpsDeviceName:Ljava/lang/String;
545536

546-
:goto_miui_1
547-
invoke-virtual {p1, v0}, Landroid/os/Parcel;->writeInt(I)V
537+
invoke-virtual {p1, v0}, Landroid/os/Parcel;->writeString(Ljava/lang/String;)V
548538

549539
return-void
550540

@@ -554,13 +544,4 @@
554544
invoke-virtual {p1, v0}, Landroid/os/Parcel;->writeInt(I)V
555545

556546
goto :goto_0
557-
:cond_miui_0
558-
const/4 v0, 0x0
559-
560-
goto :goto_miui_0
561-
562-
:cond_miui_1
563-
const/4 v0, 0x0
564-
565-
goto :goto_miui_1
566547
.end method

‎framework.jar.out/smali/android/net/wifi/SupplicantStateTracker$DisconnectedState.smali‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,24 @@
6060

6161
const/4 v3, 0x2
6262

63-
if-lt v2, v3, :cond_1
63+
if-ge v2, v3, :cond_miui_0
6464

65+
iget v2, v1, Landroid/net/wifi/StateChangeResult;->networkId:I
66+
67+
iget-object v3, p0, Landroid/net/wifi/SupplicantStateTracker$DisconnectedState;->this$0:Landroid/net/wifi/SupplicantStateTracker;
68+
69+
# getter for: Landroid/net/wifi/SupplicantStateTracker;->mAuthenticationFailuresCount:I
70+
invoke-static {v3}, Landroid/net/wifi/SupplicantStateTracker;->access_mAuthenticationFailuresCount(Landroid/net/wifi/SupplicantStateTracker;)I
71+
72+
move-result v3
73+
74+
invoke-static {v2, v3}, Landroid/net/wifi/SupplicantStateTrackerInjector;->isConformAuthFailure(II)Z
75+
76+
move-result v2
77+
78+
if-eqz v2, :cond_1
79+
80+
:cond_miui_0
6581
const-string v2, "SupplicantStateTracker"
6682

6783
new-instance v3, Ljava/lang/StringBuilder;

‎framework.jar.out/smali/android/net/wifi/SupplicantStateTracker.smali‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
.field private static final MAX_RETRIES_ON_ASSOCIATION_REJECT:I = 0x10
2626

27-
.field private static final MAX_RETRIES_ON_AUTHENTICATION_FAILURE:I = 0x1
27+
.field private static final MAX_RETRIES_ON_AUTHENTICATION_FAILURE:I = 0x2
2828

2929
.field private static final TAG:Ljava/lang/String; = "SupplicantStateTracker"
3030

@@ -673,3 +673,13 @@
673673

674674
return-void
675675
.end method
676+
677+
.method static synthetic access_mAuthenticationFailuresCount(Landroid/net/wifi/SupplicantStateTracker;)I
678+
.locals 1
679+
.param p0, "x0" # Landroid/net/wifi/SupplicantStateTracker;
680+
681+
.prologue
682+
iget v0, p0, Landroid/net/wifi/SupplicantStateTracker;->mAuthenticationFailuresCount:I
683+
684+
return v0
685+
.end method

0 commit comments

Comments
 (0)