Android 12: Fix ClientTransactionHandler

Signed-off-by: tiann <[email protected]>

Author: tiann

VirtualApp/lib/src/main/java/android/app/ClientTransactionHandler.java

@@ -30,6 +30,8 @@
 import java.util.List;
 import java.util.Map;
 
+import mirror.com.android.internal.content.ReferrerIntent;
+
 /**
  * Defines operations that a {@link ClientTransaction} or its items
  * can perform on client.
@@ -69,6 +71,15 @@ public abstract void handleDestroyActivity(IBinder token, boolean finishing, int
     /** Pause the activity. */
     public abstract void handlePauseActivity(IBinder token, boolean finished, boolean userLeaving,
             int configChanges, PendingTransactionActions pendingActions, String reason);
+
+    // Android 12
+    /** Destroy the activity. */
+    public abstract void handleDestroyActivity(ActivityThread.ActivityClientRecord r, boolean finishing,
+                                               int configChanges, boolean getNonConfigInstance, String reason);
+
+    /** Pause the activity. */
+    public abstract void handlePauseActivity(ActivityThread.ActivityClientRecord r, boolean finished, boolean userLeaving,
+                                             int configChanges, PendingTransactionActions pendingActions, String reason);
     /**
      * Resume the activity.
      * @param token Target activity token.
@@ -102,27 +113,45 @@ public abstract void handleStopActivity(IBinder token, boolean show, int configC
     public abstract void handleStopActivity(IBinder token, int configChanges,
                                             PendingTransactionActions pendingActions, boolean finalStateRequest, String reason);
 
+    // Android 12
+    public abstract void handleStopActivity(ActivityThread.ActivityClientRecord r, int configChanges,
+                                            PendingTransactionActions pendingActions, boolean finalStateRequest, String reason);
+
     /** Report that activity was stopped to server. */
     public abstract void reportStop(PendingTransactionActions pendingActions);
     /** Restart the activity after it was stopped. */
     public abstract void performRestartActivity(IBinder token, boolean start);
+    /** Restart the activity after it was stopped. */
+    public abstract void performRestartActivity(ActivityThread.ActivityClientRecord r, boolean start);
+
     /** Deliver activity (override) configuration change. */
     public abstract void handleActivityConfigurationChanged(IBinder activityToken,
             Configuration overrideConfig, int displayId);
+    public abstract void handleActivityConfigurationChanged(ActivityThread.ActivityClientRecord r,
+                                                            Configuration overrideConfig, int displayId);
+
     /** Deliver result from another activity. */
     public abstract void handleSendResult(IBinder token, List results, String reason);
+
+    /** Deliver result from another activity. */
+    public abstract void handleSendResult(
+            ActivityThread.ActivityClientRecord r, List results, String reason);
+
     /** Deliver multi-window mode change notification. */
     public abstract void handleMultiWindowModeChanged(IBinder token, boolean isInMultiWindowMode,
             Configuration overrideConfig);
     /** Deliver new intent. */
     public abstract void handleNewIntent(IBinder token, List intents,
             boolean andPause);
+    public abstract void handleNewIntent(
+            ActivityThread.ActivityClientRecord r, List<ReferrerIntent> intents);
     /** Deliver picture-in-picture mode change notification. */
     public abstract void handlePictureInPictureModeChanged(IBinder token, boolean isInPipMode,
             Configuration overrideConfig);
 
     // Android 11
     public abstract void handlePictureInPictureRequested(IBinder token);
