From 4872e68cf6343c04a310445f006ec189525be247 Mon Sep 17 00:00:00 2001
From: arangelov <arangelov@google.com>
Date: Thu, 16 Apr 2020 15:57:38 +0100
Subject: [PATCH] Call updateChooserCounts with the correct user id

Fixes: 154216098
Test: atest ChooserActivityTest
Test: manually share in-profile and cross-profile
Change-Id: I7a970acba6ca4ab044c2fa07cef6bfe99582bf62
---
 core/java/com/android/internal/app/ChooserActivity.java     | 2 +-
 core/java/com/android/internal/app/ResolverListAdapter.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 3e7f24b034ac3..d851a099d0e17 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -2171,7 +2171,7 @@ public class ChooserActivity extends ResolverActivity implements
                         mChooserMultiProfilePagerAdapter.getActiveListAdapter();
                 if (currentListAdapter != null) {
                     currentListAdapter.updateModel(info.getResolvedComponentName());
-                    currentListAdapter.updateChooserCounts(ri.activityInfo.packageName, getUserId(),
+                    currentListAdapter.updateChooserCounts(ri.activityInfo.packageName,
                             targetIntent.getAction());
                 }
                 if (DEBUG) {
diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java
index 579abeecad13d..73109c5c1fbc5 100644
--- a/core/java/com/android/internal/app/ResolverListAdapter.java
+++ b/core/java/com/android/internal/app/ResolverListAdapter.java
@@ -165,8 +165,9 @@ public class ResolverListAdapter extends BaseAdapter {
         mResolverListController.updateModel(componentName);
     }
 
-    public void updateChooserCounts(String packageName, int userId, String action) {
-        mResolverListController.updateChooserCounts(packageName, userId, action);
+    public void updateChooserCounts(String packageName, String action) {
+        mResolverListController.updateChooserCounts(
+                packageName, getUserHandle().getIdentifier(), action);
     }
 
     List<ResolvedComponentInfo> getUnfilteredResolveList() {