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

Commit df030f3f authored by John Wu's avatar John Wu Committed by Automerger Merge Worker
Browse files

Merge "Update ActivityIntentHelper to use PendingIntents directly" into... 

Merge "Update ActivityIntentHelper to use PendingIntents directly" into tm-qpr-dev am: 78b2b556 am: 01313d12

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19506274



Change-Id: Id344040857b62d9ad00a857b3613d82de97c7ab6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5425d0f 01313d12

packages/SystemUI/src/com/android/systemui/ActivityIntentHelper.java

+54 −7
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui;



import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ActivityInfo;
@@ -34,12 +35,12 @@ import javax.inject.Inject; 
@SysUISingleton

public class ActivityIntentHelper {



    private final Context mContext;

    private final PackageManager mPm;



    @Inject

    public ActivityIntentHelper(Context context) {

        // TODO: inject a package manager, not a context.

        mContext = context;

        mPm = context.getPackageManager();

    }



    /**
@@ -56,6 +57,15 @@ public class ActivityIntentHelper { 
        return targetActivityInfo == null;

    }



    /**

     * @see #wouldLaunchResolverActivity(Intent, int)

     */

    public boolean wouldPendingLaunchResolverActivity(PendingIntent intent, int currentUserId) {

        ActivityInfo targetActivityInfo = getPendingTargetActivityInfo(intent, currentUserId,

                false /* onlyDirectBootAware */);

        return targetActivityInfo == null;

    }



    /**

     * Returns info about the target Activity of a given intent, or null if the intent does not

     * resolve to a specific component meeting the requirements.
@@ -68,19 +78,45 @@ public class ActivityIntentHelper { 
     */

