Snap for 7884658 from a83bfae4d0df4c2391e9dfed58fab7d335b27501 to android11-tests-release

Change-Id: I5b776171c20ae8ad2e42fa58b52f125fccfd7f91

1 files changed, 10 insertions, 0 deletions

diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java
index d7c4b3117df..f685536ef09 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java
@@ -31,6 +31,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.Map;
 
@@ -187,6 +188,7 @@ public class StorageHostTest extends BaseHostJUnit4Test {
 
     @Test
     public void testFullDisk() throws Exception {
+        assumeTrue(!isWatch());
         // Clear all other cached and external storage data to give ourselves a
         // clean slate to test against
         getDevice().executeShellCommand("pm trim-caches 4096G");
@@ -256,4 +258,12 @@ public class StorageHostTest extends BaseHostJUnit4Test {
             }
         }
     }
+
+    private boolean isWatch() {
+        try {
+             return getDevice().hasFeature("feature:android.hardware.type.watch");
+        } catch (DeviceNotAvailableException e) {
+            return false;
+        }
+    }
 }