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

Commit 6b712bb6 authored by Adam He's avatar Adam He
Browse files

Fix SaveUi to properly resolve for instant apps. 

This issue causes CTS test failures while running instant mode tests.
This patch will help partners pass instant mode CTS successfully.

Bug: 153099178
Test: atest --instant android.autofillservice.cts.SimpleSaveActivityTest
Change-Id: I2bd6c553c75a1a207d7bfd7113aad5e377880b3e
parent 3c05b922

services/autofill/java/com/android/server/autofill/ui/SaveUi.java

+8 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentSender;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;
@@ -214,7 +215,13 @@ final class SaveUi { 
                    return componentName;

                }

                intent.addFlags(Intent.FLAG_ACTIVITY_MATCH_EXTERNAL);

                return intent.resolveActivity(packageManager);

                final ActivityInfo ai =

                        intent.resolveActivityInfo(packageManager, PackageManager.MATCH_INSTANT);

                if (ai != null) {

                    return new ComponentName(ai.applicationInfo.packageName, ai.name);

                }



                return null;

            }

        };

        final LayoutInflater inflater = LayoutInflater.from(context);