Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TaskOrganizer: Send newest TaskInfo in taskVanished" into rvc-dev

Browse Source
This commit is contained in:
Rob Carr
2020-03-10 23:43:49 +00:00
committed by Android (Google) Code Review
parent abda4964c5 ab17978c71
commit 2832f868d7
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/ITaskOrganizer.aidl
View File

@@ -27,7 +27,7 @@ import android.app.ActivityManager;
*/ */
oneway interface ITaskOrganizer { oneway interface ITaskOrganizer {
void taskAppeared(in ActivityManager.RunningTaskInfo taskInfo); void taskAppeared(in ActivityManager.RunningTaskInfo taskInfo);
void taskVanished(in IWindowContainer container); void taskVanished(in ActivityManager.RunningTaskInfo taskInfo);
/** /**
* Called upon completion of * Called upon completion of

3
packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
View File

@@ -251,7 +251,8 @@ public class PipTaskOrganizer extends ITaskOrganizer.Stub {
} }
@Override @Override
public void taskVanished(IWindowContainer token) { public void taskVanished(ActivityManager.RunningTaskInfo info) {
IWindowContainer token = info.token;
Objects.requireNonNull(token, "Requires valid IWindowContainer"); Objects.requireNonNull(token, "Requires valid IWindowContainer");
if (token.asBinder() != mToken.asBinder()) { if (token.asBinder() != mToken.asBinder()) {
Log.wtf(TAG, "Unrecognized token: " + token); Log.wtf(TAG, "Unrecognized token: " + token);

2
packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
View File

@@ -88,7 +88,7 @@ class SplitScreenTaskOrganizer extends ITaskOrganizer.Stub {
} }
@Override @Override
public void taskVanished(IWindowContainer container) { public void taskVanished(RunningTaskInfo taskInfo) {
} }
@Override @Override

2
services/core/java/com/android/server/wm/TaskOrganizerController.java
View File

@@ -128,7 +128,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub
void removeTask(Task t) { void removeTask(Task t) {
try { try {
mOrganizer.taskVanished(t.getRemoteToken()); mOrganizer.taskVanished(t.getTaskInfo());
} catch (Exception e) { } catch (Exception e) {
Slog.e(TAG, "Exception sending taskVanished callback" + e); Slog.e(TAG, "Exception sending taskVanished callback" + e);
} }

2
services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
View File

@@ -1019,7 +1019,7 @@ public class ActivityStarterTests extends ActivityTestsBase {
public void taskAppeared(ActivityManager.RunningTaskInfo info) { public void taskAppeared(ActivityManager.RunningTaskInfo info) {
} }
@Override @Override
public void taskVanished(IWindowContainer wc) { public void taskVanished(ActivityManager.RunningTaskInfo info) {
} }
@Override @Override
public void transactionReady(int id, SurfaceControl.Transaction t) { public void transactionReady(int id, SurfaceControl.Transaction t) {

6
services/tests/wmtests/src/com/android/server/wm/TaskOrganizerTests.java
View File

@@ -345,7 +345,7 @@ public class TaskOrganizerTests extends WindowTestsBase {
public void taskAppeared(RunningTaskInfo taskInfo) { } public void taskAppeared(RunningTaskInfo taskInfo) { }
@Override @Override
public void taskVanished(IWindowContainer container) { } public void taskVanished(RunningTaskInfo container) { }
@Override @Override
public void transactionReady(int id, SurfaceControl.Transaction t) { } public void transactionReady(int id, SurfaceControl.Transaction t) { }
@@ -399,7 +399,7 @@ public class TaskOrganizerTests extends WindowTestsBase {
public void taskAppeared(RunningTaskInfo taskInfo) { } public void taskAppeared(RunningTaskInfo taskInfo) { }
@Override @Override
public void taskVanished(IWindowContainer container) { } public void taskVanished(RunningTaskInfo container) { }
@Override @Override
public void transactionReady(int id, SurfaceControl.Transaction t) { } public void transactionReady(int id, SurfaceControl.Transaction t) { }
@@ -539,7 +539,7 @@ public class TaskOrganizerTests extends WindowTestsBase {
mInfo = info; mInfo = info;
} }
@Override @Override
public void taskVanished(IWindowContainer wc) { public void taskVanished(RunningTaskInfo info) {
} }
@Override @Override
public void transactionReady(int id, SurfaceControl.Transaction t) { public void transactionReady(int id, SurfaceControl.Transaction t) {

2
tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerMultiWindowTest.java
View File

@@ -139,7 +139,7 @@ public class TaskOrganizerMultiWindowTest extends Activity {
mTaskView2.reparentTask(ti.token); mTaskView2.reparentTask(ti.token);
} }
} }
public void taskVanished(IWindowContainer wc) { public void taskVanished(ActivityManager.RunningTaskInfo ti) {
} }
public void transactionReady(int id, SurfaceControl.Transaction t) { public void transactionReady(int id, SurfaceControl.Transaction t) {
mergedTransaction.merge(t); mergedTransaction.merge(t);

2
tests/TaskOrganizerTest/src/com/android/test/taskembed/TaskOrganizerPipTest.java
View File

@@ -49,7 +49,7 @@ public class TaskOrganizerPipTest extends Service {
} catch (Exception e) { } catch (Exception e) {
} }
} }
public void taskVanished(IWindowContainer wc) { public void taskVanished(ActivityManager.RunningTaskInfo ti) {
} }
public void transactionReady(int id, SurfaceControl.Transaction t) { public void transactionReady(int id, SurfaceControl.Transaction t) {
} }