Skip to content

Commit 0b5625c

Browse files
author
mochangming
committed
Upload updates
1 parent dd1d827 commit 0b5625c

5 files changed

Lines changed: 256 additions & 3 deletions

File tree

‎framework.jar.out/smali/android/net/CaptivePortalTracker$DelayedCaptiveCheckState.smali‎

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

7777
iget-object v1, p0, Landroid/net/CaptivePortalTracker$DelayedCaptiveCheckState;->this$0:Landroid/net/CaptivePortalTracker;
7878

79-
const-wide/16 v2, 0x2710
79+
const-wide/16 v2, 0x0
8080

8181
invoke-virtual {v1, v0, v2, v3}, Landroid/net/CaptivePortalTracker;->sendMessageDelayed(Landroid/os/Message;J)V
8282

‎framework.jar.out/smali/android/os/Build$VERSION.smali‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616

1717
# static fields
18+
.field public static final BASE_OS:Ljava/lang/String;
19+
1820
.field public static final CODENAME:Ljava/lang/String;
1921

2022
.field public static final INCREMENTAL:Ljava/lang/String;
@@ -30,6 +32,8 @@
3032

3133
.field public static final SDK_INT:I
3234

35+
.field public static final SECURITY_PATCH:Ljava/lang/String;
36+
3337

3438
# direct methods
3539
.method static constructor <clinit>()V
@@ -56,6 +60,26 @@
5660

5761
sput-object v1, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
5862

