commit 42d496d1636c4f4dfe2b7c6ca1b7928a8b439287
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Apr 10 02:03:31 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 02:03:31 2024 +0000
tree 488b0660e9310bf349e3c5adfb74ccb4629e20c5
parent c072d44b4e9dd039d8c415c5753d1096203ff35f
parent efc3c4641946804ceabff44f78bc38230d0e2a55

Merge "Fixing null check causing test breakage" into main

tests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java

diff --git a/tests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java b/tests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java
index 8f398a6..2dcbda4 100644
--- a/tests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java
+++ b/tests/src/com/android/launcher3/allapps/PrivateProfileManagerTest.java
@@ -209,7 +209,8 @@
 
         Mockito.verify(mContext).startActivity(acIntent.capture());
         assertEquals("Intent Action is different",
-                expectedIntent.toUri(0), acIntent.getValue().toUri(0));
+                expectedIntent == null ? null : expectedIntent.toUri(0),
+                acIntent.getValue() == null ? null : acIntent.getValue().toUri(0));
     }
 
     private static void awaitTasksCompleted() throws Exception {