Snap for 7375516 from 5a8e56d80b9abe91e706cd272cfba9cccc35dd5f to sc-releaseandroid-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-release

Change-Id: I0224b86762bb3388e57567c3eaf41d1e74cc6ae4

1 files changed, 7 insertions, 4 deletions

diff --git a/java/android/compat/testing/Classpaths.java b/java/android/compat/testing/Classpaths.java
index 406176e..3b4efd0 100644
--- a/java/android/compat/testing/Classpaths.java
+++ b/java/android/compat/testing/Classpaths.java
@@ -19,7 +19,7 @@ package android.compat.testing;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.device.INativeDevice;
 import com.android.tradefed.util.CommandResult;
 import com.android.tradefed.util.CommandStatus;
 import com.android.tradefed.util.FileUtil;
@@ -52,7 +52,7 @@ public final class Classpaths {
     }
 
     /** Returns on device filepaths to the jars that are part of a given classpath. */
-    public static ImmutableList<String> getJarsOnClasspath(ITestDevice device,
+    public static ImmutableList<String> getJarsOnClasspath(INativeDevice device,
             ClasspathType classpath) throws DeviceNotAvailableException {
         CommandResult shellResult = device.executeShellV2Command("echo $" + classpath);
         assertThat(shellResult.getStatus()).isEqualTo(CommandStatus.SUCCESS);
@@ -64,11 +64,14 @@ public final class Classpaths {
     }
 
     /** Returns classes defined a given jar file on the test device. */
-    public static ImmutableSet<ClassDef> getClassDefsFromJar(ITestDevice device,
+    public static ImmutableSet<ClassDef> getClassDefsFromJar(INativeDevice device,
             String remoteJarPath) throws DeviceNotAvailableException, IOException {
         File jar = null;
         try {
-            jar = Objects.requireNonNull(device.pullFile(remoteJarPath));
+            jar = device.pullFile(remoteJarPath);
+            if (jar == null) {
+                throw new IllegalStateException("could not pull remote file " + remoteJarPath);
+            }
             MultiDexContainer<? extends DexBackedDexFile> container =
                     DexFileFactory.loadDexContainer(jar, Opcodes.getDefault());
             ImmutableSet.Builder<ClassDef> set = ImmutableSet.builder();