README.md

@@ -83,6 +83,7 @@ For Developers
 
 - [File a bug](https://github.com/android-hacker/exposed/issues)
 - [Wiki](https://github.com/android-hacker/VirtualXposed/wiki)
+- [Telegram](https://t.me/vxp_devs)
 
 Credits
 -------

VirtualApp/app/build.gradle

@@ -23,8 +23,8 @@ android {
         applicationId "io.va.exposed64"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 203
-        versionName "0.20.3"
+        versionCode 220
+        versionName "0.22.0"
         multiDexEnabled false
         android {
             defaultConfig {

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

@@ -0,0 +1,9 @@
+package android.app;
+
+/**
+ * @author weishu
+ * @date 2021/2/24.
+ */
+
+class ActivityOptions {
+}

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

@@ -23,12 +23,15 @@
 import android.content.res.CompatibilityInfo;
 import android.content.res.Configuration;
 import android.os.IBinder;
+import android.os.Parcelable;
 import android.util.MergedConfiguration;
 import android.view.DisplayAdjustments;
 
 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.
@@ -68,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.
@@ -78,6 +90,11 @@ public abstract void handlePauseActivity(IBinder token, boolean finished, boolea
      */
     public abstract void handleResumeActivity(IBinder token, boolean finalStateRequest,
             boolean isForward, String reason);
+
+    // Android 12
+    public abstract void handleResumeActivity(ActivityThread.ActivityClientRecord record, boolean finalStateRequest,
+                                              boolean isForward, String reason);
+
     /**
      * Stop the activity.
      * @param token Target activity token.
@@ -96,27 +113,59 @@ 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,
+                                                            Parcelable pipState);
+
+    /** Whether the activity want to handle splash screen exit animation */
+    public abstract boolean isHandleSplashScreenExit(IBinder token);
+
+    /** Attach a splash screen window view to the top of the activity */
+    public abstract void handleAttachSplashScreenView(ActivityThread.ActivityClientRecord r,
+                                                      Parcelable parcelable);
+
+    /** Hand over the splash screen window view to the activity */
+    public abstract void handOverSplashScreenView(ActivityThread.ActivityClientRecord r);
 
     /** Update window visibility. */
     public abstract void handleWindowVisibility(IBinder token, boolean show);
@@ -127,6 +176,11 @@ public abstract Activity handleLaunchActivity(ActivityThread.ActivityClientRecor
     public abstract void handleStartActivity(ActivityThread.ActivityClientRecord r,
             PendingTransactionActions pendingActions);
 
+    // Android 12
+    /** Perform activity start. */
+    public abstract void handleStartActivity(ActivityThread.ActivityClientRecord r,
+                                             PendingTransactionActions pendingActions, ActivityOptions options);
+
     // Android 11
     public abstract void handleStartActivity(IBinder binder,
                                              PendingTransactionActions pendingActions);
@@ -139,6 +193,26 @@ public abstract LoadedApk getPackageInfoNoCheck(ApplicationInfo ai,
     public abstract void handleFixedRotationAdjustments(IBinder token,
                                                         DisplayAdjustments.FixedRotationAdjustments fixedRotationAdjustments);
 
+    /**
+     * Add {@link ActivityThread.ActivityClientRecord} that is preparing to be launched.
+     * @param token Activity token.
+     * @param activity An initialized instance of {@link ActivityThread.ActivityClientRecord} to use during launch.
+     */
+    public abstract void addLaunchingActivity(IBinder token, ActivityThread.ActivityClientRecord activity);
+
+    /**
+     * Get {@link ActivityThread.ActivityClientRecord} that is preparing to be launched.
+     * @param token Activity token.
+     * @return An initialized instance of {@link ActivityThread.ActivityClientRecord} to use during launch.
+     */
+    public abstract ActivityThread.ActivityClientRecord getLaunchingActivity(IBinder token);
+
+    /**
+     * Remove {@link ActivityThread.ActivityClientRecord} from the launching activity list.
+     * @param token Activity token.
+     */
+    public abstract void removeLaunchingActivity(IBinder token);
+
     /**
      * Get {@link ActivityThread.ActivityClientRecord} instance that corresponds to the
      * provided token.
@@ -184,6 +258,9 @@ public abstract void handleRelaunchActivity(ActivityThread.ActivityClientRecord
 
     public abstract void handleTopResumedActivityChanged(IBinder arg1, boolean arg2, String arg3);
 
+    public abstract void handleTopResumedActivityChanged(ActivityThread.ActivityClientRecord record, boolean arg2, String arg3);
+
+
     /** Count how many activities are launching. */
     public abstract void countLaunchingActivities(int num);
 

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

@@ -10,6 +10,7 @@
 import android.content.res.CompatibilityInfo;
 import android.content.res.Configuration;
 import android.os.IBinder;
+import android.os.Parcelable;
 import android.util.Log;
 import android.util.MergedConfiguration;
 import android.view.DisplayAdjustments;
@@ -26,6 +27,7 @@
 
 import mirror.android.app.ActivityManagerNative;
 import mirror.android.app.IActivityManager;
+import mirror.com.android.internal.content.ReferrerIntent;
 
 
 /**
@@ -72,11 +74,26 @@ 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);
     }
 
+    @Override
+    public void handleResumeActivity(ActivityClientRecord record, boolean finalStateRequest, boolean isForward, String reason) {
+        originalHandler.handleResumeActivity(record, finalStateRequest, isForward, reason);
+    }
+
     @Override
     public void handleStopActivity(IBinder token, boolean show, int configChanges, PendingTransactionActions pendingActions, boolean finalStateRequest, String reason) {
         originalHandler.handleStopActivity(token, show, configChanges, pendingActions, finalStateRequest, reason);
@@ -87,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);
@@ -97,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);
@@ -127,6 +164,31 @@ 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);
+    }
+
+    @Override
+    public boolean isHandleSplashScreenExit(IBinder token) {
+        return originalHandler.isHandleSplashScreenExit(token);
+    }
+
+    @Override
+    public void handleAttachSplashScreenView(ActivityClientRecord r, Parcelable parcelable) {
+        originalHandler.handleAttachSplashScreenView(r, parcelable);
+    }
+
+    @Override
+    public void handOverSplashScreenView(ActivityClientRecord r) {
+        originalHandler.handOverSplashScreenView(r);
+    }
+
     @Override
     public void handleWindowVisibility(IBinder token, boolean show) {
         originalHandler.handleWindowVisibility(token, show);
@@ -181,6 +243,11 @@ public Activity handleLaunchActivity(ActivityClientRecord r, PendingTransactionA
         return originalHandler.handleLaunchActivity(r, pendingActions, customIntent);
     }
 
+    @Override
+    public void handleStartActivity(ActivityClientRecord r, PendingTransactionActions pendingActions, ActivityOptions options) {
+        originalHandler.handleStartActivity(r, pendingActions, options);
+    }
+
     @Override
     public void handleStartActivity(ActivityClientRecord r, PendingTransactionActions pendingActions) {
         originalHandler.handleStartActivity(r, pendingActions);
@@ -206,6 +273,21 @@ public void handleFixedRotationAdjustments(IBinder token, DisplayAdjustments.Fix
         originalHandler.handleFixedRotationAdjustments(token, fixedRotationAdjustments);
     }
 
+    @Override
+    public void addLaunchingActivity(IBinder token, ActivityClientRecord activity) {
+        originalHandler.addLaunchingActivity(token, activity);
+    }
+
+    @Override
+    public ActivityClientRecord getLaunchingActivity(IBinder token) {
+        return originalHandler.getLaunchingActivity(token);
+    }
+
+    @Override
+    public void removeLaunchingActivity(IBinder token) {
+        originalHandler.removeLaunchingActivity(token);
+    }
+
     @Override
     public ActivityClientRecord getActivityClient(IBinder token) {
         Log.i(TAG, "getActivityClient : " + token);
@@ -247,6 +329,11 @@ public void handleTopResumedActivityChanged(IBinder arg1, boolean arg2, String a
         originalHandler.handleTopResumedActivityChanged(arg1, arg2, arg3);
     }
 
+    @Override
+    public void handleTopResumedActivityChanged(ActivityClientRecord record, boolean arg2, String arg3) {
+        originalHandler.handleTopResumedActivityChanged(record, arg2, arg3);
+    }
+
     @Override
     public void countLaunchingActivities(int num) {
         originalHandler.countLaunchingActivities(num);
@@ -256,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);
+    }
+
 }