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

Commit c9aa38fc authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Remove normalize_home_intent flag" into main

parents 8d6b1647 f207b00b

core/java/android/window/flags/windowing_sdk.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -122,16 +122,6 @@ flag { 
    }

}



flag {

    namespace: "windowing_sdk"

    name: "normalize_home_intent"

    description: "To ensure home is started in correct intent"

    bug: "378505461"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    namespace: "windowing_sdk"

    name: "condense_configuration_change_for_simple_mode"

services/core/java/com/android/server/wm/ActivityStartInterceptor.java

+24 −31
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ import com.android.internal.app.UnlaunchableAppActivity; 
import com.android.server.LocalServices;

import com.android.server.am.ActivityManagerService;

import com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptResult;

import com.android.window.flags.Flags;



/**

 * A class that contains activity intercepting logic for {@link ActivityStarter#execute()}
@@ -504,7 +503,6 @@ class ActivityStartInterceptor { 
        }



        boolean intercepted = false;

        if (Flags.normalizeHomeIntent()) {

        if (!ACTION_MAIN.equals(mIntent.getAction()) || (!mIntent.hasCategory(CATEGORY_HOME)

                && !mIntent.hasCategory(CATEGORY_SECONDARY_HOME))) {

            // not a home intent
@@ -535,11 +533,6 @@ class ActivityStartInterceptor { 
            normalizeHomeIntent();

            intercepted = true;

        }

        } else {

            if (!ActivityRecord.isHomeIntent(mIntent)) {

                return false;

            }

        }



        intercepted |= replaceToSecondaryHomeIntentIfNeeded();

        if (intercepted) {

services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java

+0 −3
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import android.content.pm.UserPackage; 
import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;

import android.platform.test.flag.junit.SetFlagsRule;

import android.testing.DexmakerShareClassLoaderRule;
@@ -68,7 +67,6 @@ import com.android.internal.app.SuspendedAppActivity; 
import com.android.internal.app.UnlaunchableAppActivity;

import com.android.server.LocalServices;

import com.android.server.am.ActivityManagerService;

import com.android.window.flags.Flags;



import org.junit.After;

import org.junit.Before;
@@ -242,7 +240,6 @@ public class ActivityStartInterceptorTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_NORMALIZE_HOME_INTENT)

    public void testInterceptIncorrectHomeIntent() {

        // Create a non-standard home intent

        final Intent homeIntent = new Intent(Intent.ACTION_MAIN);