Skip to content

Commit bb36ca4

Browse files
author
mochangming
committed
Upload updates
1 parent 61ea52e commit bb36ca4

File tree

4 files changed

+69
-19
lines changed

4 files changed

+69
-19
lines changed

framework.jar.out/smali/android/app/Activity.smali

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5129,29 +5129,20 @@
51295129
.end method
51305130

51315131
.method protected onResume()V
5132-
.locals 2
5132+
.locals 1
51335133

51345134
.prologue
51355135
invoke-virtual {p0}, Landroid/app/Activity;->getApplication()Landroid/app/Application;
51365136

5137-
move-result-object v1
5138-
5139-
invoke-virtual {v1, p0}, Landroid/app/Application;->dispatchActivityResumed(Landroid/app/Activity;)V
5140-
5141-
const/4 v1, 0x1
5142-
5143-
iput-boolean v1, p0, Landroid/app/Activity;->mCalled:Z
5144-
5145-
const-string v1, "security"
5137+
move-result-object v0
51465138

5147-
invoke-virtual {p0, v1}, Landroid/app/Activity;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
5139+
invoke-virtual {v0, p0}, Landroid/app/Application;->dispatchActivityResumed(Landroid/app/Activity;)V
51485140

5149-
move-result-object v0
5141+
const/4 v0, 0x1
51505142

5151-
check-cast v0, Lmiui/security/SecurityManager;
5143+
iput-boolean v0, p0, Landroid/app/Activity;->mCalled:Z
51525144

5153-
.local v0, "securityManager":Lmiui/security/SecurityManager;
5154-
invoke-virtual {v0, p0}, Lmiui/security/SecurityManager;->checkAccessControl(Landroid/app/Activity;)V
5145+
invoke-static {p0}, Landroid/app/ActivityInjector;->checkAccessControl(Landroid/app/Activity;)V
51555146

51565147
return-void
51575148
.end method

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16616,6 +16616,24 @@
1661616616
.restart local v31 # "proc":Lcom/android/server/am/ProcessRecord;
1661716617
:cond_17
1661816618
:try_start_10
16619+
move-object/from16 v0, p0
16620+
16621+
iget-object v5, v0, Lcom/android/server/am/ActivityManagerService;->mContext:Landroid/content/Context;
16622+
16623+
move-object/from16 v0, p0
16624+
16625+
iget-boolean v10, v0, Lcom/android/server/am/ActivityManagerService;->mSystemReady:Z
16626+
16627+
move-object/from16 v0, p0
16628+
16629+
move-object/from16 v1, p1
16630+
16631+
invoke-static {v5, v0, v1, v4, v10}, Lcom/android/server/am/ExtraActivityManagerService;->checkRunningCompatibility(Landroid/content/Context;Lcom/android/server/am/ActivityManagerService;Landroid/app/IApplicationThread;Lcom/android/server/am/ContentProviderRecord;Z)Z
16632+
16633+
move-result v5
16634+
16635+
if-eqz v5, :cond_miui_18
16636+
1661916637
iget-object v11, v6, Landroid/content/pm/ProviderInfo;->processName:Ljava/lang/String;
1662016638

1662116639
iget-object v12, v4, Lcom/android/server/am/ContentProviderRecord;->appInfo:Landroid/content/pm/ApplicationInfo;
@@ -16709,6 +16727,8 @@
1670916727
move-result-object v10
1671016728

1671116729
invoke-static {v5, v10}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
16730+
16731+
:cond_miui_18
1671216732
:try_end_10
1671316733
.catchall {:try_start_10 .. :try_end_10} :catchall_2
1671416734

@@ -27363,7 +27383,7 @@
2736327383

2736427384
if-nez v0, :cond_1
2736527385

27366-
const/4 v0, -0x1
27386+
const/4 v0, 0x0
2736727387

2736827388
:goto_0
2736927389
return v0

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7331,16 +7331,31 @@
73317331
.local v23, "aInfo":Landroid/content/pm/ActivityInfo;
73327332
move-object/from16 v0, p0
73337333

7334-
iget-object v2, v0, Lcom/android/server/am/ActivityStackSupervisor;->mContext:Landroid/content/Context;
7334+
iget-object v4, v0, Lcom/android/server/am/ActivityStackSupervisor;->mContext:Landroid/content/Context;
73357335

7336-
move-object/from16 v4, v23
7336+
const/4 v7, 0x0
7337+
7338+
if-eqz p6, :cond_miui_2
7339+
7340+
const/4 v7, 0x1
7341+
7342+
:cond_miui_2
7343+
move-object/from16 v5, v23
73377344

7338-
invoke-static {v2, v4, v3}, Lcom/android/server/am/ExtraActivityManagerService;->checkAccessControl(Landroid/content/Context;Landroid/content/pm/ActivityInfo;Landroid/content/Intent;)Landroid/content/Intent;
7345+
move-object v6, v3
7346+
7347+
move/from16 v8, p8
7348+
7349+
move/from16 v9, p15
7350+
7351+
invoke-static/range {v4 .. v9}, Lcom/android/server/am/ExtraActivityManagerService;->checkAccessControl(Landroid/content/Context;Landroid/content/pm/ActivityInfo;Landroid/content/Intent;ZII)Landroid/content/Intent;
73397352

73407353
move-result-object v3
73417354

73427355
move-object/from16 p4, v3
73437356

7357+
move-object/from16 v4, v23
7358+
73447359
move-object/from16 v5, p4
73457360

73467361
move-object/from16 v6, p0

services.jar.out/smali/com/android/server/content/SyncManager$ActiveSyncContext.smali

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,30 @@
222222

223223
iget-object v0, p0, Lcom/android/server/content/SyncManager$ActiveSyncContext;->this$0:Lcom/android/server/content/SyncManager;
224224

225+
# getter for: Lcom/android/server/content/SyncManager;->mContext:Landroid/content/Context;
226+
invoke-static {v0}, Lcom/android/server/content/SyncManager;->access$1600(Lcom/android/server/content/SyncManager;)Landroid/content/Context;
227+
228+
move-result-object v0
229+
230+
iget-object v2, p0, Lcom/android/server/content/SyncManager$ActiveSyncContext;->mSyncOperation:Lcom/android/server/content/SyncOperation;
231+
232+
iget v2, v2, Lcom/android/server/content/SyncOperation;->userId:I
233+
234+
invoke-static {v0, v7, v2}, Lcom/android/server/content/SyncManagerInjector;->canBindService(Landroid/content/Context;Landroid/content/Intent;I)Z
235+
236+
move-result v0
237+
238+
if-nez v0, :cond_miui_1
239+
240+
const/4 v1, 0x0
241+
242+
iput-boolean v1, p0, Lcom/android/server/content/SyncManager$ActiveSyncContext;->mBound:Z
243+
244+
return v1
245+
246+
:cond_miui_1
247+
iget-object v0, p0, Lcom/android/server/content/SyncManager$ActiveSyncContext;->this$0:Lcom/android/server/content/SyncManager;
248+
225249
# getter for: Lcom/android/server/content/SyncManager;->mContext:Landroid/content/Context;
226250
invoke-static {v0}, Lcom/android/server/content/SyncManager;->access$1500(Lcom/android/server/content/SyncManager;)Landroid/content/Context;
227251

0 commit comments

Comments
 (0)