Skip to content

Commit ea109c1

Browse files
author
mochangming
committed
Upload updates
1 parent e75a80a commit ea109c1

12 files changed

Lines changed: 310 additions & 187 deletions

File tree

services.jar.out/smali/com/android/server/am/ActivityManagerService.smali

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27345,11 +27345,19 @@
2734527345

2734627346
invoke-static {v1}, Landroid/os/UserHandle;->getUserId(I)I
2734727347

27348-
move-result v1
27348+
move-result v5
27349+
27350+
iget-boolean v6, p0, Lcom/android/server/am/ActivityManagerService;->mSystemReady:Z
27351+
27352+
move-object v1, p0
2734927353

27350-
iget-boolean v2, p0, Lcom/android/server/am/ActivityManagerService;->mSystemReady:Z
27354+
move-object v2, p1
27355+
27356+
move-object v3, p3
27357+
27358+
move-object v4, p4
2735127359

27352-
invoke-static {v0, p3, p4, v1, v2}, Lcom/android/server/am/ExtraActivityManagerService;->checkRunningCompatibility(Landroid/content/Context;Landroid/content/Intent;Ljava/lang/String;IZ)Z
27360+
invoke-static/range {v0 .. v6}, Lcom/android/server/am/ExtraActivityManagerService;->checkRunningCompatibility(Landroid/content/Context;Lcom/android/server/am/ActivityManagerService;Landroid/app/IApplicationThread;Landroid/content/Intent;Ljava/lang/String;IZ)Z
2735327361

2735427362
move-result v0
2735527363

@@ -61588,11 +61596,19 @@
6158861596

6158961597
invoke-static {v1}, Landroid/os/UserHandle;->getUserId(I)I
6159061598

61591-
move-result v1
61599+
move-result v5
61600+
61601+
iget-boolean v6, p0, Lcom/android/server/am/ActivityManagerService;->mSystemReady:Z
61602+
61603+
move-object v1, p0
6159261604

61593-
iget-boolean v2, p0, Lcom/android/server/am/ActivityManagerService;->mSystemReady:Z
61605+
move-object v2, p1
61606+
61607+
move-object v3, p2
61608+
61609+
move-object v4, p3
6159461610

61595-
invoke-static {v0, p2, p3, v1, v2}, Lcom/android/server/am/ExtraActivityManagerService;->checkRunningCompatibility(Landroid/content/Context;Landroid/content/Intent;Ljava/lang/String;IZ)Z
61611+
invoke-static/range {v0 .. v6}, Lcom/android/server/am/ExtraActivityManagerService;->checkRunningCompatibility(Landroid/content/Context;Lcom/android/server/am/ActivityManagerService;Landroid/app/IApplicationThread;Landroid/content/Intent;Ljava/lang/String;IZ)Z
6159661612

6159761613
move-result v0
6159861614

services.jar.out/smali/com/android/server/am/ActivityStackSupervisor.smali

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7355,19 +7355,21 @@
73557355

73567356
move-result-object v23
73577357

7358-
move-object/from16 v4, v23
7358+
move-object/from16 v8, v23
73597359

73607360
move-object/from16 v0, p0
73617361

73627362
iget-object v5, v0, Lcom/android/server/am/ActivityStackSupervisor;->mContext:Landroid/content/Context;
73637363

7364-
move-object/from16 v0, p0
7365-
73667364
iget-object v6, v0, Lcom/android/server/am/ActivityStackSupervisor;->mService:Lcom/android/server/am/ActivityManagerService;
73677365

7368-
iget-boolean v6, v6, Lcom/android/server/am/ActivityManagerService;->mSystemReady:Z
7366+
iget-boolean v10, v6, Lcom/android/server/am/ActivityManagerService;->mSystemReady:Z
7367+
7368+
move-object/from16 v9, p4
7369+
7370+
move-object/from16 v7, p1
73697371

7370-
invoke-static {v5, v4, v6}, Lcom/android/server/am/ExtraActivityManagerService;->checkRunningCompatibility(Landroid/content/Context;Landroid/content/pm/ActivityInfo;Z)Z
7372+
invoke-static/range {v5 .. v10}, Lcom/android/server/am/ExtraActivityManagerService;->checkRunningCompatibility(Landroid/content/Context;Lcom/android/server/am/ActivityManagerService;Landroid/app/IApplicationThread;Landroid/content/pm/ActivityInfo;Landroid/content/Intent;Z)Z
73717373

