Skip to content

Commit aad95d1

Browse files
author
mochangming
committed
Upload updates
1 parent e8392dc commit aad95d1

12 files changed

Lines changed: 164 additions & 45 deletions

File tree

‎framework.jar.out/smali/android/net/MobileDataStateTracker.smali‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,11 @@
274274

275275
invoke-direct {p0}, Landroid/net/BaseNetworkStateTracker;-><init>()V
276276

277-
invoke-static {}, Lmiui/telephony/MultiSimManager;->getInstance()Lmiui/telephony/MultiSimManager;
277+
invoke-static {}, Lmiui/telephony/TelephonyManager;->getDefault()Lmiui/telephony/TelephonyManager;
278278

279279
move-result-object v2
280280

281-
invoke-virtual {v2}, Lmiui/telephony/MultiSimManager;->getMultiSimCount()I
281+
invoke-virtual {v2}, Lmiui/telephony/TelephonyManager;->getPhoneCount()I
282282

283283
move-result v2
284284

@@ -643,11 +643,11 @@
643643
.param p1, "forceRefresh" # Z
644644

645645
.prologue
646-
invoke-static {}, Lmiui/telephony/MultiSimManager;->getInstance()Lmiui/telephony/MultiSimManager;
646+
invoke-static {}, Lmiui/telephony/TelephonyManager;->getDefault()Lmiui/telephony/TelephonyManager;
647647

648648
move-result-object v2
649649

650-
invoke-virtual {v2}, Lmiui/telephony/MultiSimManager;->getMultiSimCount()I
650+
invoke-virtual {v2}, Lmiui/telephony/TelephonyManager;->getPhoneCount()I
651651

652652
move-result v0
653653

@@ -1160,11 +1160,11 @@
11601160

11611161
invoke-direct {p0, v3}, Landroid/net/MobileDataStateTracker;->getPhoneService(Z)V
11621162

1163-
invoke-static {}, Lmiui/telephony/MultiSimManager;->getInstance()Lmiui/telephony/MultiSimManager;
1163+
invoke-static {}, Lmiui/telephony/SubscriptionManager;->getDefault()Lmiui/telephony/SubscriptionManager;
11641164

11651165
move-result-object v3
11661166

1167-
invoke-virtual {v3}, Lmiui/telephony/MultiSimManager;->getPreferredDataSlotId()I
1167+
invoke-virtual {v3}, Lmiui/telephony/SubscriptionManager;->getDefaultDataSlotId()I
11681168

11691169
move-result v0
11701170

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@
7171
# setter for: Landroid/net/wifi/SupplicantStateTracker;->mNetworksDisabledDuringConnect:Z
7272
invoke-static {v0, v1}, Landroid/net/wifi/SupplicantStateTracker;->access$602(Landroid/net/wifi/SupplicantStateTracker;Z)Z
7373

74+
invoke-static {}, Landroid/net/wifi/SupplicantStateTrackerInjector;->handleNetworkConnectionComplete()V
75+
7476
:cond_0
7577
return-void
7678
.end method

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@
151151
# setter for: Landroid/net/wifi/SupplicantStateTracker;->mAssociationRejectCount:I
152152
invoke-static {v2, v4}, Landroid/net/wifi/SupplicantStateTracker;->access$702(Landroid/net/wifi/SupplicantStateTracker;I)I
153153

154+
iget v2, p1, Landroid/os/Message;->arg1:I
155+
156+
invoke-static {v2}, Landroid/net/wifi/SupplicantStateTrackerInjector;->handleConnectNetwork(I)V
157+
154158
goto :goto_0
155159

156160
:sswitch_4

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

Lines changed: 12 additions & 2 deletions
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 = 0x2
27+
.field private static final MAX_RETRIES_ON_AUTHENTICATION_FAILURE:I = 0x1
2828

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

@@ -407,7 +407,7 @@
407407
.end method
408408

