commit e201480e77e07cef65784ddfd21977515dbe1416
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 12 00:07:37 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 12 00:07:37 2023 +0000
tree a75f6005e4d8fa3571af0b2302695ce7046956da
parent e04071e19c4d48609a715163b62416ec1ca714b1
parent 88a91bbd163775421902c3611d1cf430ffd7d050

Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev

src/com/android/launcher3/allapps/WorkProfileManager.java

diff --git a/src/com/android/launcher3/allapps/WorkProfileManager.java b/src/com/android/launcher3/allapps/WorkProfileManager.java
index bf36e02..a671c6e 100644
--- a/src/com/android/launcher3/allapps/WorkProfileManager.java
+++ b/src/com/android/launcher3/allapps/WorkProfileManager.java
@@ -97,7 +97,11 @@
             StatsLogManager statsLogManager) {
         mUserManager = userManager;
         mAllApps = allApps;
-        if (FeatureFlags.ENABLE_APP_CLONING_CHANGES_IN_LAUNCHER.get()) {
+        boolean cloningChanges = FeatureFlags.ENABLE_APP_CLONING_CHANGES_IN_LAUNCHER.get();
+        if (TestProtocol.sDebugTracing) {
+            Log.d(WORK_TAB_MISSING, "matcher flag: " + cloningChanges);
+        }
+        if (cloningChanges) {
             mMatcher = ofWorkProfileUser(userManager);
         } else {
             mMatcher = mAllApps.mPersonalMatcher.negate();

src/com/android/launcher3/model/PackageUpdatedTask.java

diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java
index d4a5e1b..8c938f4 100644
--- a/src/com/android/launcher3/model/PackageUpdatedTask.java
+++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -95,7 +95,7 @@
         mPackages = packages;
         if (TestProtocol.sDebugTracing) {
             Log.d(TestProtocol.WORK_TAB_MISSING, "PackageUpdatedTask mOp: " + mOp +
-                    " packageCount: " + mPackages.length);
+                    " packageCount: " + mPackages.length + " user: " + user);
             DEBUG = true;
         }
     }

src/com/android/launcher3/util/ItemInfoMatcher.java

diff --git a/src/com/android/launcher3/util/ItemInfoMatcher.java b/src/com/android/launcher3/util/ItemInfoMatcher.java
index b6af314..8a27381 100644
--- a/src/com/android/launcher3/util/ItemInfoMatcher.java
+++ b/src/com/android/launcher3/util/ItemInfoMatcher.java
@@ -18,6 +18,7 @@
 
 import android.content.ComponentName;
 import android.os.UserHandle;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 
@@ -25,6 +26,7 @@
 import com.android.launcher3.model.data.FolderInfo;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.shortcuts.ShortcutKey;
+import com.android.launcher3.testing.shared.TestProtocol;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -42,7 +44,14 @@
     private static final ComponentName EMPTY_COMPONENT = new ComponentName("", "");
 
     public static Predicate<ItemInfo> ofUser(UserHandle user) {
-        return info -> info != null && info.user.equals(user);
+        return info -> {
+            if (TestProtocol.sDebugTracing) {
+                Log.d(TestProtocol.WORK_TAB_MISSING, "userHandle: " + user
+                        + ", itemUserHandle: " + info.user
+                        + " package: " + info.getTargetPackage());
+            }
+            return info != null && info.user.equals(user);
+        };
     }
 
     public static Predicate<ItemInfo> ofComponents(