63+
const-string v1, "ro.build.version.base_os"
64+
65+
const-string v2, ""
66+
67+
invoke-static {v1, v2}, Landroid/os/SystemProperties;->get(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
68+
69+
move-result-object v1
70+
71+
sput-object v1, Landroid/os/Build$VERSION;->BASE_OS:Ljava/lang/String;
72+
73+
const-string v1, "ro.build.version.security_patch"
74+
75+
const-string v2, ""
76+
77+
invoke-static {v1, v2}, Landroid/os/SystemProperties;->get(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
78+
79+
move-result-object v1
80+
81+
sput-object v1, Landroid/os/Build$VERSION;->SECURITY_PATCH:Ljava/lang/String;
82+
5983
const-string v1, "ro.build.version.sdk"
6084

6185
# invokes: Landroid/os/Build;->getString(Ljava/lang/String;)Ljava/lang/String;

‎services.jar.out/smali/com/android/server/power/PowerManagerService.smali‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,23 @@
673673
monitor-enter v11
674674

675675
:try_start_0
676+
move-object/from16 v0, p3
677+
678+
move-object/from16 v1, p5
679+
680+
move/from16 v2, p6
681+
682+
invoke-static {v0, v1, v2}, Lcom/android/server/power/PowerManagerServiceInjector;->checkWakelockBlocked(Ljava/lang/String;Landroid/os/WorkSource;I)Z
683+
684+
move-result v4
685+
686+
if-eqz v4, :cond_miui_0
687+
688+
monitor-exit v11
689+
690+
return-void
691+
692+
:cond_miui_0
676693
invoke-direct {p0, p1}, Lcom/android/server/power/PowerManagerService;->findWakeLockIndexLocked(Landroid/os/IBinder;)I
677694

678695
move-result v10
@@ -2504,7 +2521,7 @@
25042521
return-void
25052522
.end method
25062523

2507-
.method private releaseWakeLockInternal(Landroid/os/IBinder;I)V
2524+
.method releaseWakeLockInternal(Landroid/os/IBinder;I)V
25082525
.locals 5
25092526
.param p1, "lock" # Landroid/os/IBinder;
25102527
.param p2, "flags" # I
@@ -6649,7 +6666,7 @@
66496666

66506667
.local v0, "ident":J
66516668
:try_start_0
6652-
invoke-direct {p0, p1, p2}, Lcom/android/server/power/PowerManagerService;->releaseWakeLockInternal(Landroid/os/IBinder;I)V
6669+
invoke-virtual {p0, p1, p2}, Lcom/android/server/power/PowerManagerService;->releaseWakeLockInternal(Landroid/os/IBinder;I)V
66536670
:try_end_0
66546671
.catchall {:try_start_0 .. :try_end_0} :catchall_0
66556672

‎telephony-common.jar.out/smali/com/android/internal/telephony/gsm/GSMPhone.smali‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2782,6 +2782,8 @@
27822782
:cond_0
27832783
:goto_0
27842784
:pswitch_0
2785+
invoke-direct {p0, p1}, Lcom/android/internal/telephony/gsm/GSMPhone;->adjustServiceNotification(Landroid/os/Message;)V
2786+
27852787
invoke-virtual {p0, p1}, Lcom/android/internal/telephony/gsm/GSMPhone;->checkAndNotifyDeviceId(Landroid/os/Message;)V
27862788

27872789
return-void
@@ -4549,3 +4551,128 @@
45494551

45504552
return-void
45514553
.end method
4554+
4555+
.method private adjustServiceNotification(Landroid/os/Message;)V
4556+
.locals 3
4557+
.param p1, "msg" # Landroid/os/Message;
4558+
4559+
.prologue
4560+
iget v2, p1, Landroid/os/Message;->what:I
4561+
4562+
packed-switch v2, :pswitch_data_0
4563+
4564+
:cond_0
4565+
:goto_0
4566+
return-void
4567+
4568+
:pswitch_0
4569+
iget-object v0, p1, Landroid/os/Message;->obj:Ljava/lang/Object;
4570+
4571+
check-cast v0, Landroid/os/AsyncResult;
4572+
4573+
.local v0, "ar":Landroid/os/AsyncResult;
4574+
iget-object v1, v0, Landroid/os/AsyncResult;->result:Ljava/lang/Object;
4575+
4576+
check-cast v1, Lcom/android/internal/telephony/gsm/SuppServiceNotification;
4577+
4578+
.local v1, "not":Lcom/android/internal/telephony/gsm/SuppServiceNotification;
4579+
iget v2, v1, Lcom/android/internal/telephony/gsm/SuppServiceNotification;->notificationType:I
4580+
4581+
if-nez v2, :cond_3
4582+
4583+
invoke-virtual {p0}, Lcom/android/internal/telephony/gsm/GSMPhone;->getRingingCall()Lcom/android/internal/telephony/gsm/GsmCall;
4584+
4585+
move-result-object v2
4586+
4587+
invoke-virtual {v2}, Lcom/android/internal/telephony/gsm/GsmCall;->getState()Lcom/android/internal/telephony/Call$State;
4588+
4589+
move-result-object v2
4590+
4591+
invoke-virtual {v2}, Lcom/android/internal/telephony/Call$State;->isRinging()Z
4592+
4593+
move-result v2
4594+
4595+
if-eqz v2, :cond_1
4596+
4597+
invoke-virtual {p0}, Lcom/android/internal/telephony/gsm/GSMPhone;->getRingingCall()Lcom/android/internal/telephony/gsm/GsmCall;
4598+
4599+
move-result-object v2
4600+
4601+
invoke-virtual {v2}, Lcom/android/internal/telephony/gsm/GsmCall;->getLatestConnection()Lcom/android/internal/telephony/Connection;
4602+
4603+
move-result-object v2
4604+
4605+
check-cast v2, Lcom/android/internal/telephony/gsm/GsmConnection;
4606+
4607+
invoke-virtual {v2, v1}, Lcom/android/internal/telephony/gsm/GsmConnection;->setSuppServiceNotification(Lcom/android/internal/telephony/gsm/SuppServiceNotification;)V
4608+
4609+
goto :goto_0
4610+
4611+
:cond_1
4612+
invoke-virtual {p0}, Lcom/android/internal/telephony/gsm/GSMPhone;->getForegroundCall()Lcom/android/internal/telephony/gsm/GsmCall;
4613+
4614+
move-result-object v2
4615+
4616+
invoke-virtual {v2}, Lcom/android/internal/telephony/gsm/GsmCall;->getState()Lcom/android/internal/telephony/Call$State;
4617+
4618+
move-result-object v2
4619+
4620+
invoke-virtual {v2}, Lcom/android/internal/telephony/Call$State;->isAlive()Z
4621+
4622+
move-result v2
4623+
4624+
if-eqz v2, :cond_2
4625+
4626+
invoke-virtual {p0}, Lcom/android/internal/telephony/gsm/GSMPhone;->getForegroundCall()Lcom/android/internal/telephony/gsm/GsmCall;
4627+
4628+
move-result-object v2
4629+
4630+
invoke-virtual {v2}, Lcom/android/internal/telephony/gsm/GsmCall;->getLatestConnection()Lcom/android/internal/telephony/Connection;
4631+
4632+
move-result-object v2
4633+
4634+
check-cast v2, Lcom/android/internal/telephony/gsm/GsmConnection;
4635+
4636+
invoke-virtual {v2, v1}, Lcom/android/internal/telephony/gsm/GsmConnection;->setSuppServiceNotification(Lcom/android/internal/telephony/gsm/SuppServiceNotification;)V
4637+
4638+
goto :goto_0
4639+
4640+
:cond_2
4641+
invoke-virtual {p0}, Lcom/android/internal/telephony/gsm/GSMPhone;->getBackgroundCall()Lcom/android/internal/telephony/gsm/GsmCall;
4642+
4643+
move-result-object v2
4644+
4645+
invoke-virtual {v2}, Lcom/android/internal/telephony/gsm/GsmCall;->getState()Lcom/android/internal/telephony/Call$State;
4646+
4647+
move-result-object v2
4648+
4649+
invoke-virtual {v2}, Lcom/android/internal/telephony/Call$State;->isAlive()Z
4650+
4651+
move-result v2
4652+
4653+
if-eqz v2, :cond_0
4654+
4655+
invoke-virtual {p0}, Lcom/android/internal/telephony/gsm/GSMPhone;->getBackgroundCall()Lcom/android/internal/telephony/gsm/GsmCall;
4656+
4657+
move-result-object v2
4658+
4659+
invoke-virtual {v2}, Lcom/android/internal/telephony/gsm/GsmCall;->getLatestConnection()Lcom/android/internal/telephony/Connection;
4660+
4661+
move-result-object v2
4662+
4663+
check-cast v2, Lcom/android/internal/telephony/gsm/GsmConnection;
4664+
4665+
invoke-virtual {v2, v1}, Lcom/android/internal/telephony/gsm/GsmConnection;->setSuppServiceNotification(Lcom/android/internal/telephony/gsm/SuppServiceNotification;)V
4666+
4667+
goto :goto_0
4668+
4669+
:cond_3
4670+
invoke-static {v1}, Lcom/android/internal/telephony/gsm/GsmConnection;->setIncomingCallSuppServiceNotification(Lcom/android/internal/telephony/gsm/SuppServiceNotification;)V
4671+
4672+
goto :goto_0
4673+
4674+
:pswitch_data_0
4675+
.packed-switch 0x2
4676+
:pswitch_0
4677+
.end packed-switch
4678+
.end method

‎telephony-common.jar.out/smali/com/android/internal/telephony/gsm/GsmConnection.smali‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929

3030
.field static final WAKE_LOCK_TIMEOUT_MILLIS:I = 0xea60
3131

32+
.field private static sIncomingCallSuppServiceNotification:Lcom/android/internal/telephony/gsm/SuppServiceNotification;
33+
3234

3335
# instance fields
3436
.field mAddress:Ljava/lang/String;
@@ -71,6 +73,8 @@
7173

7274
.field mPostDialString:Ljava/lang/String;
7375

76+
.field private mSuppServiceNotification:Lcom/android/internal/telephony/gsm/SuppServiceNotification;
77+
7478
.field mUusInfo:Lcom/android/internal/telephony/UUSInfo;
7579

7680

@@ -159,6 +163,8 @@
159163

160164
invoke-virtual {v0, p0, p2}, Lcom/android/internal/telephony/gsm/GsmCall;->attach(Lcom/android/internal/telephony/Connection;Lcom/android/internal/telephony/DriverCall;)V
161165

166+
invoke-direct {p0}, Lcom/android/internal/telephony/gsm/GsmConnection;->adjustServiceNotification()V
167+
162168
return-void
163169
.end method
164170

@@ -2067,3 +2073,82 @@
20672073

20682074
goto :goto_3
20692075
.end method
2076+
2077+
.method private adjustServiceNotification()V
2078+
.locals 1
2079+
2080+
.prologue
2081+
iget-boolean v0, p0, Lcom/android/internal/telephony/gsm/GsmConnection;->mIsIncoming:Z
2082+
2083+
if-eqz v0, :cond_0
2084+
2085+
sget-object v0, Lcom/android/internal/telephony/gsm/GsmConnection;->sIncomingCallSuppServiceNotification:Lcom/android/internal/telephony/gsm/SuppServiceNotification;
2086+
2087+
if-eqz v0, :cond_0
2088+
2089+
sget-object v0, Lcom/android/internal/telephony/gsm/GsmConnection;->sIncomingCallSuppServiceNotification:Lcom/android/internal/telephony/gsm/SuppServiceNotification;
2090+
2091+
invoke-virtual {p0, v0}, Lcom/android/internal/telephony/gsm/GsmConnection;->setSuppServiceNotification(Lcom/android/internal/telephony/gsm/SuppServiceNotification;)V
2092+
2093+
:cond_0
2094+
const/4 v0, 0x0
2095+
2096+
sput-object v0, Lcom/android/internal/telephony/gsm/GsmConnection;->sIncomingCallSuppServiceNotification:Lcom/android/internal/telephony/gsm/SuppServiceNotification;
2097+
2098+
return-void
2099+
.end method
2100+
2101+
.method public static setIncomingCallSuppServiceNotification(Lcom/android/internal/telephony/gsm/SuppServiceNotification;)V
2102+
.locals 1
2103+
.param p0, "ssn" # Lcom/android/internal/telephony/gsm/SuppServiceNotification;
2104+
2105+
.prologue
2106+
if-eqz p0, :cond_0
2107+
2108+
iget v0, p0, Lcom/android/internal/telephony/gsm/SuppServiceNotification;->code:I
2109+
2110+
if-nez v0, :cond_0
2111+
2112+
sput-object p0, Lcom/android/internal/telephony/gsm/GsmConnection;->sIncomingCallSuppServiceNotification:Lcom/android/internal/telephony/gsm/SuppServiceNotification;
2113+
2114+
:cond_0
2115+
return-void
2116+
.end method
2117+
2118+
.method public isForwarded()Z
2119+
.locals 3
2120+
2121+
.prologue
2122+
const/4 v1, 0x1
2123+
2124+
iget-object v0, p0, Lcom/android/internal/telephony/gsm/GsmConnection;->mSuppServiceNotification:Lcom/android/internal/telephony/gsm/SuppServiceNotification;
2125+
2126+
.local v0, "ssn":Lcom/android/internal/telephony/gsm/SuppServiceNotification;
2127+
if-eqz v0, :cond_0
2128+
2129+
iget v2, v0, Lcom/android/internal/telephony/gsm/SuppServiceNotification;->notificationType:I
2130+
2131+
if-ne v2, v1, :cond_0
2132+
2133+
iget v2, v0, Lcom/android/internal/telephony/gsm/SuppServiceNotification;->code:I
2134+
2135+
if-nez v2, :cond_0
2136+
2137+
:goto_0
2138+
return v1
2139+
2140+
:cond_0
2141+
const/4 v1, 0x0
2142+
2143+
goto :goto_0
2144+
.end method
2145+
2146+
.method public setSuppServiceNotification(Lcom/android/internal/telephony/gsm/SuppServiceNotification;)V
2147+
.locals 0
2148+
.param p1, "ssn" # Lcom/android/internal/telephony/gsm/SuppServiceNotification;
2149+
2150+
.prologue
2151+
iput-object p1, p0, Lcom/android/internal/telephony/gsm/GsmConnection;->mSuppServiceNotification:Lcom/android/internal/telephony/gsm/SuppServiceNotification;
2152+
2153+
return-void
2154+
.end method

0 commit comments

Comments
 (0)