73727374
move-result v2
73737375

services.jar.out/smali/com/android/server/am/BroadcastQueue.smali

Lines changed: 55 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@
15611561
.param p2, "info" # Landroid/content/pm/ResolveInfo;
15621562

15631563
.prologue
1564-
const/4 v0, 0x1
1564+
const/4 v1, 0x1
15651565

15661566
const/4 v6, 0x0
15671567

@@ -1570,13 +1570,13 @@
15701570
invoke-direct {v8}, Landroid/app/ActivityManager$MemoryInfo;-><init>()V
15711571

15721572
.local v8, "outInfo":Landroid/app/ActivityManager$MemoryInfo;
1573-
iget-object v1, p0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1573+
iget-object v0, p0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
15741574

1575-
invoke-virtual {v1, v8}, Lcom/android/server/am/ActivityManagerService;->getMemoryInfo(Landroid/app/ActivityManager$MemoryInfo;)V
1575+
invoke-virtual {v0, v8}, Lcom/android/server/am/ActivityManagerService;->getMemoryInfo(Landroid/app/ActivityManager$MemoryInfo;)V
15761576

1577-
iget-boolean v1, v8, Landroid/app/ActivityManager$MemoryInfo;->lowMemory:Z
1577+
iget-boolean v0, v8, Landroid/app/ActivityManager$MemoryInfo;->lowMemory:Z
15781578

1579-
if-eqz v1, :cond_0
1579+
if-eqz v0, :cond_0
15801580

15811581
const-string v0, "BroadcastQueue"
15821582

@@ -1664,21 +1664,21 @@
16641664
return v6
16651665

16661666
:cond_0
1667-
iget-object v1, p2, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
1667+
iget-object v0, p2, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
16681668

1669-
iget-object v1, v1, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
1669+
iget-object v0, v0, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
16701670

1671-
iget v1, v1, Landroid/content/pm/ApplicationInfo;->flags:I
1671+
iget v0, v0, Landroid/content/pm/ApplicationInfo;->flags:I
16721672

1673-
and-int/lit16 v1, v1, 0x81
1673+
and-int/lit16 v0, v0, 0x81
16741674

1675-
if-eqz v1, :cond_2
1675+
if-eqz v0, :cond_2
16761676

1677-
sget-boolean v1, Lmiui/os/Build;->IS_STABLE_VERSION:Z
1677+
sget-boolean v0, Lmiui/os/Build;->IS_STABLE_VERSION:Z
16781678

1679-
if-nez v1, :cond_1
1679+
if-nez v0, :cond_1
16801680

1681-
const-string v1, "BroadcastQueue"
1681+
const-string v0, "BroadcastQueue"
16821682

16831683
new-instance v2, Ljava/lang/StringBuilder;
16841684

@@ -1716,49 +1716,78 @@
17161716

17171717
move-result-object v2
17181718

1719-
invoke-static {v1, v2}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
1719+
invoke-static {v0, v2}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
17201720

17211721
:cond_1
1722-
move v6, v0
1722+
move v6, v1
17231723

17241724
goto :goto_0
17251725

17261726
:cond_2
1727-
iget-object v1, p1, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1727+
invoke-static {}, Lmiui/security/WakePathChecker;->getInstance()Lmiui/security/WakePathChecker;
17281728

1729-
invoke-virtual {v1}, Landroid/content/Intent;->getComponent()Landroid/content/ComponentName;
1729+
move-result-object v2
17301730

1731-
move-result-object v1
1731+
iget-object v3, p1, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1732+
1733+
iget-object v4, p1, Lcom/android/server/am/BroadcastRecord;->callerPackage:Ljava/lang/String;
1734+
1735+
iget-object v0, p1, Lcom/android/server/am/BroadcastRecord;->callerApp:Lcom/android/server/am/ProcessRecord;
1736+
1737+
if-eqz v0, :cond_3
1738+
1739+
iget-object v0, p1, Lcom/android/server/am/BroadcastRecord;->callerApp:Lcom/android/server/am/ProcessRecord;
17321740