409409
.method private handleNetworkConnectionFailure(II)V
410-
.locals 1
410+
.locals 2
411411
.param p1, "netId" # I
412412
.param p2, "disableReason" # I
413413

@@ -429,6 +429,16 @@
429429

430430
invoke-virtual {v0, p1, p2}, Landroid/net/wifi/WifiConfigStore;->disableNetwork(II)Z
431431

432+
iget-object v0, p0, Landroid/net/wifi/SupplicantStateTracker;->mContext:Landroid/content/Context;
433+
434+
iget-object v1, p0, Landroid/net/wifi/SupplicantStateTracker;->mWifiConfigStore:Landroid/net/wifi/WifiConfigStore;
435+
436+
invoke-virtual {v1}, Landroid/net/wifi/WifiConfigStore;->getConfiguredNetworks()Ljava/util/List;
437+
438+
move-result-object v1
439+
440+
invoke-static {v0, v1, p1}, Landroid/net/wifi/SupplicantStateTrackerInjector;->handleNetworkConnectionFailure(Landroid/content/Context;Ljava/util/List;I)V
441+
432442
return-void
433443
.end method
434444

‎framework.jar.out/smali/android/net/wifi/WifiStateMachine$ConnectModeState.smali‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@
666666

667667
const v11, 0x25001
668668

669-
invoke-virtual {v10, v11}, Landroid/net/wifi/SupplicantStateTracker;->sendMessage(I)V
669+
invoke-virtual {v10, v11, v2}, Landroid/net/wifi/SupplicantStateTracker;->sendMessage(II)V
670670

671671
iget-object v10, p0, Landroid/net/wifi/WifiStateMachine$ConnectModeState;->this$0:Landroid/net/wifi/WifiStateMachine;
672672

‎framework.jar.out/smali/android/provider/CallLog$Calls.smali‎

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@
8888

8989
.field public static final VOICEMAIL_URI:Ljava/lang/String; = "voicemail_uri"
9090

91+
.field public static final SUBSCRIPTION:Ljava/lang/String;
92+
9193

9294
# direct methods
9395
.method static constructor <clinit>()V
@@ -130,6 +132,10 @@
130132

131133
sput-object v0, Landroid/provider/CallLog$Calls;->CONTENT_URI_WITH_VOICEMAIL:Landroid/net/Uri;
132134

135+
sget-object v0, Lmiui/telephony/SubscriptionManager;->SLOT_KEY:Ljava/lang/String;
136+
137+
sput-object v0, Landroid/provider/CallLog$Calls;->SUBSCRIPTION:Ljava/lang/String;
138+
133139
return-void
134140
.end method
135141

@@ -143,7 +149,7 @@
143149
.end method
144150

145151
.method public static addCall(Lcom/android/internal/telephony/CallerInfo;Landroid/content/Context;Ljava/lang/String;IIJI)Landroid/net/Uri;
146-
.locals 16
152+
.locals 9
147153
.param p0, "ci" # Lcom/android/internal/telephony/CallerInfo;
148154
.param p1, "context" # Landroid/content/Context;
149155
.param p2, "number" # Ljava/lang/String;
@@ -152,6 +158,46 @@
152158
.param p5, "start" # J
153159
.param p7, "duration" # I
154160

161+
.prologue
162+
invoke-static {}, Lmiui/telephony/SubscriptionManager;->getDefault()Lmiui/telephony/SubscriptionManager;
163+
164+
move-result-object v0
165+
166+
invoke-virtual {v0}, Lmiui/telephony/SubscriptionManager;->getDefaultSlotId()I
167+
168+
move-result v8
169+
170+
move-object v0, p0
171+
172+
move-object v1, p1
173+
174+
move-object v2, p2
175+
176+
move v3, p3
177+
178+
move v4, p4
179+
180+
move-wide v5, p5
181+
182+
move/from16 v7, p7
183+
184+
invoke-static/range {v0 .. v8}, Landroid/provider/CallLog$Calls;->addCall(Lcom/android/internal/telephony/CallerInfo;Landroid/content/Context;Ljava/lang/String;IIJII)Landroid/net/Uri;
185+
186+
move-result-object v0
187+
188+
return-object v0
189+
.end method
190+
191+
.method public static addCall(Lcom/android/internal/telephony/CallerInfo;Landroid/content/Context;Ljava/lang/String;IIJII)Landroid/net/Uri;
192+
.locals 16
193+
.param p0, "ci" # Lcom/android/internal/telephony/CallerInfo;
194+
.param p1, "context" # Landroid/content/Context;
195+
.param p2, "number" # Ljava/lang/String;
196+
.param p3, "presentation" # I
197+
.param p4, "callType" # I
198+
.param p5, "start" # J
199+
.param p8, "subscription" # I
200+
155201
.prologue
156202
invoke-virtual/range {p1 .. p1}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
157203

