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

Commit 82e60027 authored by Tony Mak's avatar Tony Mak
Browse files

Fix an issue that clicking on a smart action chip on keyguard ... 

failed to launch app resolver when there are more than one app handlers.

What happened:
1. TextClassifier constructs an implicit intent to fulfill a task
like opening a link, making a phone call, etc.
2. TextClassifier calls resolveActivity against the implicit intent to
resolve the intent. The resolve component name will be used to create
an explicit intent. In this case, the intent is resolved to the
app resolver activity.
3. wouldLaunchResolverActivity in SysUI returns false for an explicit
intent with component name android/ResolverActivity.
4. SysUI does not trigger the "start the activity after the keyguard
is gone" logic because wouldLaunchResolverActivity returns false.
5. When user clicks on the action on keyguard, ResolveActivity.onStop
is triggered because it is shown (and thus moved to the background)
under the keyguard. So, finish() is called in onStop, and thus the bug.

IMHO, wouldLaunchResolverActivity should not return false
for an explicit intent with component name android/ResolverActivity.
But since we are late at this point, the safest option is to not setting
component name when the intent is resolved to package "android". Note that
this is what we are doing for P, so it should be pretty safe.

Test: 1. Install two browsers. Send myself a link. Tap on the Open Link
chip on keyguard. App resolver is shown.
2. atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/

BUG: 129220155

Change-Id: I6d4d67c2233a2fec950887ea274825bf1cbc1ae2
parent f61e5f24

core/java/android/view/textclassifier/ActionsSuggestionsHelper.java

+7 −3
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ package android.view.textclassifier; 
import android.annotation.Nullable;

import android.app.Person;

import android.app.RemoteAction;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.Pair;
@@ -200,10 +202,12 @@ public final class ActionsSuggestionsHelper { 
        if (remoteAction == null) {

            return null;

        }

        Intent actionIntent = ExtrasUtils.getActionIntent(conversationAction.getExtras());

        ComponentName componentName = actionIntent.getComponent();

        // Action without a component name will be considered as from the same app.

        String packageName = componentName == null ? null : componentName.getPackageName();

        return new Pair<>(

                conversationAction.getAction().getTitle().toString(),

                ExtrasUtils.getActionIntent(

                        conversationAction.getExtras()).getComponent().getPackageName());

                conversationAction.getAction().getTitle().toString(), packageName);

    }



    private static final class PersonEncoder {

core/java/android/view/textclassifier/intent/LabeledIntent.java

+4 −2
Original line number Diff line number Diff line
@@ -118,14 +118,16 @@ public final class LabeledIntent { 
            return null;

        }

        Intent resolvedIntent = new Intent(intent);

        resolvedIntent.setComponent(new ComponentName(packageName, className));

        resolvedIntent.putExtra(

                TextClassifier.EXTRA_FROM_TEXT_CLASSIFIER,

                getFromTextClassifierExtra(textLanguagesBundle));



        boolean shouldShowIcon = false;

        Icon icon = null;

        if (!"android".equals(packageName)) {

            // We only set the component name when the package name is not resolved to "android"

            // to workaround a bug that explicit intent with component name == ResolverActivity

            // can't be launched on keyguard.

            resolvedIntent.setComponent(new ComponentName(packageName, className));

            if (resolveInfo.activityInfo.getIconResource() != 0) {

                icon = Icon.createWithResource(

                        packageName, resolveInfo.activityInfo.getIconResource());

core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java

+30 −0
Original line number Diff line number Diff line
@@ -208,6 +208,36 @@ public class ActionsSuggestionsHelperTest { 
        assertThat(conversationActions.get(2).getAction()).isNull();

    }



    @Test

    public void testDeduplicateActions_nullComponent() {

        Bundle phoneExtras = new Bundle();

        Intent phoneIntent = new Intent(Intent.ACTION_DIAL);

        ExtrasUtils.putActionIntent(phoneExtras, phoneIntent);

        PendingIntent pendingIntent = PendingIntent.getActivity(

                InstrumentationRegistry.getTargetContext(),

                0,

                phoneIntent,

                0);

        Icon icon = Icon.createWithData(new byte[0], 0, 0);

        ConversationAction action =

                new ConversationAction.Builder(ConversationAction.TYPE_CALL_PHONE)

                        .setAction(new RemoteAction(icon, "label", "1", pendingIntent))

                        .setExtras(phoneExtras)

                        .build();

        ConversationAction actionWithSameLabel =

                new ConversationAction.Builder(ConversationAction.TYPE_CALL_PHONE)

                        .setAction(new RemoteAction(

                                icon, "label", "2", pendingIntent))

                        .setExtras(phoneExtras)

                        .build();



        List<ConversationAction> conversationActions =

                ActionsSuggestionsHelper.removeActionsWithDuplicates(

                        Arrays.asList(action, actionWithSameLabel));



        assertThat(conversationActions).isEmpty();

    }



    public void createLabeledIntentResult_null() {

        ActionsSuggestionsModel.ActionSuggestion nativeSuggestion =

                new ActionsSuggestionsModel.ActionSuggestion(