Upload updates

MiCode · May 6, 2016 · bb36ca4 · bb36ca4
1 parent 61ea52e
commit bb36ca4
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 19 deletions.
diff --git a/framework.jar.out/smali/android/app/Activity.smali b/framework.jar.out/smali/android/app/Activity.smali
@@ -5129,29 +5129,20 @@
 .end method
 
 .method protected onResume()V
-    .locals 2
+    .locals 1
 
     .prologue
     invoke-virtual {p0}, Landroid/app/Activity;->getApplication()Landroid/app/Application;
 
-    move-result-object v1
-
-    invoke-virtual {v1, p0}, Landroid/app/Application;->dispatchActivityResumed(Landroid/app/Activity;)V
-
-    const/4 v1, 0x1
-
-    iput-boolean v1, p0, Landroid/app/Activity;->mCalled:Z
-
-    const-string v1, "security"
+    move-result-object v0
 
-    invoke-virtual {p0, v1}, Landroid/app/Activity;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+    invoke-virtual {v0, p0}, Landroid/app/Application;->dispatchActivityResumed(Landroid/app/Activity;)V
 
-    move-result-object v0
+    const/4 v0, 0x1
 
-    check-cast v0, Lmiui/security/SecurityManager;
+    iput-boolean v0, p0, Landroid/app/Activity;->mCalled:Z
 
-    .local v0, "securityManager":Lmiui/security/SecurityManager;
-    invoke-virtual {v0, p0}, Lmiui/security/SecurityManager;->checkAccessControl(Landroid/app/Activity;)V
+    invoke-static {p0}, Landroid/app/ActivityInjector;->checkAccessControl(Landroid/app/Activity;)V
 
     return-void
 .end method

diff --git a/services.jar.out/smali/com/android/server/am/ActivityManagerService.smali b/services.jar.out/smali/com/android/server/am/ActivityManagerService.smali
@@ -16616,6 +16616,24 @@
     .restart local v31    # "proc":Lcom/android/server/am/ProcessRecord;
     :cond_17
     :try_start_10
+    move-object/from16 v0, p0
+
+    iget-object v5, v0, Lcom/android/server/am/ActivityManagerService;->mContext:Landroid/content/Context;
+
+    move-object/from16 v0, p0
+
+    iget-boolean v10, v0, Lcom/android/server/am/ActivityManagerService;->mSystemReady:Z
+
+    move-object/from16 v0, p0
+
+    move-object/from16 v1, p1
+
+    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
+
+    move-result v5
+
+    if-eqz v5, :cond_miui_18
+
     iget-object v11, v6, Landroid/content/pm/ProviderInfo;->processName:Ljava/lang/String;
 
     iget-object v12, v4, Lcom/android/server/am/ContentProviderRecord;->appInfo:Landroid/content/pm/ApplicationInfo;
@@ -16709,6 +16727,8 @@
     move-result-object v10
 
     invoke-static {v5, v10}, Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    :cond_miui_18
     :try_end_10
     .catchall {:try_start_10 .. :try_end_10} :catchall_2
 
@@ -27363,7 +27383,7 @@
 
     if-nez v0, :cond_1
 
-    const/4 v0, -0x1
+    const/4 v0, 0x0
 
     :goto_0
     return v0

diff --git a/services.jar.out/smali/com/android/server/am/ActivityStackSupervisor.smali b/services.jar.out/smali/com/android/server/am/ActivityStackSupervisor.smali
@@ -7331,16 +7331,31 @@
     .local v23, "aInfo":Landroid/content/pm/ActivityInfo;
     move-object/from16 v0, p0
 
-    iget-object v2, v0, Lcom/android/server/am/ActivityStackSupervisor;->mContext:Landroid/content/Context;
+    iget-object v4, v0, Lcom/android/server/am/ActivityStackSupervisor;->mContext:Landroid/content/Context;
 
-    move-object/from16 v4, v23
+    const/4 v7, 0x0
+
+    if-eqz p6, :cond_miui_2
+
+    const/4 v7, 0x1
+
+    :cond_miui_2
+    move-object/from16 v5, v23
 
-    invoke-static {v2, v4, v3}, Lcom/android/server/am/ExtraActivityManagerService;->checkAccessControl(Landroid/content/Context;Landroid/content/pm/ActivityInfo;Landroid/content/Intent;)Landroid/content/Intent;
+    move-object v6, v3
+
+    move/from16 v8, p8
+
+    move/from16 v9, p15
+
+    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;
 
     move-result-object v3
 
     move-object/from16 p4, v3
 
+    move-object/from16 v4, v23
+
     move-object/from16 v5, p4
 
     move-object/from16 v6, p0

diff --git a/services.jar.out/smali/com/android/server/content/SyncManager$ActiveSyncContext.smali b/services.jar.out/smali/com/android/server/content/SyncManager$ActiveSyncContext.smali
@@ -222,6 +222,30 @@
 
     iget-object v0, p0, Lcom/android/server/content/SyncManager$ActiveSyncContext;->this$0:Lcom/android/server/content/SyncManager;
 
+    # getter for: Lcom/android/server/content/SyncManager;->mContext:Landroid/content/Context;
+    invoke-static {v0}, Lcom/android/server/content/SyncManager;->access$1600(Lcom/android/server/content/SyncManager;)Landroid/content/Context;
+
+    move-result-object v0
+
+    iget-object v2, p0, Lcom/android/server/content/SyncManager$ActiveSyncContext;->mSyncOperation:Lcom/android/server/content/SyncOperation;
+
+    iget v2, v2, Lcom/android/server/content/SyncOperation;->userId:I
+
+    invoke-static {v0, v7, v2}, Lcom/android/server/content/SyncManagerInjector;->canBindService(Landroid/content/Context;Landroid/content/Intent;I)Z
+
+    move-result v0
+
+    if-nez v0, :cond_miui_1
+
+    const/4 v1, 0x0
+
+    iput-boolean v1, p0, Lcom/android/server/content/SyncManager$ActiveSyncContext;->mBound:Z
+
+    return v1
+
+    :cond_miui_1
+    iget-object v0, p0, Lcom/android/server/content/SyncManager$ActiveSyncContext;->this$0:Lcom/android/server/content/SyncManager;
+
     # getter for: Lcom/android/server/content/SyncManager;->mContext:Landroid/content/Context;
     invoke-static {v0}, Lcom/android/server/content/SyncManager;->access$1500(Lcom/android/server/content/SyncManager;)Landroid/content/Context;