    public ActivityInfo getTargetActivityInfo(Intent intent, int currentUserId,

            boolean onlyDirectBootAware) {

        PackageManager packageManager = mContext.getPackageManager();

        int flags = PackageManager.MATCH_DEFAULT_ONLY;

        int flags = PackageManager.MATCH_DEFAULT_ONLY | PackageManager.GET_META_DATA;

        if (!onlyDirectBootAware) {

            flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE

                    | PackageManager.MATCH_DIRECT_BOOT_UNAWARE;

        }

        final List<ResolveInfo> appList = packageManager.queryIntentActivitiesAsUser(

        final List<ResolveInfo> appList = mPm.queryIntentActivitiesAsUser(

                intent, flags, currentUserId);

        if (appList.size() == 0) {

            return null;

        }

        ResolveInfo resolved = packageManager.resolveActivityAsUser(intent,

                flags | PackageManager.GET_META_DATA, currentUserId);

        if (appList.size() == 1) {

            return appList.get(0).activityInfo;

        }

        ResolveInfo resolved = mPm.resolveActivityAsUser(intent, flags, currentUserId);

        if (resolved == null || wouldLaunchResolverActivity(resolved, appList)) {

            return null;

        } else {

            return resolved.activityInfo;

        }

    }



    /**

     * @see #getTargetActivityInfo(Intent, int, boolean)

     */

    public ActivityInfo getPendingTargetActivityInfo(PendingIntent intent, int currentUserId,

            boolean onlyDirectBootAware) {

        int flags = PackageManager.MATCH_DEFAULT_ONLY | PackageManager.GET_META_DATA;

        if (!onlyDirectBootAware) {

            flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE

                    | PackageManager.MATCH_DIRECT_BOOT_UNAWARE;

        }

        final List<ResolveInfo> appList = intent.queryIntentComponents(flags);

        if (appList.size() == 0) {

            return null;

        }

        if (appList.size() == 1) {

            return appList.get(0).activityInfo;

        }

        ResolveInfo resolved = mPm.resolveActivityAsUser(intent.getIntent(), flags, currentUserId);

        if (resolved == null || wouldLaunchResolverActivity(resolved, appList)) {

            return null;

        } else {
@@ -103,6 +139,17 @@ public class ActivityIntentHelper { 
                | ActivityInfo.FLAG_SHOW_FOR_ALL_USERS)) > 0;

    }



    /**

     * @see #wouldShowOverLockscreen(Intent, int)

     */

    public boolean wouldPendingShowOverLockscreen(PendingIntent intent, int currentUserId) {

        ActivityInfo targetActivityInfo = getPendingTargetActivityInfo(intent,

                currentUserId, false /* onlyDirectBootAware */);

        return targetActivityInfo != null

                && (targetActivityInfo.flags & (ActivityInfo.FLAG_SHOW_WHEN_LOCKED

                | ActivityInfo.FLAG_SHOW_FOR_ALL_USERS)) > 0;

    }



    /**

     * Determines if sending the given intent would result in starting an Intent resolver activity,

     * instead of resolving to a specific component.

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -4065,7 +4065,7 @@ public class CentralSurfacesImpl extends CoreStartable implements 
            final PendingIntent intent, @Nullable final Runnable intentSentUiThreadCallback,

            @Nullable ActivityLaunchAnimator.Controller animationController) {

        final boolean willLaunchResolverActivity = intent.isActivity()

                && mActivityIntentHelper.wouldLaunchResolverActivity(intent.getIntent(),

                && mActivityIntentHelper.wouldPendingLaunchResolverActivity(intent,

                mLockscreenUserManager.getCurrentUserId());



        boolean animate = !willLaunchResolverActivity

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java

+2 −2
Original line number Diff line number Diff line
@@ -223,12 +223,12 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 


        boolean isActivityIntent = intent != null && intent.isActivity() && !isBubble;

        final boolean willLaunchResolverActivity = isActivityIntent

                && mActivityIntentHelper.wouldLaunchResolverActivity(intent.getIntent(),

                && mActivityIntentHelper.wouldPendingLaunchResolverActivity(intent,

                mLockscreenUserManager.getCurrentUserId());

        final boolean animate = !willLaunchResolverActivity

                && mCentralSurfaces.shouldAnimateLaunch(isActivityIntent);

        boolean showOverLockscreen = mKeyguardStateController.isShowing() && intent != null

                && mActivityIntentHelper.wouldShowOverLockscreen(intent.getIntent(),

                && mActivityIntentHelper.wouldPendingShowOverLockscreen(intent,

                mLockscreenUserManager.getCurrentUserId());

        ActivityStarter.OnDismissAction postKeyguardAction = new ActivityStarter.OnDismissAction() {

            @Override

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java

+3 −2
Original line number Diff line number Diff line
@@ -259,8 +259,9 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks, 
        final boolean isActivity = pendingIntent.isActivity();

        if (isActivity || appRequestedAuth) {

            mActionClickLogger.logWaitingToCloseKeyguard(pendingIntent);

            final boolean afterKeyguardGone = mActivityIntentHelper.wouldLaunchResolverActivity(

                    pendingIntent.getIntent(), mLockscreenUserManager.getCurrentUserId());

            final boolean afterKeyguardGone = mActivityIntentHelper

                    .wouldPendingLaunchResolverActivity(pendingIntent,

                            mLockscreenUserManager.getCurrentUserId());

            mActivityStarter.dismissKeyguardThenExecute(() -> {

                mActionClickLogger.logKeyguardGone(pendingIntent);

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java

+0 −5
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.app.KeyguardManager; 
import android.app.Notification;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.Intent;

import android.os.Handler;

import android.os.RemoteException;

import android.os.UserHandle;
@@ -135,8 +134,6 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
    @Mock

    private PendingIntent mContentIntent;

    @Mock

    private Intent mContentIntentInner;

    @Mock

    private OnUserInteractionCallback mOnUserInteractionCallback;

    @Mock

    private Runnable mFutureDismissalRunnable;
@@ -159,7 +156,6 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
        MockitoAnnotations.initMocks(this);

        when(mContentIntent.isActivity()).thenReturn(true);

        when(mContentIntent.getCreatorUserHandle()).thenReturn(UserHandle.of(1));

        when(mContentIntent.getIntent()).thenReturn(mContentIntentInner);



        NotificationTestHelper notificationTestHelper = new NotificationTestHelper(

                mContext,
@@ -374,7 +370,6 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { 
                eq(entry.getKey()), any(NotificationVisibility.class));



        // The content intent should NOT be sent on click.

        verify(mContentIntent).getIntent();

        verify(mContentIntent).isActivity();

        verifyNoMoreInteractions(mContentIntent);

    }