+    public abstract void handlePictureInPictureRequested(ActivityThread.ActivityClientRecord r);
 
     /** Signal to an activity (that is currently in PiP) of PiP state changes. */
     public abstract void handlePictureInPictureStateChanged(ActivityThread.ActivityClientRecord r,

VirtualApp/lib/src/main/java/android/app/TransactionHandlerProxy.java

@@ -27,6 +27,7 @@
 
 import mirror.android.app.ActivityManagerNative;
 import mirror.android.app.IActivityManager;
+import mirror.com.android.internal.content.ReferrerIntent;
 
 
 /**
@@ -73,6 +74,16 @@ public void handlePauseActivity(IBinder token, boolean finished, boolean userLea
         originalHandler.handlePauseActivity(token, finished, userLeaving, configChanges, pendingActions, reason);
     }
 
+    @Override
+    public void handleDestroyActivity(ActivityClientRecord r, boolean finishing, int configChanges, boolean getNonConfigInstance, String reason) {
+        originalHandler.handleDestroyActivity(r, finishing, configChanges, getNonConfigInstance, reason);
+    }
+
+    @Override
+    public void handlePauseActivity(ActivityClientRecord r, boolean finished, boolean userLeaving, int configChanges, PendingTransactionActions pendingActions, String reason) {
+        originalHandler.handlePauseActivity(r, finished, userLeaving, configChanges, pendingActions, reason);
+    }
+
     @Override
     public void handleResumeActivity(IBinder token, boolean finalStateRequest, boolean isForward, String reason) {
         originalHandler.handleResumeActivity(token, finalStateRequest, isForward, reason);
@@ -93,6 +104,11 @@ public void handleStopActivity(IBinder token, int configChanges, PendingTransact
         originalHandler.handleStopActivity(token, configChanges, pendingActions, finalStateRequest, reason);
     }
 
+    @Override
+    public void handleStopActivity(ActivityClientRecord r, int configChanges, PendingTransactionActions pendingActions, boolean finalStateRequest, String reason) {
+        originalHandler.handleStopActivity(r, configChanges, pendingActions, finalStateRequest, reason);
+    }
+
     @Override
     public void reportStop(PendingTransactionActions pendingActions) {
         originalHandler.reportStop(pendingActions);
@@ -103,16 +119,31 @@ public void performRestartActivity(IBinder token, boolean start) {
         originalHandler.performRestartActivity(token, start);
     }
 
+    @Override
+    public void performRestartActivity(ActivityClientRecord r, boolean start) {
+        originalHandler.performRestartActivity(r, start);
+    }
+
     @Override
     public void handleActivityConfigurationChanged(IBinder activityToken, Configuration overrideConfig, int displayId) {
         originalHandler.handleActivityConfigurationChanged(activityToken, overrideConfig, displayId);
     }
 
+    @Override
+    public void handleActivityConfigurationChanged(ActivityClientRecord r, Configuration overrideConfig, int displayId) {
+        originalHandler.handleActivityConfigurationChanged(r, overrideConfig, displayId);
+    }
+
     @Override
     public void handleSendResult(IBinder token, List results, String reason) {
         originalHandler.handleSendResult(token, results, reason);
     }
 
+    @Override
+    public void handleSendResult(ActivityClientRecord r, List results, String reason) {
+        originalHandler.handleSendResult(r, results, reason);
+    }
+
     @Override
     public void handleMultiWindowModeChanged(IBinder token, boolean isInMultiWindowMode, Configuration overrideConfig) {
         originalHandler.handleMultiWindowModeChanged(token, isInMultiWindowMode, overrideConfig);
@@ -133,6 +164,11 @@ public void handlePictureInPictureRequested(IBinder token) {
         originalHandler.handlePictureInPictureRequested(token);
     }
 
+    @Override
+    public void handlePictureInPictureRequested(ActivityClientRecord r) {
+        originalHandler.handlePictureInPictureRequested(r);
+    }
+
     @Override
     public void handlePictureInPictureStateChanged(ActivityClientRecord r, Parcelable pipState) {
         originalHandler.handlePictureInPictureStateChanged(r, pipState);
@@ -307,4 +343,10 @@ public void countLaunchingActivities(int num) {
     public void handleNewIntent(IBinder token, List intents) {
         originalHandler.handleNewIntent(token, intents);
     }
+
+    @Override
+    public void handleNewIntent(ActivityClientRecord r, List<ReferrerIntent> intents) {
+        originalHandler.handleNewIntent(r, intents);
+    }
+
 }

VirtualApp/lib/src/main/java/com/lody/virtual/client/VClientImpl.java

@@ -26,6 +26,7 @@
 import android.os.StrictMode;
 import android.system.ErrnoException;
 import android.system.Os;
+import android.util.Log;
 
 import com.lody.virtual.client.core.CrashHandler;
 import com.lody.virtual.client.core.InvocationStubManager;
@@ -344,6 +345,10 @@ private void bindApplicationNoCheck(String packageName, String processName, Cond
         } else {
             VLog.w(TAG, "Xposed is disable..");
         }
+
+        ClassLoader call = LoadedApk.getClassLoader.call(data.info);
+        Log.i("mylog", "classloader: " + call + " parent: " + call.getParent());
+
         if (Build.VERSION.SDK_INT >= 30)
             ApplicationConfig.setDefaultInstance.call(new Object[] { null });
         mInitialApplication = LoadedApk.makeApplication.call(data.info, false, null);