Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ca53a8e authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Do not allow moveToFront() and moveTaskToFront() when app is in background" into qt-dev 

am: bbde1150

Change-Id: Id0555f82d152d24f282e8adb01c6248a9b515460
parents 0bb6a5f6 bbde1150

core/java/android/app/ActivityManager.java

+8 −2
Original line number Diff line number Diff line
@@ -2052,7 +2052,10 @@ public class ActivityManager { 
    @RequiresPermission(android.Manifest.permission.REORDER_TASKS)

    public void moveTaskToFront(int taskId, @MoveTaskFlags int flags, Bundle options) {

        try {

            getTaskService().moveTaskToFront(taskId, flags, options);

            ActivityThread thread = ActivityThread.currentActivityThread();

            IApplicationThread appThread = thread.getApplicationThread();

            String packageName = mContext.getPackageName();

            getTaskService().moveTaskToFront(appThread, packageName, taskId, flags, options);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -4263,7 +4266,10 @@ public class ActivityManager { 
         */

        public void moveToFront() {

            try {

                mAppTaskImpl.moveToFront();

                ActivityThread thread = ActivityThread.currentActivityThread();

                IApplicationThread appThread = thread.getApplicationThread();

                String packageName = ActivityThread.currentPackageName();

                mAppTaskImpl.moveToFront(appThread, packageName);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

core/java/android/app/IActivityManager.aidl

+2 −1
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ interface IActivityManager { 
    List<ActivityManager.RunningTaskInfo> getFilteredTasks(int maxNum, int ignoreActivityType,

            int ignoreWindowingMode);

    @UnsupportedAppUsage

    void moveTaskToFront(int task, int flags, in Bundle options);

    void moveTaskToFront(in IApplicationThread caller, in String callingPackage, int task,

            int flags, in Bundle options);

    @UnsupportedAppUsage

    int getTaskForActivity(in IBinder token, in boolean onlyRoot);

    ContentProviderHolder getContentProvider(in IApplicationThread caller, in String callingPackage,

core/java/android/app/IActivityTaskManager.aidl

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ interface IActivityTaskManager { 
    boolean shouldUpRecreateTask(in IBinder token, in String destAffinity);

    boolean navigateUpTo(in IBinder token, in Intent target, int resultCode,

            in Intent resultData);

    void moveTaskToFront(int task, int flags, in Bundle options);

    void moveTaskToFront(in IApplicationThread app, in String callingPackage, int task,

            int flags, in Bundle options);

    int getTaskForActivity(in IBinder token, in boolean onlyRoot);

    void finishSubActivity(in IBinder token, in String resultWho, int requestCode);

    ParceledListSlice getRecentTasks(int maxNum, int flags, int userId);

core/java/android/app/IAppTask.aidl

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.app;



import android.app.ActivityManager;

import android.app.IApplicationThread;

import android.content.Intent;

import android.os.Bundle;
@@ -25,7 +26,7 @@ interface IAppTask { 
    void finishAndRemoveTask();

    @UnsupportedAppUsage

    ActivityManager.RecentTaskInfo getTaskInfo();

    void moveToFront();

    void moveToFront(in IApplicationThread appThread, in String callingPackage);

    int startActivity(IBinder whoThread, String callingPackage,

            in Intent intent, String resolvedType, in Bundle options);

    void setExcludeFromRecents(boolean exclude);

core/java/com/android/internal/app/HeavyWeightSwitcherActivity.java

+9 −5
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


package com.android.internal.app;



import com.android.internal.R;



import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.app.ActivityThread;

import android.app.IApplicationThread;

import android.content.Intent;

import android.content.IntentSender;

import android.content.pm.ApplicationInfo;
@@ -29,13 +29,14 @@ import android.graphics.drawable.Drawable; 
import android.os.Bundle;

import android.os.RemoteException;

import android.util.Log;

import android.util.TypedValue;

import android.view.View;

import android.view.Window;

import android.view.View.OnClickListener;

import android.view.Window;

import android.widget.ImageView;

import android.widget.TextView;



import com.android.internal.R;



/**

 * This activity is displayed when the system attempts to start an Intent for

 * which there is more than one matching activity, allowing the user to decide
@@ -127,7 +128,10 @@ public class HeavyWeightSwitcherActivity extends Activity { 
    private OnClickListener mSwitchOldListener = new OnClickListener() {

        public void onClick(View v) {

            try {

                ActivityTaskManager.getService().moveTaskToFront(mCurTask, 0, null);

                ActivityThread thread = ActivityThread.currentActivityThread();

                IApplicationThread appThread = thread.getApplicationThread();

                ActivityTaskManager.getService().moveTaskToFront(appThread, getPackageName(),

                        mCurTask, 0, null);

            } catch (RemoteException e) {

            }

            finish();