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

Commit bfdcebd0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use op package name as the calling package while start activities" am: e875230f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12898400

Change-Id: I89a3836f4fff01b505b32dc8e3c0efee85404529
parents 5688e758 e875230f

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -5815,7 +5815,7 @@ public class Activity extends ContextThemeWrapper 
                intent.migrateExtraStreamToClipData(this);

                intent.prepareToLeaveProcess(this);

                result = ActivityTaskManager.getService()

                    .startActivity(mMainThread.getApplicationThread(), getBasePackageName(),

                    .startActivity(mMainThread.getApplicationThread(), getOpPackageName(),

                            getAttributionTag(), intent,

                            intent.resolveTypeIfNeeded(getContentResolver()), mToken, mEmbeddedID,

                            requestCode, ActivityManager.START_FLAG_ONLY_IF_NEEDED, null, options);

core/java/android/app/ActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1936,7 +1936,7 @@ public class ActivityManager { 
        ArrayList<AppTask> tasks = new ArrayList<AppTask>();

        List<IBinder> appTasks;

        try {

            appTasks = getTaskService().getAppTasks(mContext.getPackageName());

            appTasks = getTaskService().getAppTasks(mContext.getOpPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -2471,7 +2471,7 @@ public class ActivityManager { 
        try {

            ActivityThread thread = ActivityThread.currentActivityThread();

            IApplicationThread appThread = thread.getApplicationThread();

            String packageName = mContext.getPackageName();

            String packageName = mContext.getOpPackageName();

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

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

core/java/android/app/ContextImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ class ContextImpl extends Context { 
    public void startActivityAsUser(Intent intent, Bundle options, UserHandle user) {

        try {

            ActivityTaskManager.getService().startActivityAsUser(

                    mMainThread.getApplicationThread(), getBasePackageName(), getAttributionTag(),

                    mMainThread.getApplicationThread(), getOpPackageName(), getAttributionTag(),

                    intent, intent.resolveTypeIfNeeded(getContentResolver()),

                    null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, options,

                    user.getIdentifier());

core/java/android/app/Instrumentation.java

+10 −10
Original line number Diff line number Diff line
@@ -1725,7 +1725,7 @@ public class Instrumentation { 
            intent.migrateExtraStreamToClipData(who);

            intent.prepareToLeaveProcess(who);

            int result = ActivityTaskManager.getService().startActivity(whoThread,

                    who.getBasePackageName(), who.getAttributionTag(), intent,

                    who.getOpPackageName(), who.getAttributionTag(), intent,

                    intent.resolveTypeIfNeeded(who.getContentResolver()), token,

                    target != null ? target.mEmbeddedID : null, requestCode, 0, null, options);

            checkStartActivityResult(result, intent);
@@ -1797,7 +1797,7 @@ public class Instrumentation { 
                resolvedTypes[i] = intents[i].resolveTypeIfNeeded(who.getContentResolver());

            }

            int result = ActivityTaskManager.getService().startActivities(whoThread,

                    who.getBasePackageName(), who.getAttributionTag(), intents, resolvedTypes,

                    who.getOpPackageName(), who.getAttributionTag(), intents, resolvedTypes,

                    token, options, userId);

            checkStartActivityResult(result, intents[0]);

            return result;
@@ -1864,7 +1864,7 @@ public class Instrumentation { 
            intent.migrateExtraStreamToClipData(who);

            intent.prepareToLeaveProcess(who);

            int result = ActivityTaskManager.getService().startActivity(whoThread,

                    who.getBasePackageName(), who.getAttributionTag(), intent,

                    who.getOpPackageName(), who.getAttributionTag(), intent,

                    intent.resolveTypeIfNeeded(who.getContentResolver()), token, target,

                    requestCode, 0, null, options);

            checkStartActivityResult(result, intent);
@@ -1931,7 +1931,7 @@ public class Instrumentation { 
            intent.migrateExtraStreamToClipData(who);

            intent.prepareToLeaveProcess(who);

            int result = ActivityTaskManager.getService().startActivityAsUser(whoThread,

                    who.getBasePackageName(), who.getAttributionTag(), intent,

                    who.getOpPackageName(), who.getAttributionTag(), intent,

                    intent.resolveTypeIfNeeded(who.getContentResolver()), token, resultWho,

                    requestCode, 0, null, options, user.getIdentifier());

            checkStartActivityResult(result, intent);
@@ -1977,7 +1977,7 @@ public class Instrumentation { 
            intent.migrateExtraStreamToClipData(who);

            intent.prepareToLeaveProcess(who);

            int result = ActivityTaskManager.getService()

                .startActivityAsCaller(whoThread, who.getBasePackageName(), intent,

                    .startActivityAsCaller(whoThread, who.getOpPackageName(), intent,

                            intent.resolveTypeIfNeeded(who.getContentResolver()),

                            token, target != null ? target.mEmbeddedID : null,

                            requestCode, 0, null, options, permissionToken,
@@ -2023,7 +2023,7 @@ public class Instrumentation { 
        try {

            intent.migrateExtraStreamToClipData(who);

            intent.prepareToLeaveProcess(who);

            int result = appTask.startActivity(whoThread.asBinder(), who.getBasePackageName(),

            int result = appTask.startActivity(whoThread.asBinder(), who.getOpPackageName(),

                    who.getAttributionTag(), intent,

                    intent.resolveTypeIfNeeded(who.getContentResolver()), options);

            checkStartActivityResult(result, intent);

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −2
Original line number Diff line number Diff line
@@ -5193,7 +5193,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    final Intent dock = createHomeDockIntent();

                    if (dock != null) {

                        int result = ActivityTaskManager.getService()

                                .startActivityAsUser(null, mContext.getBasePackageName(),

                                .startActivityAsUser(null, mContext.getOpPackageName(),

                                        mContext.getAttributionTag(), dock,

                                        dock.resolveTypeIfNeeded(mContext.getContentResolver()),

                                        null, null, 0,
@@ -5205,7 +5205,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    }

                }

                int result = ActivityTaskManager.getService()

                        .startActivityAsUser(null, mContext.getBasePackageName(),

                        .startActivityAsUser(null, mContext.getOpPackageName(),

                                mContext.getAttributionTag(), mHomeIntent,

                                mHomeIntent.resolveTypeIfNeeded(mContext.getContentResolver()),

                                null, null, 0,