@@ -427,9 +473,6 @@
427473

428474
move-result-object v12
429475

430-
.local v12, "result":Landroid/net/Uri;
431-
invoke-static/range {p1 .. p1}, Landroid/provider/CallLog$Calls;->removeExpiredEntries(Landroid/content/Context;)V
432-
433476
return-object v12
434477

435478
.end local v12 # "result":Landroid/net/Uri;

‎framework.jar.out/smali/android/telephony/PhoneStateListener.smali‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,16 @@
7979

8080
iput-object v0, p0, Landroid/telephony/PhoneStateListener;->mHandler:Landroid/os/Handler;
8181

82-
new-instance v0, Landroid/telephony/PhoneStateListener;
83-
84-
invoke-direct {v0}, Landroid/telephony/PhoneStateListener;-><init>()V
85-
8682
return-void
8783
.end method
8884

85+
.method public updateSubscription(I)I
86+
.locals 0
87+
.param p1, "slotId" # I
88+
89+
.prologue
90+
return p1
91+
.end method
8992

9093
# virtual methods
9194
.method public onCallForwardingIndicatorChanged(Z)V

‎framework.jar.out/smali/android/telephony/TelephonyManager.smali‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3740,3 +3740,42 @@
37403740

37413741
goto :goto_0
37423742
.end method
3743+
3744+
.method public static from(Landroid/content/Context;I)Landroid/telephony/TelephonyManager;
3745+
.locals 1
3746+
.param p0, "context" # Landroid/content/Context;
3747+
.param p1, "slotId" # I
3748+
3749+
.prologue
3750+
invoke-static {p0}, Landroid/telephony/TelephonyManager;->from(Landroid/content/Context;)Landroid/telephony/TelephonyManager;
3751+
3752+
move-result-object v0
3753+
3754+
return-object v0
3755+
.end method
3756+
3757+
.method public static getDefault(I)Landroid/telephony/TelephonyManager;
3758+
.locals 1
3759+
.param p0, "slotId" # I
3760+
3761+
.prologue
3762+
sget-object v0, Landroid/telephony/TelephonyManager;->sInstance:Landroid/telephony/TelephonyManager;
3763+
3764+
return-object v0
3765+
.end method
3766+
3767+
.method public setDefaultDataSlotId(I)V
3768+
.locals 0
3769+
.param p1, "slotId" # I
3770+
3771+
.prologue
3772+
return-void
3773+
.end method
3774+
3775+
.method public setDefaultVoiceSlotId(I)V
3776+
.locals 0
3777+
.param p1, "slotId" # I
3778+
3779+
.prologue
3780+
return-void
3781+
.end method

‎services.jar.out/smali/com/android/server/ConnectivityService.smali‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14945,11 +14945,11 @@
1494514945
.param p3, "binder" # Landroid/os/IBinder;
1494614946

1494714947
.prologue
14948-
invoke-static {}, Lmiui/telephony/MultiSimManager;->getInstance()Lmiui/telephony/MultiSimManager;
14948+
invoke-static {}, Lmiui/telephony/SubscriptionManager;->getDefault()Lmiui/telephony/SubscriptionManager;
1494914949

1495014950
move-result-object v1
1495114951

