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

Commit e7421e92 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Revert "Activity start: Send featureId from context->AppOpsManager" 

Revert "Adjust monkey to changed internal APIs"

Revert "Test featureId is correctly used in startActivity"

Revert submission 10111030-activityStarter_featureId

Reason for revert: presubmit test breakage
Reverted Changes:
Ic7056b492: Activity start: Send featureId from context->AppOp...
I8e2a07da7: Adjust monkey to changed internal APIs
I7a6af6fb1: Test featureId is correctly used in startActivity

Change-Id: I48c55a962c990b22ea49e923baa7c73b121d179b
parent 9c5226fe

apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ public class UserLifecycleTests { 
    private void startApp(int userId, String packageName) throws RemoteException {

        final Context context = InstrumentationRegistry.getContext();

        final WaitResult result = ActivityTaskManager.getService().startActivityAndWait(null,

                context.getPackageName(), context.getFeatureId(),

                context.getPackageName(),

                context.getPackageManager().getLaunchIntentForPackage(packageName), null, null,

                null, 0, 0, null, null, userId);

        attestTrue("User " + userId + " failed to start " + packageName,

core/java/android/app/Activity.java

+5 −5
Original line number Diff line number Diff line
@@ -5810,9 +5810,9 @@ public class Activity extends ContextThemeWrapper 
                intent.prepareToLeaveProcess(this);

                result = ActivityTaskManager.getService()

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

                            getFeatureId(), intent,

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

                            requestCode, ActivityManager.START_FLAG_ONLY_IF_NEEDED, null, options);

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

                            mEmbeddedID, requestCode, ActivityManager.START_FLAG_ONLY_IF_NEEDED,

                            null, options);

            } catch (RemoteException e) {

                // Empty

            }
