Skip to content

Commit 4f385db

Browse files
committed
[Android 12]: fix crash of atms
Signed-off-by: tiann <[email protected]>
1 parent 212db8e commit 4f385db

File tree

3 files changed

+37
-0
lines changed

3 files changed

+37
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package android.app;
2+
3+
/**
4+
* @author weishu
5+
* @date 2021/2/24.
6+
*/
7+
8+
class ActivityOptions {
9+
}

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

+13
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ public abstract void handlePauseActivity(IBinder token, boolean finished, boolea
7878
*/
7979
public abstract void handleResumeActivity(IBinder token, boolean finalStateRequest,
8080
boolean isForward, String reason);
81+
82+
// Android 12
83+
public abstract void handleResumeActivity(ActivityThread.ActivityClientRecord record, boolean finalStateRequest,
84+
boolean isForward, String reason);
85+
8186
/**
8287
* Stop the activity.
8388
* @param token Target activity token.
@@ -127,6 +132,11 @@ public abstract Activity handleLaunchActivity(ActivityThread.ActivityClientRecor
127132
public abstract void handleStartActivity(ActivityThread.ActivityClientRecord r,
128133
PendingTransactionActions pendingActions);
129134

135+
// Android 12
136+
/** Perform activity start. */
137+
public abstract void handleStartActivity(ActivityThread.ActivityClientRecord r,
138+
PendingTransactionActions pendingActions, ActivityOptions options);
139+
130140
// Android 11
131141
public abstract void handleStartActivity(IBinder binder,
132142
PendingTransactionActions pendingActions);
@@ -184,6 +194,9 @@ public abstract void handleRelaunchActivity(ActivityThread.ActivityClientRecord
184194

185195
public abstract void handleTopResumedActivityChanged(IBinder arg1, boolean arg2, String arg3);
186196

197+
public abstract void handleTopResumedActivityChanged(ActivityThread.ActivityClientRecord record, boolean arg2, String arg3);
198+
199+
187200
/** Count how many activities are launching. */
188201
public abstract void countLaunchingActivities(int num);
189202

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

+15
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ public void handleResumeActivity(IBinder token, boolean finalStateRequest, boole
7777
originalHandler.handleResumeActivity(token, finalStateRequest, isForward, reason);
7878
}
7979

80+
@Override
81+
public void handleResumeActivity(ActivityClientRecord record, boolean finalStateRequest, boolean isForward, String reason) {
82+
originalHandler.handleResumeActivity(record, finalStateRequest, isForward, reason);
83+
}
84+
8085
@Override
8186
public void handleStopActivity(IBinder token, boolean show, int configChanges, PendingTransactionActions pendingActions, boolean finalStateRequest, String reason) {
8287
originalHandler.handleStopActivity(token, show, configChanges, pendingActions, finalStateRequest, reason);
@@ -181,6 +186,11 @@ public Activity handleLaunchActivity(ActivityClientRecord r, PendingTransactionA
181186
return originalHandler.handleLaunchActivity(r, pendingActions, customIntent);
182187
}
183188

189+
@Override
190+
public void handleStartActivity(ActivityClientRecord r, PendingTransactionActions pendingActions, ActivityOptions options) {
191+
originalHandler.handleStartActivity(r, pendingActions, options);
192+
}
193+
184194
@Override
185195
public void handleStartActivity(ActivityClientRecord r, PendingTransactionActions pendingActions) {
186196
originalHandler.handleStartActivity(r, pendingActions);
@@ -247,6 +257,11 @@ public void handleTopResumedActivityChanged(IBinder arg1, boolean arg2, String a
247257
originalHandler.handleTopResumedActivityChanged(arg1, arg2, arg3);
248258
}
249259

260+
@Override
261+
public void handleTopResumedActivityChanged(ActivityClientRecord record, boolean arg2, String arg3) {
262+
originalHandler.handleTopResumedActivityChanged(record, arg2, arg3);
263+
}
264+
250265
@Override
251266
public void countLaunchingActivities(int num) {
252267
originalHandler.countLaunchingActivities(num);

0 commit comments

Comments
 (0)