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

Commit 8549324e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix app stack issue: send the selected target info into... 

Merge "Fix app stack issue: send the selected target info into AppPredictionService and UsageStatsManager, when user share from app stack on sharesheet." into rvc-dev am: 22e135e1

Original change: undetermined

Change-Id: I828cc2304818e85528a15ba44d41f035439a6bdc
parents 3f6cd503 22e135e1

core/java/com/android/internal/app/ChooserActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -2182,6 +2182,9 @@ public class ChooserActivity extends ResolverActivity implements 
    }



    void updateModelAndChooserCounts(TargetInfo info) {

        if (info != null && info instanceof MultiDisplayResolveInfo) {

            info = ((MultiDisplayResolveInfo) info).getSelectedTarget();

        }

        if (info != null) {

            sendClickToAppPredictor(info);

            final ResolveInfo ri = info.getResolveInfo();

core/java/com/android/internal/app/chooser/MultiDisplayResolveInfo.java

+7 −0
Original line number Diff line number Diff line
@@ -69,6 +69,13 @@ public class MultiDisplayResolveInfo extends DisplayResolveInfo { 
        mSelected = selected;

    }



    /**

     * Return selected target.

     */

    public DisplayResolveInfo getSelectedTarget() {

        return hasSelected() ? mTargetInfos.get(mSelected) : null;

    }



    /**

     * Whether or not the user has selected a specific target for this MultiInfo.

     */