@@ -6606,8 +6606,8 @@ public class Activity extends ContextThemeWrapper 
        try {

            data.prepareToLeaveProcess(this);

            IIntentSender target =

                ActivityManager.getService().getIntentSenderWithFeature(

                        ActivityManager.INTENT_SENDER_ACTIVITY_RESULT, packageName, getFeatureId(),

                ActivityManager.getService().getIntentSender(

                        ActivityManager.INTENT_SENDER_ACTIVITY_RESULT, packageName,

                        mParent == null ? mToken : mParent.mToken,

                        mEmbeddedID, requestCode, new Intent[] { data }, null, flags, null,

                        getUserId());

core/java/android/app/ActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -4315,8 +4315,8 @@ public class ActivityManager { 
     */

    public static void broadcastStickyIntent(Intent intent, int appOp, int userId) {

        try {

            getService().broadcastIntentWithFeature(

                    null, null, intent, null, null, Activity.RESULT_OK, null, null,

            getService().broadcastIntent(

                    null, intent, null, null, Activity.RESULT_OK, null, null,

                    null /*permission*/, appOp, null, false, true, userId);

        } catch (RemoteException ex) {

        }

core/java/android/app/ActivityManagerInternal.java

+6 −9
Original line number Diff line number Diff line
@@ -269,16 +269,13 @@ public abstract class ActivityManagerInternal { 


    public abstract void tempWhitelistForPendingIntent(int callerPid, int callerUid, int targetUid,

            long duration, String tag);



    public abstract int broadcastIntentInPackage(String packageName, @Nullable String featureId,

            int uid, int realCallingUid, int realCallingPid, Intent intent, String resolvedType,

            IIntentReceiver resultTo, int resultCode, String resultData, Bundle resultExtras,

            String requiredPermission, Bundle bOptions, boolean serialized, boolean sticky,

            @UserIdInt int userId, boolean allowBackgroundActivityStarts);



    public abstract int broadcastIntentInPackage(String packageName, int uid, int realCallingUid,

            int realCallingPid, Intent intent, String resolvedType, IIntentReceiver resultTo,

            int resultCode, String resultData, Bundle resultExtras, String requiredPermission,

            Bundle bOptions, boolean serialized, boolean sticky, @UserIdInt int userId,

            boolean allowBackgroundActivityStarts);

    public abstract ComponentName startServiceInPackage(int uid, Intent service,

            String resolvedType, boolean fgRequired, String callingPackage,

            @Nullable String callingFeatureId, @UserIdInt int userId,

            String resolvedType, boolean fgRequired, String callingPackage, @UserIdInt int userId,

            boolean allowBackgroundActivityStarts) throws TransactionTooLargeException;



    public abstract void disconnectActivityFromServices(Object connectionHolder);

core/java/android/app/ContextImpl.java

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

        try {

            ActivityTaskManager.getService().startActivityAsUser(

                mMainThread.getApplicationThread(), getBasePackageName(), getFeatureId(), intent,

                mMainThread.getApplicationThread(), getBasePackageName(), intent,

                intent.resolveTypeIfNeeded(getContentResolver()),

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

                user.getIdentifier());
@@ -1102,8 +1102,8 @@ class ContextImpl extends Context { 
        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, false,

                    getUserId());

        } catch (RemoteException e) {
@@ -1119,8 +1119,8 @@ class ContextImpl extends Context { 
                : new String[] {receiverPermission};

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,

                    null, false, false, getUserId());

        } catch (RemoteException e) {
@@ -1134,8 +1134,8 @@ class ContextImpl extends Context { 
        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,

                    null, false, false, getUserId());

        } catch (RemoteException e) {
@@ -1149,8 +1149,8 @@ class ContextImpl extends Context { 
        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,

                    null, false, false, user.getIdentifier());

        } catch (RemoteException e) {
@@ -1166,8 +1166,8 @@ class ContextImpl extends Context { 
                : new String[] {receiverPermission};

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,

                    options, false, false, getUserId());

        } catch (RemoteException e) {
@@ -1183,8 +1183,8 @@ class ContextImpl extends Context { 
                : new String[] {receiverPermission};

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, false,

                    getUserId());

        } catch (RemoteException e) {
@@ -1200,8 +1200,8 @@ class ContextImpl extends Context { 
                : new String[] {receiverPermission};

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,

                    null, true, false, getUserId());

        } catch (RemoteException e) {
@@ -1263,8 +1263,8 @@ class ContextImpl extends Context { 
                : new String[] {receiverPermission};

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, rd,

            ActivityManager.getService().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, receiverPermissions, appOp,

                    options, true, false, getUserId());

        } catch (RemoteException e) {
@@ -1277,10 +1277,9 @@ class ContextImpl extends Context { 
        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, false,

                    user.getIdentifier());

            ActivityManager.getService().broadcastIntent(mMainThread.getApplicationThread(),

                    intent, resolvedType, null, Activity.RESULT_OK, null, null, null,

                    AppOpsManager.OP_NONE, null, false, false, user.getIdentifier());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -1300,8 +1299,8 @@ class ContextImpl extends Context { 
                : new String[] {receiverPermission};

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,

                    options, false, false, user.getIdentifier());

        } catch (RemoteException e) {
@@ -1317,8 +1316,8 @@ class ContextImpl extends Context { 
                : new String[] {receiverPermission};

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                    mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                    mMainThread.getApplicationThread(), intent, resolvedType, null,

                    Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, false,

                    user.getIdentifier());

        } catch (RemoteException e) {
@@ -1368,8 +1367,8 @@ class ContextImpl extends Context { 
                : new String[] {receiverPermission};

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, rd,

            ActivityManager.getService().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, receiverPermissions,

                    appOp, options, true, false, user.getIdentifier());

        } catch (RemoteException e) {
@@ -1409,8 +1408,8 @@ class ContextImpl extends Context { 
        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, true,

                getUserId());

        } catch (RemoteException e) {
@@ -1445,8 +1444,8 @@ class ContextImpl extends Context { 
        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, rd,

            ActivityManager.getService().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, null,

                    AppOpsManager.OP_NONE, null, true, true, getUserId());

        } catch (RemoteException e) {
@@ -1477,8 +1476,8 @@ class ContextImpl extends Context { 
        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, true,

                    user.getIdentifier());

        } catch (RemoteException e) {
@@ -1492,8 +1491,8 @@ class ContextImpl extends Context { 
        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, null,

            ActivityManager.getService().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, null,

                Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, options, false, true,

                user.getIdentifier());

        } catch (RemoteException e) {
@@ -1527,8 +1526,8 @@ class ContextImpl extends Context { 
        String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());

        try {

            intent.prepareToLeaveProcess(this);

            ActivityManager.getService().broadcastIntentWithFeature(

                mMainThread.getApplicationThread(), getFeatureId(), intent, resolvedType, rd,

            ActivityManager.getService().broadcastIntent(

                mMainThread.getApplicationThread(), intent, resolvedType, rd,

                initialCode, initialData, initialExtras, null,

                    AppOpsManager.OP_NONE, null, true, true, user.getIdentifier());

        } catch (RemoteException e) {
@@ -1613,9 +1612,9 @@ class ContextImpl extends Context { 
            }

        }

        try {

            final Intent intent = ActivityManager.getService().registerReceiverWithFeature(

                    mMainThread.getApplicationThread(), mBasePackageName, getFeatureId(), rd,

                    filter, broadcastPermission, userId, flags);

            final Intent intent = ActivityManager.getService().registerReceiver(

                    mMainThread.getApplicationThread(), mBasePackageName, rd, filter,

                    broadcastPermission, userId, flags);

            if (intent != null) {

                intent.setExtrasClassLoader(getClassLoader());

                intent.prepareToEnterProcess();
@@ -1688,9 +1687,9 @@ class ContextImpl extends Context { 
            validateServiceIntent(service);

            service.prepareToLeaveProcess(this);

            ComponentName cn = ActivityManager.getService().startService(

                    mMainThread.getApplicationThread(), service,

                    service.resolveTypeIfNeeded(getContentResolver()), requireForeground,

                    getOpPackageName(), getFeatureId(), user.getIdentifier());

                mMainThread.getApplicationThread(), service, service.resolveTypeIfNeeded(

                            getContentResolver()), requireForeground,

                            getOpPackageName(), user.getIdentifier());

            if (cn != null) {

                if (cn.getPackageName().equals("!")) {

                    throw new SecurityException(