1733-
if-eqz v1, :cond_3
1741+
iget-object v0, v0, Lcom/android/server/am/ProcessRecord;->info:Landroid/content/pm/ApplicationInfo;
17341742

1735-
move v6, v0
1743+
:goto_1
1744+
invoke-virtual {v2, v3, v4, v0}, Lmiui/security/WakePathChecker;->checkBroadcastWakePath(Landroid/content/Intent;Ljava/lang/String;Landroid/content/pm/ApplicationInfo;)Z
1745+
1746+
move-result v0
1747+
1748+
if-eqz v0, :cond_5
1749+
1750+
iget-object v0, p1, Lcom/android/server/am/BroadcastRecord;->intent:Landroid/content/Intent;
1751+
1752+
invoke-virtual {v0}, Landroid/content/Intent;->getComponent()Landroid/content/ComponentName;
1753+
1754+
move-result-object v0
1755+
1756+
if-eqz v0, :cond_4
1757+
1758+
move v6, v1
17361759

17371760
goto :goto_0
17381761

17391762
:cond_3
1740-
iget-object v1, p0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1763+
const/4 v0, 0x0
1764+
1765+
goto :goto_1
17411766

1742-
iget-object v1, v1, Lcom/android/server/am/ActivityManagerService;->mContext:Landroid/content/Context;
1767+
:cond_4
1768+
iget-object v0, p0, Lcom/android/server/am/BroadcastQueue;->mService:Lcom/android/server/am/ActivityManagerService;
1769+
1770+
iget-object v0, v0, Lcom/android/server/am/ActivityManagerService;->mContext:Landroid/content/Context;
17431771

17441772
iget-object v2, p2, Landroid/content/pm/ResolveInfo;->activityInfo:Landroid/content/pm/ActivityInfo;
17451773

17461774
iget-object v2, v2, Landroid/content/pm/ActivityInfo;->applicationInfo:Landroid/content/pm/ApplicationInfo;
17471775

17481776
iget-object v2, v2, Landroid/content/pm/ApplicationInfo;->packageName:Ljava/lang/String;
17491777

1750-
invoke-static {v1, v2}, Landroid/miui/AppOpsUtils;->getApplicationAutoStart(Landroid/content/Context;Ljava/lang/String;)I
1778+
invoke-static {v0, v2}, Landroid/miui/AppOpsUtils;->getApplicationAutoStart(Landroid/content/Context;Ljava/lang/String;)I
17511779

17521780
move-result v7
17531781

17541782
.local v7, "autoStartMode":I
1755-
if-nez v7, :cond_4
1783+
if-nez v7, :cond_5
17561784

1757-
move v6, v0
1785+
move v6, v1
17581786

17591787
goto :goto_0
17601788

1761-
:cond_4
1789+
.end local v7 # "autoStartMode":I
1790+
:cond_5
17621791
const-string v0, "BroadcastQueue"
17631792

17641793
new-instance v1, Ljava/lang/StringBuilder;

services.jar.out/smali/com/android/server/power/PowerManagerService$WakeLock.smali

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919

2020
# instance fields
21+
.field public mDisabled:Z
22+
2123
.field public mFlags:I
2224

2325
.field public final mLock:Landroid/os/IBinder;
@@ -309,6 +311,17 @@
309311

310312
move-result-object v0
311313

314+
iget-boolean v1, p0, Lcom/android/server/power/PowerManagerService$WakeLock;->mDisabled:Z
315+
316+
if-eqz v1, :cond_miui_0
317+
318+
const-string v1, " DISABLED"
319+
320+
:goto_miui_0
321+
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
322+
323+
move-result-object v0
324+
312325
const-string v1, " (uid="
313326

314327
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -356,6 +369,11 @@
356369
move-result-object v0
357370

358371
return-object v0
372+
373+
:cond_miui_0
374+
const-string v1, ""
375+
376+
goto :goto_miui_0
359377
.end method
360378

361379
.method public updateProperties(ILjava/lang/String;Ljava/lang/String;Landroid/os/WorkSource;II)V

0 commit comments

Comments
 (0)