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

Commit 5d9e7aac authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Provide calling package name when starting activities"

parents 67720d84 9e0a751e

services/core/java/com/android/server/UiModeManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1059,8 +1059,8 @@ final class UiModeManagerService extends SystemService { 
            if (Sandman.shouldStartDockApp(getContext(), homeIntent)) {

                try {

                    int result = ActivityTaskManager.getService().startActivityWithConfig(

                            null, null, homeIntent, null, null, null, 0, 0,

                            mConfiguration, null, UserHandle.USER_CURRENT);

                            null, getContext().getBasePackageName(), homeIntent, null, null, null,

                            0, 0, mConfiguration, null, UserHandle.USER_CURRENT);

                    if (ActivityManager.isStartResultSuccessful(result)) {

                        dockAppStarted = true;

                    } else if (result != ActivityManager.START_INTENT_NOT_RESOLVED) {

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

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

                    if (dock != null) {

                        int result = ActivityTaskManager.getService()

                                .startActivityAsUser(null, null, dock,

                                .startActivityAsUser(null, mContext.getBasePackageName(), dock,

                                        dock.resolveTypeIfNeeded(mContext.getContentResolver()),

                                        null, null, 0,

                                        ActivityManager.START_FLAG_ONLY_IF_NEEDED,
@@ -5203,7 +5203,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    }

                }

                int result = ActivityTaskManager.getService()

                        .startActivityAsUser(null, null, mHomeIntent,

                        .startActivityAsUser(null, mContext.getBasePackageName(), mHomeIntent,

                                mHomeIntent.resolveTypeIfNeeded(mContext.getContentResolver()),

                                null, null, 0,

                                ActivityManager.START_FLAG_ONLY_IF_NEEDED,