Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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: 22e135e17c

Browse Source 
Original change: undetermined

Change-Id: I2a1d52c4295e1b239bc174ee5f06bcbaa02d3610
This commit is contained in:
TreeHugger Robot
2020-06-02 13:42:52 +00:00
committed by Automerger Merge Worker
parent 00cb90c6c3 22e135e17c
commit 625ed8e4a2
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2182,6 +2182,9 @@ public class ChooserActivity extends ResolverActivity implements
} }
void updateModelAndChooserCounts(TargetInfo info) { void updateModelAndChooserCounts(TargetInfo info) {
if (info != null && info instanceof MultiDisplayResolveInfo) {
info = ((MultiDisplayResolveInfo) info).getSelectedTarget();
}
if (info != null) { if (info != null) {
sendClickToAppPredictor(info); sendClickToAppPredictor(info);
final ResolveInfo ri = info.getResolveInfo(); final ResolveInfo ri = info.getResolveInfo();

7
core/java/com/android/internal/app/chooser/MultiDisplayResolveInfo.java
View File

@@ -69,6 +69,13 @@ public class MultiDisplayResolveInfo extends DisplayResolveInfo {
mSelected = selected; 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. * Whether or not the user has selected a specific target for this MultiInfo.
*/ */