commit b999106fcd6d0755bdbe9f4b29483dcaf50605fb
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 09 19:54:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 09 19:54:21 2018 +0000
tree 4319f3b7648d043da653d392c83757ca390a8928
parent bda6de22b7fa00ae314d3c919b7254f08ae77265
parent fab39d35cbc0d4c773e748f3786d68fd2fd65c60

Merge "Don't reference getPinnedSpecs List APIs" into pi-androidx-dev

slices/view/src/androidTest/java/androidx/slice/SliceManagerTest.java

diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceManagerTest.java b/slices/view/src/androidTest/java/androidx/slice/SliceManagerTest.java
index 5564f72..61d5c2b 100644
--- a/slices/view/src/androidTest/java/androidx/slice/SliceManagerTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/SliceManagerTest.java
@@ -37,7 +37,6 @@
 import androidx.annotation.NonNull;
 import androidx.core.os.BuildCompat;
 import androidx.slice.render.SliceRenderActivity;
-import androidx.slice.widget.SliceLiveData;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -124,7 +123,8 @@
         mManager.pinSlice(uri);
         verify(mSliceProvider).onSlicePinned(eq(uri));
 
-        assertEquals(SliceLiveData.SUPPORTED_SPECS, mManager.getPinnedSpecs(uri));
+        // Disabled while we update APIs.
+        //assertEquals(SliceLiveData.SUPPORTED_SPECS, mManager.getPinnedSpecs(uri));
     }
 
     @Test

slices/view/src/main/java/androidx/slice/SliceManagerWrapper.java

diff --git a/slices/view/src/main/java/androidx/slice/SliceManagerWrapper.java b/slices/view/src/main/java/androidx/slice/SliceManagerWrapper.java
index e0c0342..b28efd1 100644
--- a/slices/view/src/main/java/androidx/slice/SliceManagerWrapper.java
+++ b/slices/view/src/main/java/androidx/slice/SliceManagerWrapper.java
@@ -31,6 +31,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -66,7 +67,9 @@
 
     @Override
     public @NonNull Set<androidx.slice.SliceSpec> getPinnedSpecs(@NonNull Uri uri) {
-        return SliceConvert.wrap(mManager.getPinnedSpecs(uri));
+        // Disabled while we update APIs.
+        //return SliceConvert.wrap(mManager.getPinnedSpecs(uri));
+        return Collections.EMPTY_SET;
     }
 
     @Nullable