commit f49d1a5dbc2cfb8937288db3ee545279f6e43657
author Shikha Malhotra <shikhamalhotra@google.com> Wed Sep 07 09:17:29 2022 +0000
committer Shikha Malhotra <shikhamalhotra@google.com> Fri Sep 09 20:16:16 2022 +0000
tree ef350853778501d91d7d3fd0f34f5c6d4a3e5362
parent e36343738851a9d3ef0e3509c4f826539398183a

Add NPE check before checking for the path

Bug: b/227674108
Test: atest StorageManagerTest
Change-Id: Id2d43920bef8e62409614a72ec1f6d9a13ce4988
(cherry picked from commit c89485013eb245cb0ab538af9dbe9fdb91ba06d1)

tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java

diff --git a/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java b/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
index e0edade..3beffbb 100644
--- a/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
+++ b/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
@@ -310,7 +310,9 @@
         Log.d(TAG, "testGetStorageVolumeUSB#volumeName: " + volumeName);
         List<StorageVolume> storageVolumes = mStorageManager.getStorageVolumes();
         Optional<StorageVolume> usbStorageVolume =
-                storageVolumes.stream().filter(sv->sv.getPath().contains(volumeName)).findFirst();
+                storageVolumes.stream().filter(sv->
+                sv != null && sv.getPath() != null && sv.getPath().contains(volumeName)
+            ).findFirst();
         assertTrue("The USB storage volume mounted on the main user is not present in "
                 + storageVolumes.stream().map(StorageVolume::getPath)
                 .collect(joining("\n")), usbStorageVolume.isPresent());
@@ -322,7 +324,9 @@
         Log.d(TAG, "testGetStorageVolumeSDCard#volumeName: " + volumeName);
         List<StorageVolume> storageVolumes = mStorageManager.getStorageVolumes();
         Optional<StorageVolume> sdCardStorageVolume =
-                storageVolumes.stream().filter(sv->sv.getPath().contains(volumeName)).findFirst();
+                storageVolumes.stream().filter(sv->
+                sv != null && sv.getPath() != null && sv.getPath().contains(volumeName)
+            ).findFirst();
         assertTrue("The SdCard storage volume mounted on the main user is not present in "
                         + storageVolumes.stream().map(StorageVolume::getPath)
                         .collect(joining("\n")), sdCardStorageVolume.isPresent());