14952-
invoke-virtual {v1}, Lmiui/telephony/MultiSimManager;->getPreferredDataSlotId()I
14952+
invoke-virtual {v1}, Lmiui/telephony/SubscriptionManager;->getDefaultDataSlotId()I
1495314953

1495414954
move-result v0
1495514955

@@ -14982,11 +14982,11 @@
1498214982
.param p2, "feature" # Ljava/lang/String;
1498314983

1498414984
.prologue
14985-
invoke-static {}, Lmiui/telephony/MultiSimManager;->getInstance()Lmiui/telephony/MultiSimManager;
14985+
invoke-static {}, Lmiui/telephony/SubscriptionManager;->getDefault()Lmiui/telephony/SubscriptionManager;
1498614986

1498714987
move-result-object v1
1498814988

14989-
invoke-virtual {v1}, Lmiui/telephony/MultiSimManager;->getPreferredDataSlotId()I
14989+
invoke-virtual {v1}, Lmiui/telephony/SubscriptionManager;->getDefaultDataSlotId()I
1499014990

1499114991
move-result v0
1499214992

@@ -15019,24 +15019,17 @@
1501915019
.param p3, "binder" # Landroid/os/IBinder;
1502015020

1502115021
.prologue
15022-
const/4 v3, -0x1
15023-
15024-
move/from16 v0, p4
15022+
invoke-static/range {p4 .. p4}, Lmiui/telephony/SubscriptionManager;->isValidSlotId(I)Z
1502515023

15026-
if-le v0, v3, :cond_miui_0
15027-
15028-
const/4 v3, 0x3
15029-
15030-
move/from16 v0, p4
15024+
move-result v3
1503115025

15032-
if-le v0, v3, :cond_miui_1
15026+
if-nez v3, :cond_miui_0
1503315027

15034-
:cond_miui_0
1503515028
const/4 v3, 0x3
1503615029

1503715030
return v3
1503815031

15039-
:cond_miui_1
15032+
:cond_miui_0
1504015033
const-wide/16 v14, 0x0
1504115034

1504215035
.local v14, "startTime":J
@@ -16148,20 +16141,17 @@
1614816141
.param p2, "feature" # Ljava/lang/String;
1614916142

1615016143
.prologue
16151-
const/4 v1, 0x3
16144+
invoke-static {p3}, Lmiui/telephony/SubscriptionManager;->isValidSlotId(I)Z
1615216145

16153-
const/4 v2, 0x1
16146+
move-result v1
1615416147

16155-
const/4 v3, -0x1
16148+
if-nez v1, :cond_miui_0
1615616149

16157-
if-le p3, v3, :cond_miui_0
16150+
const/4 v2, 0x3
1615816151

16159-
if-le p3, v1, :cond_miui_1
16152+
return v2
1616016153

1616116154
:cond_miui_0
16162-
return v1
16163-
16164-
:cond_miui_1
1616516155
const/4 v6, 0x1
1616616156

1616716157
invoke-direct {p0}, Lcom/android/server/ConnectivityService;->enforceChangePermission()V

‎services.jar.out/smali/com/android/server/NotificationManagerService$6.smali‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,19 @@
253253

254254
iget-boolean v4, v0, Lcom/android/server/NotificationManagerService$6;->val$isSystemNotification:Z
255255

256-
if-nez v4, :cond_2
256+
if-eqz v4, :cond_miui
257+
258+
move-object/from16 v0, p0
259+
260+
iget-object v4, v0, Lcom/android/server/NotificationManagerService$6;->val$pkg:Ljava/lang/String;
261+
262+
invoke-static {v4}, Lmiui/util/NotificationFilterHelper;->canSystemNotificationBeBlocked(Ljava/lang/String;)Z
263+
264+
move-result v4
265+
266+
if-eqz v4, :cond_2
257267

268+
:cond_miui
258269
const/16 v9, -0x3e8
259270

260271
const-string v4, "NotificationService"

0 commit comments

Comments
 (0)