Merge "API: Properly filter out @RestrictTo(LIBRARY) on packages and classes" into androidx-master-dev

commit: c6367453d6859d4fa96bf3f4e9986d63282f1470 [log] [tgz]
author: Adrian Roos <[email protected]> Fri Feb 22 09:58:21 2019 +0000
committer: Gerrit Code Review <[email protected]> Fri Feb 22 09:58:21 2019 +0000
tree: b0348b2da2880ed5a4eb7db6f7ff86d4ceb3242a
parent: 09ca4ccb5c1b6302d4e05868ffc7d85c6ffad064 [diff]
parent: 0b2c8b5a3ea18e80b32b57c49dba74c2812946ee [diff]
diff --git a/biometric/api/restricted_1.0.0-alpha04.txt b/biometric/api/restricted_1.0.0-alpha04.txt
index 2ce24a5..b567bf4 100644
--- a/biometric/api/restricted_1.0.0-alpha04.txt
+++ b/biometric/api/restricted_1.0.0-alpha04.txt

@@ -1,52 +1,9 @@
 // Signature format: 3.0
 package androidx.biometric {
 
-    field public static final int ERROR_CANCELED = 5; // 0x5
-    field public static final int ERROR_HW_NOT_PRESENT = 12; // 0xc
-    field public static final int ERROR_HW_UNAVAILABLE = 1; // 0x1
-    field public static final int ERROR_LOCKOUT = 7; // 0x7
-    field public static final int ERROR_LOCKOUT_PERMANENT = 9; // 0x9
-    field public static final int ERROR_NEGATIVE_BUTTON = 13; // 0xd
-    field public static final int ERROR_NO_BIOMETRICS = 11; // 0xb
-    field public static final int ERROR_NO_SPACE = 4; // 0x4
-    field public static final int ERROR_TIMEOUT = 3; // 0x3
-    field public static final int ERROR_UNABLE_TO_PROCESS = 2; // 0x2
-    field public static final int ERROR_USER_CANCELED = 10; // 0xa
-    field public static final int ERROR_VENDOR = 8; // 0x8
-  }
 
-    ctor public BiometricFragment();
-    method protected void cancel();
-    method protected CharSequence! getNegativeButtonText();
-    method public static androidx.biometric.BiometricFragment! newInstance();
-    method public void setBundle(android.os.Bundle!);
-    method protected void setCallbacks(java.util.concurrent.Executor!, android.content.DialogInterface.OnClickListener!, androidx.biometric.BiometricPrompt.AuthenticationCallback!);
-    method protected void setCryptoObject(androidx.biometric.BiometricPrompt.CryptoObject!);
-  }
 
-    ctor public FingerprintDialogFragment();
-    method protected android.os.Handler! getHandler();
-    method protected CharSequence! getNegativeButtonText();
-    method public static androidx.biometric.FingerprintDialogFragment! newInstance();
-    method public void setBundle(android.os.Bundle!);
-    method protected void setNegativeButtonListener(android.content.DialogInterface.OnClickListener!);
-    field protected static final int HIDE_DIALOG_DELAY = 2000; // 0x7d0
-    field protected static final int MSG_DISMISS_DIALOG = 3; // 0x3
-    field protected static final int MSG_RESET_MESSAGE = 4; // 0x4
-    field protected static final int MSG_SHOW_ERROR = 2; // 0x2
-    field protected static final int MSG_SHOW_HELP = 1; // 0x1
-  }
 
-    ctor public FingerprintHelperFragment();
-    method protected void cancel(int);
-    method public static androidx.biometric.FingerprintHelperFragment! newInstance();
-    method protected void setCallback(java.util.concurrent.Executor!, androidx.biometric.BiometricPrompt.AuthenticationCallback!);
-    method public void setCryptoObject(androidx.biometric.BiometricPrompt.CryptoObject!);
-    method protected void setHandler(android.os.Handler!);
-    field protected static final int USER_CANCELED_FROM_NEGATIVE_BUTTON = 2; // 0x2
-    field protected static final int USER_CANCELED_FROM_NONE = 0; // 0x0
-    field protected static final int USER_CANCELED_FROM_USER = 1; // 0x1
-  }
 
 }
 

diff --git a/biometric/api/restricted_current.txt b/biometric/api/restricted_current.txt
index 2ce24a5..b567bf4 100644
--- a/biometric/api/restricted_current.txt
+++ b/biometric/api/restricted_current.txt

@@ -1,52 +1,9 @@
 // Signature format: 3.0
 package androidx.biometric {
 
-    field public static final int ERROR_CANCELED = 5; // 0x5
-    field public static final int ERROR_HW_NOT_PRESENT = 12; // 0xc
-    field public static final int ERROR_HW_UNAVAILABLE = 1; // 0x1
-    field public static final int ERROR_LOCKOUT = 7; // 0x7
-    field public static final int ERROR_LOCKOUT_PERMANENT = 9; // 0x9
-    field public static final int ERROR_NEGATIVE_BUTTON = 13; // 0xd
-    field public static final int ERROR_NO_BIOMETRICS = 11; // 0xb
-    field public static final int ERROR_NO_SPACE = 4; // 0x4
-    field public static final int ERROR_TIMEOUT = 3; // 0x3
-    field public static final int ERROR_UNABLE_TO_PROCESS = 2; // 0x2
-    field public static final int ERROR_USER_CANCELED = 10; // 0xa
-    field public static final int ERROR_VENDOR = 8; // 0x8
-  }
 
-    ctor public BiometricFragment();
-    method protected void cancel();
-    method protected CharSequence! getNegativeButtonText();
-    method public static androidx.biometric.BiometricFragment! newInstance();
-    method public void setBundle(android.os.Bundle!);
-    method protected void setCallbacks(java.util.concurrent.Executor!, android.content.DialogInterface.OnClickListener!, androidx.biometric.BiometricPrompt.AuthenticationCallback!);
-    method protected void setCryptoObject(androidx.biometric.BiometricPrompt.CryptoObject!);
-  }
 
-    ctor public FingerprintDialogFragment();
-    method protected android.os.Handler! getHandler();
-    method protected CharSequence! getNegativeButtonText();
-    method public static androidx.biometric.FingerprintDialogFragment! newInstance();
-    method public void setBundle(android.os.Bundle!);
-    method protected void setNegativeButtonListener(android.content.DialogInterface.OnClickListener!);
-    field protected static final int HIDE_DIALOG_DELAY = 2000; // 0x7d0
-    field protected static final int MSG_DISMISS_DIALOG = 3; // 0x3
-    field protected static final int MSG_RESET_MESSAGE = 4; // 0x4
-    field protected static final int MSG_SHOW_ERROR = 2; // 0x2
-    field protected static final int MSG_SHOW_HELP = 1; // 0x1
-  }
 
-    ctor public FingerprintHelperFragment();
-    method protected void cancel(int);
-    method public static androidx.biometric.FingerprintHelperFragment! newInstance();
-    method protected void setCallback(java.util.concurrent.Executor!, androidx.biometric.BiometricPrompt.AuthenticationCallback!);
-    method public void setCryptoObject(androidx.biometric.BiometricPrompt.CryptoObject!);
-    method protected void setHandler(android.os.Handler!);
-    field protected static final int USER_CANCELED_FROM_NEGATIVE_BUTTON = 2; // 0x2
-    field protected static final int USER_CANCELED_FROM_NONE = 0; // 0x0
-    field protected static final int USER_CANCELED_FROM_USER = 1; // 0x1
-  }
 
 }
 

diff --git a/browser/api/restricted_1.1.0-alpha01.txt b/browser/api/restricted_1.1.0-alpha01.txt
index db90183..41ed405 100644
--- a/browser/api/restricted_1.1.0-alpha01.txt
+++ b/browser/api/restricted_1.1.0-alpha01.txt

@@ -18,11 +18,6 @@
   @IntDef({androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_NONE, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_IMAGE, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_VIDEO, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_AUDIO, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_FILE, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_PLUGIN}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface BrowserActionsIntent.BrowserActionsUrlType {
   }
 
-    ctor public BrowserServiceFileProvider();
-    method public static void grantReadPermission(android.content.Intent, java.util.List<android.net.Uri>?, android.content.Context);
-    method public static com.google.common.util.concurrent.ListenableFuture<android.graphics.Bitmap> loadBitmap(android.content.ContentResolver, android.net.Uri);
-    method @UiThread public static androidx.concurrent.futures.ResolvableFuture<android.net.Uri> saveBitmap(android.content.Context, android.graphics.Bitmap, String, int);
-  }
 
 }
 

diff --git a/browser/api/restricted_current.txt b/browser/api/restricted_current.txt
index db90183..41ed405 100644
--- a/browser/api/restricted_current.txt
+++ b/browser/api/restricted_current.txt

@@ -18,11 +18,6 @@
   @IntDef({androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_NONE, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_IMAGE, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_VIDEO, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_AUDIO, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_FILE, androidx.browser.browseractions.BrowserActionsIntent.URL_TYPE_PLUGIN}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface BrowserActionsIntent.BrowserActionsUrlType {
   }
 
-    ctor public BrowserServiceFileProvider();
-    method public static void grantReadPermission(android.content.Intent, java.util.List<android.net.Uri>?, android.content.Context);
-    method public static com.google.common.util.concurrent.ListenableFuture<android.graphics.Bitmap> loadBitmap(android.content.ContentResolver, android.net.Uri);
-    method @UiThread public static androidx.concurrent.futures.ResolvableFuture<android.net.Uri> saveBitmap(android.content.Context, android.graphics.Bitmap, String, int);
-  }
 
 }
 

diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
index bfb0063..8ebdcdf 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt

@@ -17,6 +17,7 @@
 package androidx.build.metalava
 
 import androidx.build.checkapi.ApiLocation
+import org.gradle.api.GradleException
 import org.gradle.api.tasks.OutputFiles
 import org.gradle.api.tasks.TaskAction
 import java.io.File
@@ -88,11 +89,22 @@
     fun removeRestrictToLibraryLines(inputFile: File, outputFile: File) {
         val outputBuilder = StringBuilder()
         val lines = inputFile.readLines()
+        var skipScopeUntil: String? = null
         for (line in lines) {
-            if (!line.contains("@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")) {
+            val skip = line.contains("@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
+            if (skip && line.endsWith("{")) {
+                skipScopeUntil = line.commonPrefixWith("    ") + "}"
+            }
+            if (!skip && skipScopeUntil == null) {
                 outputBuilder.append(line)
                 outputBuilder.append("\n")
             }
+            if (line == skipScopeUntil) {
+                skipScopeUntil = null
+            }
+        }
+        if (skipScopeUntil != null) {
+            throw GradleException("Skipping until `$skipScopeUntil`, but found EOF")
         }
         outputFile.writeText(outputBuilder.toString())
     }

diff --git a/coordinatorlayout/api/restricted_1.1.0-alpha02.txt b/coordinatorlayout/api/restricted_1.1.0-alpha02.txt
index ee05fa6..8b90ee0 100644
--- a/coordinatorlayout/api/restricted_1.1.0-alpha02.txt
+++ b/coordinatorlayout/api/restricted_1.1.0-alpha02.txt

@@ -8,19 +8,7 @@
   @IntDef({androidx.coordinatorlayout.widget.CoordinatorLayout.EVENT_PRE_DRAW, androidx.coordinatorlayout.widget.CoordinatorLayout.EVENT_NESTED_SCROLL, androidx.coordinatorlayout.widget.CoordinatorLayout.EVENT_VIEW_REMOVED}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface CoordinatorLayout.DispatchChangeEvent {
   }
 
-    ctor public DirectedAcyclicGraph();
-    method public void addEdge(T, T);
-    method public void addNode(T);
-    method public void clear();
-    method public boolean contains(T);
-    method public java.util.List? getIncomingEdges(T);
-    method public java.util.List<T>? getOutgoingEdges(T);
-    method public java.util.ArrayList<T> getSortedList();
-    method public boolean hasOutgoingEdges(T);
-  }
 
-    method public static void getDescendantRect(android.view.ViewGroup!, android.view.View!, android.graphics.Rect!);
-  }
 
 }
 

diff --git a/coordinatorlayout/api/restricted_current.txt b/coordinatorlayout/api/restricted_current.txt
index ee05fa6..8b90ee0 100644
--- a/coordinatorlayout/api/restricted_current.txt
+++ b/coordinatorlayout/api/restricted_current.txt

@@ -8,19 +8,7 @@
   @IntDef({androidx.coordinatorlayout.widget.CoordinatorLayout.EVENT_PRE_DRAW, androidx.coordinatorlayout.widget.CoordinatorLayout.EVENT_NESTED_SCROLL, androidx.coordinatorlayout.widget.CoordinatorLayout.EVENT_VIEW_REMOVED}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface CoordinatorLayout.DispatchChangeEvent {
   }
 
-    ctor public DirectedAcyclicGraph();
-    method public void addEdge(T, T);
-    method public void addNode(T);
-    method public void clear();
-    method public boolean contains(T);
-    method public java.util.List? getIncomingEdges(T);
-    method public java.util.List<T>? getOutgoingEdges(T);
-    method public java.util.ArrayList<T> getSortedList();
-    method public boolean hasOutgoingEdges(T);
-  }
 
-    method public static void getDescendantRect(android.view.ViewGroup!, android.view.View!, android.graphics.Rect!);
-  }
 
 }
 

diff --git a/core/api/restricted_1.1.0-alpha05.txt b/core/api/restricted_1.1.0-alpha05.txt
index fccb564..5baf105 100644
--- a/core/api/restricted_1.1.0-alpha05.txt
+++ b/core/api/restricted_1.1.0-alpha05.txt

@@ -108,9 +108,7 @@
 
 package androidx.core.content.pm {
 
-  }
 
-  }
 
   public class ShortcutInfoCompat {
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.core.graphics.drawable.IconCompat! getIcon();
@@ -279,7 +277,6 @@
     field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public int mType;
   }
 
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public interface TintAwareDrawable {
     method public void setTint(@ColorInt int);

diff --git a/core/api/restricted_current.txt b/core/api/restricted_current.txt
index fccb564..5baf105 100644
--- a/core/api/restricted_current.txt
+++ b/core/api/restricted_current.txt

@@ -108,9 +108,7 @@
 
 package androidx.core.content.pm {
 
-  }
 
-  }
 
   public class ShortcutInfoCompat {
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.core.graphics.drawable.IconCompat! getIcon();
@@ -279,7 +277,6 @@
     field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public int mType;
   }
 
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public interface TintAwareDrawable {
     method public void setTint(@ColorInt int);

diff --git a/exifinterface/api/restricted_1.1.0-alpha01.txt b/exifinterface/api/restricted_1.1.0-alpha01.txt
index 7d7bf90..1cdbaf4 100644
--- a/exifinterface/api/restricted_1.1.0-alpha01.txt
+++ b/exifinterface/api/restricted_1.1.0-alpha01.txt

@@ -4,7 +4,6 @@
   public class ExifInterface {
   }
 
-  }
 
 }
 

diff --git a/exifinterface/api/restricted_current.txt b/exifinterface/api/restricted_current.txt
index 7d7bf90..1cdbaf4 100644
--- a/exifinterface/api/restricted_current.txt
+++ b/exifinterface/api/restricted_current.txt

@@ -4,7 +4,6 @@
   public class ExifInterface {
   }
 
-  }
 
 }
 

diff --git a/fragment/testing/api/restricted_1.1.0-alpha05.txt b/fragment/testing/api/restricted_1.1.0-alpha05.txt
index 905cfbe..6415760 100644
--- a/fragment/testing/api/restricted_1.1.0-alpha05.txt
+++ b/fragment/testing/api/restricted_1.1.0-alpha05.txt

@@ -1,12 +1,7 @@
 // Signature format: 3.0
 package androidx.fragment.app.testing {
 
-    ctor public FragmentScenario.EmptyFragmentActivity();
-    field public static final String THEME_EXTRAS_BUNDLE_KEY = "androidx.fragment.app.testing.FragmentScenario.EmptyFragmentActivity.THEME_EXTRAS_BUNDLE_KEY";
-  }
 
-    ctor public FragmentScenario.FragmentFactoryHolderViewModel();
-  }
 
 }
 

diff --git a/fragment/testing/api/restricted_current.txt b/fragment/testing/api/restricted_current.txt
index 905cfbe..6415760 100644
--- a/fragment/testing/api/restricted_current.txt
+++ b/fragment/testing/api/restricted_current.txt

@@ -1,12 +1,7 @@
 // Signature format: 3.0
 package androidx.fragment.app.testing {
 
-    ctor public FragmentScenario.EmptyFragmentActivity();
-    field public static final String THEME_EXTRAS_BUNDLE_KEY = "androidx.fragment.app.testing.FragmentScenario.EmptyFragmentActivity.THEME_EXTRAS_BUNDLE_KEY";
-  }
 
-    ctor public FragmentScenario.FragmentFactoryHolderViewModel();
-  }
 
 }
 

diff --git a/leanback/api/restricted_1.1.0-alpha02.txt b/leanback/api/restricted_1.1.0-alpha02.txt
index 384bfc5..d54d9cd 100644
--- a/leanback/api/restricted_1.1.0-alpha02.txt
+++ b/leanback/api/restricted_1.1.0-alpha02.txt

@@ -48,18 +48,10 @@
   @Deprecated public class PlaybackFragment extends android.app.Fragment {
   }
 
-    ctor @Deprecated public PlaybackFragment.OnFadeCompleteListener();
-    method @Deprecated public void onFadeInComplete();
-    method @Deprecated public void onFadeOutComplete();
-  }
 
   public class PlaybackSupportFragment extends androidx.fragment.app.Fragment {
   }
 
-    ctor public PlaybackSupportFragment.OnFadeCompleteListener();
-    method public void onFadeInComplete();
-    method public void onFadeOutComplete();
-  }
 
 }
 
@@ -142,9 +134,6 @@
     ctor public SlideNoPropagation(android.content.Context!, android.util.AttributeSet!);
   }
 
-    ctor public TransitionEpicenterCallback();
-    method public abstract android.graphics.Rect! onGetEpicenter(Object!);
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class TransitionHelper {
     method public static void addSharedElement(android.app.FragmentTransaction!, android.view.View!, String!);
@@ -215,8 +204,6 @@
 
 package androidx.leanback.util {
 
-    method public static int safeLongToInt(long);
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class StateMachine {
     ctor public StateMachine();
@@ -275,14 +262,6 @@
     ctor public BrowseRowsFrameLayout(android.content.Context!, android.util.AttributeSet!, int);
   }
 
-    ctor public DetailsParallaxDrawable(android.content.Context!, androidx.leanback.widget.DetailsParallax!, android.graphics.drawable.Drawable!, androidx.leanback.widget.ParallaxTarget!);
-    ctor public DetailsParallaxDrawable(android.content.Context!, androidx.leanback.widget.DetailsParallax!, android.graphics.drawable.Drawable!, android.graphics.drawable.Drawable!, androidx.leanback.widget.ParallaxTarget!);
-    ctor public DetailsParallaxDrawable(android.content.Context!, androidx.leanback.widget.DetailsParallax!);
-    method public android.graphics.drawable.Drawable! getBottomDrawable();
-    method public android.graphics.drawable.Drawable! getCoverDrawable();
-    method @ColorInt public int getSolidColor();
-    method public void setSolidColor(@ColorInt int);
-  }
 
   public class DividerPresenter extends androidx.leanback.widget.Presenter {
     ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public DividerPresenter(int);
@@ -451,11 +430,6 @@
     method public static boolean isDescendant(android.view.ViewGroup!, android.view.View!);
   }
 
-    ctor public VideoSurfaceView(android.content.Context!);
-    ctor public VideoSurfaceView(android.content.Context!, android.util.AttributeSet!);
-    ctor public VideoSurfaceView(android.content.Context!, android.util.AttributeSet!, int);
-    method public void setTransitionVisibility(int);
-  }
 
   @IntDef({android.view.View.VISIBLE, android.view.View.INVISIBLE, android.view.View.GONE}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public @interface Visibility {
   }

diff --git a/leanback/api/restricted_current.txt b/leanback/api/restricted_current.txt
index 384bfc5..d54d9cd 100644
--- a/leanback/api/restricted_current.txt
+++ b/leanback/api/restricted_current.txt

@@ -48,18 +48,10 @@
   @Deprecated public class PlaybackFragment extends android.app.Fragment {
   }
 
-    ctor @Deprecated public PlaybackFragment.OnFadeCompleteListener();
-    method @Deprecated public void onFadeInComplete();
-    method @Deprecated public void onFadeOutComplete();
-  }
 
   public class PlaybackSupportFragment extends androidx.fragment.app.Fragment {
   }
 
-    ctor public PlaybackSupportFragment.OnFadeCompleteListener();
-    method public void onFadeInComplete();
-    method public void onFadeOutComplete();
-  }
 
 }
 
@@ -142,9 +134,6 @@
     ctor public SlideNoPropagation(android.content.Context!, android.util.AttributeSet!);
   }
 
-    ctor public TransitionEpicenterCallback();
-    method public abstract android.graphics.Rect! onGetEpicenter(Object!);
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class TransitionHelper {
     method public static void addSharedElement(android.app.FragmentTransaction!, android.view.View!, String!);
@@ -215,8 +204,6 @@
 
 package androidx.leanback.util {
 
-    method public static int safeLongToInt(long);
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class StateMachine {
     ctor public StateMachine();
@@ -275,14 +262,6 @@
     ctor public BrowseRowsFrameLayout(android.content.Context!, android.util.AttributeSet!, int);
   }
 
-    ctor public DetailsParallaxDrawable(android.content.Context!, androidx.leanback.widget.DetailsParallax!, android.graphics.drawable.Drawable!, androidx.leanback.widget.ParallaxTarget!);
-    ctor public DetailsParallaxDrawable(android.content.Context!, androidx.leanback.widget.DetailsParallax!, android.graphics.drawable.Drawable!, android.graphics.drawable.Drawable!, androidx.leanback.widget.ParallaxTarget!);
-    ctor public DetailsParallaxDrawable(android.content.Context!, androidx.leanback.widget.DetailsParallax!);
-    method public android.graphics.drawable.Drawable! getBottomDrawable();
-    method public android.graphics.drawable.Drawable! getCoverDrawable();
-    method @ColorInt public int getSolidColor();
-    method public void setSolidColor(@ColorInt int);
-  }
 
   public class DividerPresenter extends androidx.leanback.widget.Presenter {
     ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public DividerPresenter(int);
@@ -451,11 +430,6 @@
     method public static boolean isDescendant(android.view.ViewGroup!, android.view.View!);
   }
 
-    ctor public VideoSurfaceView(android.content.Context!);
-    ctor public VideoSurfaceView(android.content.Context!, android.util.AttributeSet!);
-    ctor public VideoSurfaceView(android.content.Context!, android.util.AttributeSet!, int);
-    method public void setTransitionVisibility(int);
-  }
 
   @IntDef({android.view.View.VISIBLE, android.view.View.INVISIBLE, android.view.View.GONE}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public @interface Visibility {
   }

diff --git a/preference/api/restricted_1.1.0-alpha04.txt b/preference/api/restricted_1.1.0-alpha04.txt
index 43e5913..d8a2d7c 100644
--- a/preference/api/restricted_1.1.0-alpha04.txt
+++ b/preference/api/restricted_1.1.0-alpha04.txt

@@ -1,8 +1,6 @@
 // Signature format: 3.0
 package androidx.preference {
 
-    field public static final int ANDROID_R_ICON_FRAME = 16908350; // 0x102003e
-  }
 
   public class Preference implements java.lang.Comparable<androidx.preference.Preference> {
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void onAttachedToHierarchy(androidx.preference.PreferenceManager!, long);
@@ -75,11 +73,3 @@
 }
 
 
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class PreferenceImageView extends android.widget.ImageView {
-    ctor public PreferenceImageView(android.content.Context!);
-    ctor public PreferenceImageView(android.content.Context!, android.util.AttributeSet!);
-    ctor public PreferenceImageView(android.content.Context!, android.util.AttributeSet!, int);
-  }
-
-}
-

diff --git a/preference/api/restricted_current.txt b/preference/api/restricted_current.txt
index 43e5913..d8a2d7c 100644
--- a/preference/api/restricted_current.txt
+++ b/preference/api/restricted_current.txt

@@ -1,8 +1,6 @@
 // Signature format: 3.0
 package androidx.preference {
 
-    field public static final int ANDROID_R_ICON_FRAME = 16908350; // 0x102003e
-  }
 
   public class Preference implements java.lang.Comparable<androidx.preference.Preference> {
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected void onAttachedToHierarchy(androidx.preference.PreferenceManager!, long);
@@ -75,11 +73,3 @@
 }
 
 
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class PreferenceImageView extends android.widget.ImageView {
-    ctor public PreferenceImageView(android.content.Context!);
-    ctor public PreferenceImageView(android.content.Context!, android.util.AttributeSet!);
-    ctor public PreferenceImageView(android.content.Context!, android.util.AttributeSet!, int);
-  }
-
-}
-

diff --git a/remotecallback/api/restricted_1.0.0-alpha02.txt b/remotecallback/api/restricted_1.0.0-alpha02.txt
index 4d2bb8c..89c7414 100644
--- a/remotecallback/api/restricted_1.0.0-alpha02.txt
+++ b/remotecallback/api/restricted_1.0.0-alpha02.txt

@@ -35,7 +35,6 @@
     field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final String EXTRA_METHOD = "remotecallback.method";
   }
 
-  }
 
 }
 

diff --git a/remotecallback/api/restricted_current.txt b/remotecallback/api/restricted_current.txt
index 4d2bb8c..89c7414 100644
--- a/remotecallback/api/restricted_current.txt
+++ b/remotecallback/api/restricted_current.txt

@@ -35,7 +35,6 @@
     field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final String EXTRA_METHOD = "remotecallback.method";
   }
 
-  }
 
 }
 

diff --git a/slices/builders/api/restricted_1.1.0-alpha01.txt b/slices/builders/api/restricted_1.1.0-alpha01.txt
index b9d870a..bb5d9b4 100644
--- a/slices/builders/api/restricted_1.1.0-alpha01.txt
+++ b/slices/builders/api/restricted_1.1.0-alpha01.txt

@@ -14,12 +14,10 @@
     ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public ListBuilder.HeaderBuilder(android.net.Uri!);
   }
 
-  }
 
   public static class ListBuilder.InputRangeBuilder {
   }
 
-  }
 
   public static class ListBuilder.RangeBuilder {
   }
@@ -58,76 +56,13 @@
 
 package androidx.slice.builders.impl {
 
-    ctor public GridRowBuilderListV1Impl(androidx.slice.builders.impl.ListBuilderImpl, androidx.slice.builders.GridRowBuilder!);
-    method public void addCell(androidx.slice.builders.GridRowBuilder.CellBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public void setContentDescription(CharSequence!);
-    method public void setLayoutDirection(int);
-    method public void setPrimaryAction(androidx.slice.builders.SliceAction!);
-    method public void setSeeMoreAction(android.app.PendingIntent!);
-    method public void setSeeMoreCell(androidx.slice.builders.GridRowBuilder.CellBuilder);
-  }
 
   public static final class GridRowBuilderListV1Impl.CellBuilderImpl extends androidx.slice.builders.impl.TemplateBuilderImpl {
     method public void fillFrom(androidx.slice.builders.GridRowBuilder.CellBuilder!);
   }
 
-    method public void addAction(androidx.slice.builders.SliceAction!);
-    method public void addGridRow(androidx.slice.builders.GridRowBuilder!);
-    method public void addInputRange(androidx.slice.builders.ListBuilder.InputRangeBuilder!);
-    method public void addRange(androidx.slice.builders.ListBuilder.RangeBuilder!);
-    method public void addRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void addSelection(androidx.slice.builders.SelectionBuilder!);
-    method public void setColor(@ColorInt int);
-    method public void setHeader(androidx.slice.builders.ListBuilder.HeaderBuilder!);
-    method public void setIsError(boolean);
-    method public void setKeywords(java.util.Set<java.lang.String>!);
-    method public void setLayoutDirection(int);
-    method public void setSeeMoreAction(android.app.PendingIntent!);
-    method public void setSeeMoreRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void setTtl(long);
-    method @RequiresApi(26) public void setTtl(java.time.Duration?);
-  }
 
-    ctor public ListBuilderBasicImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    method public void addAction(androidx.slice.builders.SliceAction!);
-    method public void addGridRow(androidx.slice.builders.GridRowBuilder!);
-    method public void addInputRange(androidx.slice.builders.ListBuilder.InputRangeBuilder!);
-    method public void addRange(androidx.slice.builders.ListBuilder.RangeBuilder!);
-    method public void addRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void addSelection(androidx.slice.builders.SelectionBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public void setColor(@ColorInt int);
-    method public void setHeader(androidx.slice.builders.ListBuilder.HeaderBuilder!);
-    method public void setIsError(boolean);
-    method public void setKeywords(java.util.Set<java.lang.String>!);
-    method public void setLayoutDirection(int);
-    method public void setSeeMoreAction(android.app.PendingIntent!);
-    method public void setSeeMoreRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void setTtl(long);
-    method @RequiresApi(26) public void setTtl(java.time.Duration?);
-  }
 
-    ctor public ListBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    ctor public ListBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!, androidx.slice.Clock!);
-    method public void addAction(androidx.slice.builders.SliceAction);
-    method public void addGridRow(androidx.slice.builders.GridRowBuilder);
-    method public void addInputRange(androidx.slice.builders.ListBuilder.InputRangeBuilder!);
-    method public void addRange(androidx.slice.builders.ListBuilder.RangeBuilder!);
-    method public void addRow(androidx.slice.builders.ListBuilder.RowBuilder);
-    method public void addRow(androidx.slice.builders.impl.ListBuilderImpl.RowBuilderImpl);
-    method public void addSelection(androidx.slice.builders.SelectionBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public void setColor(@ColorInt int);
-    method public void setHeader(androidx.slice.builders.ListBuilder.HeaderBuilder);
-    method public void setIsError(boolean);
-    method public void setKeywords(java.util.Set<java.lang.String>);
-    method public void setLayoutDirection(int);
-    method public void setSeeMoreAction(android.app.PendingIntent!);
-    method public void setSeeMoreRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void setTtl(long);
-    method @RequiresApi(26) public void setTtl(java.time.Duration?);
-  }
 
   public static class ListBuilderImpl.HeaderBuilderImpl extends androidx.slice.builders.impl.TemplateBuilderImpl {
     method public void apply(androidx.slice.Slice.Builder!);
@@ -156,11 +91,6 @@
     method protected void setTitleItem(androidx.core.graphics.drawable.IconCompat!, int);
   }
 
-    ctor public MessagingBasicImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    method public void add(androidx.slice.builders.impl.TemplateBuilderImpl!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public androidx.slice.builders.impl.TemplateBuilderImpl! createMessageBuilder();
-  }
 
   public static final class MessagingBasicImpl.MessageBuilder extends androidx.slice.builders.impl.TemplateBuilderImpl implements androidx.slice.builders.impl.MessagingBuilder.MessageBuilder {
     ctor public MessagingBasicImpl.MessageBuilder(androidx.slice.builders.impl.MessagingBasicImpl!);
@@ -170,9 +100,6 @@
     method public void apply(androidx.slice.Slice.Builder!);
   }
 
-    method public void add(androidx.slice.builders.impl.TemplateBuilderImpl!);
-    method public androidx.slice.builders.impl.TemplateBuilderImpl! createMessageBuilder();
-  }
 
   public static interface MessagingBuilder.MessageBuilder {
     method @RequiresApi(23) public void addSource(android.graphics.drawable.Icon!);
@@ -180,11 +107,6 @@
     method public void addTimestamp(long);
   }
 
-    ctor public MessagingListV1Impl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    method public void add(androidx.slice.builders.impl.TemplateBuilderImpl!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public androidx.slice.builders.impl.TemplateBuilderImpl! createMessageBuilder();
-  }
 
   public static final class MessagingListV1Impl.MessageBuilder extends androidx.slice.builders.impl.TemplateBuilderImpl implements androidx.slice.builders.impl.MessagingBuilder.MessageBuilder {
     ctor public MessagingListV1Impl.MessageBuilder(androidx.slice.builders.impl.MessagingListV1Impl!);
@@ -194,11 +116,6 @@
     method public void apply(androidx.slice.Slice.Builder!);
   }
 
-    ctor public MessagingV1Impl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    method public void add(androidx.slice.builders.impl.TemplateBuilderImpl!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public androidx.slice.builders.impl.TemplateBuilderImpl! createMessageBuilder();
-  }
 
   public static final class MessagingV1Impl.MessageBuilder extends androidx.slice.builders.impl.TemplateBuilderImpl implements androidx.slice.builders.impl.MessagingBuilder.MessageBuilder {
     ctor public MessagingV1Impl.MessageBuilder(androidx.slice.builders.impl.MessagingV1Impl!);
@@ -208,23 +125,9 @@
     method public void apply(androidx.slice.Slice.Builder!);
   }
 
-    ctor public SelectionBuilderBasicImpl(androidx.slice.Slice.Builder!, androidx.slice.builders.SelectionBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-  }
 
-    ctor public SelectionBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.builders.SelectionBuilder!);
-    method protected androidx.slice.builders.SelectionBuilder! getSelectionBuilder();
-  }
 
-    ctor public SelectionBuilderListV2Impl(androidx.slice.Slice.Builder!, androidx.slice.builders.SelectionBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-  }
 
-    ctor protected TemplateBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    ctor protected TemplateBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!, androidx.slice.Clock!);
-    method public androidx.slice.Slice! build();
-    method protected void setBuilder(androidx.slice.Slice.Builder!);
-  }
 
 }
 

diff --git a/slices/builders/api/restricted_current.txt b/slices/builders/api/restricted_current.txt
index b9d870a..bb5d9b4 100644
--- a/slices/builders/api/restricted_current.txt
+++ b/slices/builders/api/restricted_current.txt

@@ -14,12 +14,10 @@
     ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public ListBuilder.HeaderBuilder(android.net.Uri!);
   }
 
-  }
 
   public static class ListBuilder.InputRangeBuilder {
   }
 
-  }
 
   public static class ListBuilder.RangeBuilder {
   }
@@ -58,76 +56,13 @@
 
 package androidx.slice.builders.impl {
 
-    ctor public GridRowBuilderListV1Impl(androidx.slice.builders.impl.ListBuilderImpl, androidx.slice.builders.GridRowBuilder!);
-    method public void addCell(androidx.slice.builders.GridRowBuilder.CellBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public void setContentDescription(CharSequence!);
-    method public void setLayoutDirection(int);
-    method public void setPrimaryAction(androidx.slice.builders.SliceAction!);
-    method public void setSeeMoreAction(android.app.PendingIntent!);
-    method public void setSeeMoreCell(androidx.slice.builders.GridRowBuilder.CellBuilder);
-  }
 
   public static final class GridRowBuilderListV1Impl.CellBuilderImpl extends androidx.slice.builders.impl.TemplateBuilderImpl {
     method public void fillFrom(androidx.slice.builders.GridRowBuilder.CellBuilder!);
   }
 
-    method public void addAction(androidx.slice.builders.SliceAction!);
-    method public void addGridRow(androidx.slice.builders.GridRowBuilder!);
-    method public void addInputRange(androidx.slice.builders.ListBuilder.InputRangeBuilder!);
-    method public void addRange(androidx.slice.builders.ListBuilder.RangeBuilder!);
-    method public void addRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void addSelection(androidx.slice.builders.SelectionBuilder!);
-    method public void setColor(@ColorInt int);
-    method public void setHeader(androidx.slice.builders.ListBuilder.HeaderBuilder!);
-    method public void setIsError(boolean);
-    method public void setKeywords(java.util.Set<java.lang.String>!);
-    method public void setLayoutDirection(int);
-    method public void setSeeMoreAction(android.app.PendingIntent!);
-    method public void setSeeMoreRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void setTtl(long);
-    method @RequiresApi(26) public void setTtl(java.time.Duration?);
-  }
 
-    ctor public ListBuilderBasicImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    method public void addAction(androidx.slice.builders.SliceAction!);
-    method public void addGridRow(androidx.slice.builders.GridRowBuilder!);
-    method public void addInputRange(androidx.slice.builders.ListBuilder.InputRangeBuilder!);
-    method public void addRange(androidx.slice.builders.ListBuilder.RangeBuilder!);
-    method public void addRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void addSelection(androidx.slice.builders.SelectionBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public void setColor(@ColorInt int);
-    method public void setHeader(androidx.slice.builders.ListBuilder.HeaderBuilder!);
-    method public void setIsError(boolean);
-    method public void setKeywords(java.util.Set<java.lang.String>!);
-    method public void setLayoutDirection(int);
-    method public void setSeeMoreAction(android.app.PendingIntent!);
-    method public void setSeeMoreRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void setTtl(long);
-    method @RequiresApi(26) public void setTtl(java.time.Duration?);
-  }
 
-    ctor public ListBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    ctor public ListBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!, androidx.slice.Clock!);
-    method public void addAction(androidx.slice.builders.SliceAction);
-    method public void addGridRow(androidx.slice.builders.GridRowBuilder);
-    method public void addInputRange(androidx.slice.builders.ListBuilder.InputRangeBuilder!);
-    method public void addRange(androidx.slice.builders.ListBuilder.RangeBuilder!);
-    method public void addRow(androidx.slice.builders.ListBuilder.RowBuilder);
-    method public void addRow(androidx.slice.builders.impl.ListBuilderImpl.RowBuilderImpl);
-    method public void addSelection(androidx.slice.builders.SelectionBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public void setColor(@ColorInt int);
-    method public void setHeader(androidx.slice.builders.ListBuilder.HeaderBuilder);
-    method public void setIsError(boolean);
-    method public void setKeywords(java.util.Set<java.lang.String>);
-    method public void setLayoutDirection(int);
-    method public void setSeeMoreAction(android.app.PendingIntent!);
-    method public void setSeeMoreRow(androidx.slice.builders.ListBuilder.RowBuilder!);
-    method public void setTtl(long);
-    method @RequiresApi(26) public void setTtl(java.time.Duration?);
-  }
 
   public static class ListBuilderImpl.HeaderBuilderImpl extends androidx.slice.builders.impl.TemplateBuilderImpl {
     method public void apply(androidx.slice.Slice.Builder!);
@@ -156,11 +91,6 @@
     method protected void setTitleItem(androidx.core.graphics.drawable.IconCompat!, int);
   }
 
-    ctor public MessagingBasicImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    method public void add(androidx.slice.builders.impl.TemplateBuilderImpl!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public androidx.slice.builders.impl.TemplateBuilderImpl! createMessageBuilder();
-  }
 
   public static final class MessagingBasicImpl.MessageBuilder extends androidx.slice.builders.impl.TemplateBuilderImpl implements androidx.slice.builders.impl.MessagingBuilder.MessageBuilder {
     ctor public MessagingBasicImpl.MessageBuilder(androidx.slice.builders.impl.MessagingBasicImpl!);
@@ -170,9 +100,6 @@
     method public void apply(androidx.slice.Slice.Builder!);
   }
 
-    method public void add(androidx.slice.builders.impl.TemplateBuilderImpl!);
-    method public androidx.slice.builders.impl.TemplateBuilderImpl! createMessageBuilder();
-  }
 
   public static interface MessagingBuilder.MessageBuilder {
     method @RequiresApi(23) public void addSource(android.graphics.drawable.Icon!);
@@ -180,11 +107,6 @@
     method public void addTimestamp(long);
   }
 
-    ctor public MessagingListV1Impl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    method public void add(androidx.slice.builders.impl.TemplateBuilderImpl!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public androidx.slice.builders.impl.TemplateBuilderImpl! createMessageBuilder();
-  }
 
   public static final class MessagingListV1Impl.MessageBuilder extends androidx.slice.builders.impl.TemplateBuilderImpl implements androidx.slice.builders.impl.MessagingBuilder.MessageBuilder {
     ctor public MessagingListV1Impl.MessageBuilder(androidx.slice.builders.impl.MessagingListV1Impl!);
@@ -194,11 +116,6 @@
     method public void apply(androidx.slice.Slice.Builder!);
   }
 
-    ctor public MessagingV1Impl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    method public void add(androidx.slice.builders.impl.TemplateBuilderImpl!);
-    method public void apply(androidx.slice.Slice.Builder!);
-    method public androidx.slice.builders.impl.TemplateBuilderImpl! createMessageBuilder();
-  }
 
   public static final class MessagingV1Impl.MessageBuilder extends androidx.slice.builders.impl.TemplateBuilderImpl implements androidx.slice.builders.impl.MessagingBuilder.MessageBuilder {
     ctor public MessagingV1Impl.MessageBuilder(androidx.slice.builders.impl.MessagingV1Impl!);
@@ -208,23 +125,9 @@
     method public void apply(androidx.slice.Slice.Builder!);
   }
 
-    ctor public SelectionBuilderBasicImpl(androidx.slice.Slice.Builder!, androidx.slice.builders.SelectionBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-  }
 
-    ctor public SelectionBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.builders.SelectionBuilder!);
-    method protected androidx.slice.builders.SelectionBuilder! getSelectionBuilder();
-  }
 
-    ctor public SelectionBuilderListV2Impl(androidx.slice.Slice.Builder!, androidx.slice.builders.SelectionBuilder!);
-    method public void apply(androidx.slice.Slice.Builder!);
-  }
 
-    ctor protected TemplateBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!);
-    ctor protected TemplateBuilderImpl(androidx.slice.Slice.Builder!, androidx.slice.SliceSpec!, androidx.slice.Clock!);
-    method public androidx.slice.Slice! build();
-    method protected void setBuilder(androidx.slice.Slice.Builder!);
-  }
 
 }
 

diff --git a/slices/core/api/restricted_1.1.0-alpha01.txt b/slices/core/api/restricted_1.1.0-alpha01.txt
index 48be88e..135d4e8 100644
--- a/slices/core/api/restricted_1.1.0-alpha01.txt
+++ b/slices/core/api/restricted_1.1.0-alpha01.txt

@@ -37,7 +37,6 @@
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.slice.Slice.Builder! setSpec(androidx.slice.SliceSpec!);
   }
 
-  }
 
   @RequiresApi(28) public class SliceConvert {
   }
@@ -59,15 +58,7 @@
     method public void onAction(androidx.slice.SliceItem!, android.content.Context!, android.content.Intent!);
   }
 
-  }
 
-    ctor public SliceItemHolder(String!, Object!, boolean);
-    method public Object! getObj(String!);
-    method public void release();
-    field public androidx.versionedparcelable.VersionedParcelable! mVersionedParcelable;
-    field public static androidx.slice.SliceItemHolder.HolderHandler! sHandler;
-    field public static final Object! sSerializeLock;
-  }
 
   public static interface SliceItemHolder.HolderHandler {
     method public void handle(androidx.slice.SliceItemHolder!, String!);
@@ -118,12 +109,6 @@
 
 package androidx.slice.compat {
 
-    ctor public CompatPermissionManager(android.content.Context!, String!, int, String[]!);
-    method public int checkSlicePermission(android.net.Uri!, int, int);
-    method public void grantSlicePermission(android.net.Uri!, String!);
-    method public void revokeSlicePermission(android.net.Uri!, String!);
-    field public static final String ALL_SUFFIX = "_all";
-  }
 
   public static class CompatPermissionManager.PermissionState {
     method public String! getKey();
@@ -132,19 +117,7 @@
     method public java.util.Set<java.lang.String>! toPersistable();
   }
 
-    ctor public CompatPinnedList(android.content.Context!, String!);
-    method public boolean addPin(android.net.Uri!, String!, java.util.Set<androidx.slice.SliceSpec>!);
-    method @VisibleForTesting protected long getBootTime();
-    method public java.util.List<android.net.Uri>! getPinnedSlices();
-    method public androidx.collection.ArraySet<androidx.slice.SliceSpec>! getSpecs(android.net.Uri!);
-    method public boolean removePin(android.net.Uri!, String!);
-  }
 
-    ctor public SlicePermissionActivity();
-    method public void onClick(android.content.DialogInterface!, int);
-    method public void onDestroy();
-    method public void onDismiss(android.content.DialogInterface!);
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RequiresApi(19) public class SliceProviderCompat {
     ctor public SliceProviderCompat(androidx.slice.SliceProvider!, androidx.slice.compat.CompatPermissionManager!, android.content.Context!);
@@ -188,7 +161,6 @@
     field public static final String PERMS_PREFIX = "slice_perms_";
   }
 
-  }
 
   @RequiresApi(28) public static class SliceProviderWrapperContainer.SliceProviderWrapper extends android.app.slice.SliceProvider {
     ctor public SliceProviderWrapperContainer.SliceProviderWrapper(androidx.slice.SliceProvider!, String[]!);

diff --git a/slices/core/api/restricted_current.txt b/slices/core/api/restricted_current.txt
index 48be88e..135d4e8 100644
--- a/slices/core/api/restricted_current.txt
+++ b/slices/core/api/restricted_current.txt

@@ -37,7 +37,6 @@
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public androidx.slice.Slice.Builder! setSpec(androidx.slice.SliceSpec!);
   }
 
-  }
 
   @RequiresApi(28) public class SliceConvert {
   }
@@ -59,15 +58,7 @@
     method public void onAction(androidx.slice.SliceItem!, android.content.Context!, android.content.Intent!);
   }
 
-  }
 
-    ctor public SliceItemHolder(String!, Object!, boolean);
-    method public Object! getObj(String!);
-    method public void release();
-    field public androidx.versionedparcelable.VersionedParcelable! mVersionedParcelable;
-    field public static androidx.slice.SliceItemHolder.HolderHandler! sHandler;
-    field public static final Object! sSerializeLock;
-  }
 
   public static interface SliceItemHolder.HolderHandler {
     method public void handle(androidx.slice.SliceItemHolder!, String!);
@@ -118,12 +109,6 @@
 
 package androidx.slice.compat {
 
-    ctor public CompatPermissionManager(android.content.Context!, String!, int, String[]!);
-    method public int checkSlicePermission(android.net.Uri!, int, int);
-    method public void grantSlicePermission(android.net.Uri!, String!);
-    method public void revokeSlicePermission(android.net.Uri!, String!);
-    field public static final String ALL_SUFFIX = "_all";
-  }
 
   public static class CompatPermissionManager.PermissionState {
     method public String! getKey();
@@ -132,19 +117,7 @@
     method public java.util.Set<java.lang.String>! toPersistable();
   }
 
-    ctor public CompatPinnedList(android.content.Context!, String!);
-    method public boolean addPin(android.net.Uri!, String!, java.util.Set<androidx.slice.SliceSpec>!);
-    method @VisibleForTesting protected long getBootTime();
-    method public java.util.List<android.net.Uri>! getPinnedSlices();
-    method public androidx.collection.ArraySet<androidx.slice.SliceSpec>! getSpecs(android.net.Uri!);
-    method public boolean removePin(android.net.Uri!, String!);
-  }
 
-    ctor public SlicePermissionActivity();
-    method public void onClick(android.content.DialogInterface!, int);
-    method public void onDestroy();
-    method public void onDismiss(android.content.DialogInterface!);
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RequiresApi(19) public class SliceProviderCompat {
     ctor public SliceProviderCompat(androidx.slice.SliceProvider!, androidx.slice.compat.CompatPermissionManager!, android.content.Context!);
@@ -188,7 +161,6 @@
     field public static final String PERMS_PREFIX = "slice_perms_";
   }
 
-  }
 
   @RequiresApi(28) public static class SliceProviderWrapperContainer.SliceProviderWrapper extends android.app.slice.SliceProvider {
     ctor public SliceProviderWrapperContainer.SliceProviderWrapper(androidx.slice.SliceProvider!, String[]!);

diff --git a/textclassifier/api/restricted_1.0.0-alpha03.txt b/textclassifier/api/restricted_1.0.0-alpha03.txt
index 210f5ee..a20a31b 100644
--- a/textclassifier/api/restricted_1.0.0-alpha03.txt
+++ b/textclassifier/api/restricted_1.0.0-alpha03.txt

@@ -1,12 +1,7 @@
 // Signature format: 3.0
 package androidx.textclassifier {
 
-    ctor public MainThreadExecutor();
-    method public void execute(Runnable);
-  }
 
-    method public static androidx.textclassifier.PlatformTextClassifierWrapper create(android.content.Context);
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class SelectionEvent {
     method public static androidx.textclassifier.SelectionEvent createFromBundle(android.os.Bundle);
@@ -55,11 +50,8 @@
     field public static final int INVOCATION_UNKNOWN = 0; // 0x0
   }
 
-  }
 
-  }
 
-  }
 
   public final class TextClassificationSessionId {
   }
@@ -73,9 +65,7 @@
   public final class TextLinks {
   }
 
-  }
 
-  }
 
   public static class TextLinks.TextLinkSpanData {
   }

diff --git a/textclassifier/api/restricted_current.txt b/textclassifier/api/restricted_current.txt
index 210f5ee..a20a31b 100644
--- a/textclassifier/api/restricted_current.txt
+++ b/textclassifier/api/restricted_current.txt

@@ -1,12 +1,7 @@
 // Signature format: 3.0
 package androidx.textclassifier {
 
-    ctor public MainThreadExecutor();
-    method public void execute(Runnable);
-  }
 
-    method public static androidx.textclassifier.PlatformTextClassifierWrapper create(android.content.Context);
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class SelectionEvent {
     method public static androidx.textclassifier.SelectionEvent createFromBundle(android.os.Bundle);
@@ -55,11 +50,8 @@
     field public static final int INVOCATION_UNKNOWN = 0; // 0x0
   }
 
-  }
 
-  }
 
-  }
 
   public final class TextClassificationSessionId {
   }
@@ -73,9 +65,7 @@
   public final class TextLinks {
   }
 
-  }
 
-  }
 
   public static class TextLinks.TextLinkSpanData {
   }

diff --git a/tv-provider/api/restricted_1.1.0-alpha01.txt b/tv-provider/api/restricted_1.1.0-alpha01.txt
index 4fe93364..e53e078 100644
--- a/tv-provider/api/restricted_1.1.0-alpha01.txt
+++ b/tv-provider/api/restricted_1.1.0-alpha01.txt

@@ -1,37 +1,6 @@
 // Signature format: 3.0
 package androidx.tvprovider.media.tv {
 
-    method public String! getAuthor();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.Availability public int getAvailability();
-    method public String! getContentId();
-    method public int getDurationMillis();
-    method public long getEndTimeUtcMillis();
-    method public String! getGenre();
-    method public android.content.Intent! getIntent() throws java.net.URISyntaxException;
-    method public android.net.Uri! getIntentUri();
-    method public long getInteractionCount();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.InteractionType public int getInteractionType();
-    method public String! getInternalProviderId();
-    method public int getItemCount();
-    method public int getLastPlaybackPositionMillis();
-    method public String! getLogoContentDescription();
-    method public android.net.Uri! getLogoUri();
-    method public String! getOfferPrice();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.AspectRatio public int getPosterArtAspectRatio();
-    method public android.net.Uri! getPreviewAudioUri();
-    method public android.net.Uri! getPreviewVideoUri();
-    method public String! getReleaseDate();
-    method public long getStartTimeUtcMillis();
-    method public String! getStartingPrice();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.AspectRatio public int getThumbnailAspectRatio();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.TvSeriesItemType public int getTvSeriesItemType();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.Type public int getType();
-    method public boolean isBrowsable();
-    method public boolean isLive();
-    method public boolean isTransient();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.content.ContentValues! toContentValues(boolean);
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final String[]! PROJECTION;
-  }
 
   @IntDef({androidx.tvprovider.media.tv.BasePreviewProgram.ASPECT_RATIO_UNKNOWN, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_16_9, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_3_2, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_4_3, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_1_1, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_2_3, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_MOVIE_POSTER}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface BasePreviewProgram.AspectRatio {
   }
@@ -82,34 +51,6 @@
   @IntDef({androidx.tvprovider.media.tv.BasePreviewProgram.TYPE_UNKNOWN, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_MOVIE, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_TV_SERIES, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_TV_SEASON, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_TV_EPISODE, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_CLIP, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_EVENT, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_CHANNEL, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_TRACK, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_ALBUM, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_ARTIST, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_PLAYLIST, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_STATION, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_GAME}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface BasePreviewProgram.Type {
   }
 
-    method public String[]! getAudioLanguages();
-    method @androidx.tvprovider.media.tv.TvContractCompat.Programs.Genres.Genre public String[]! getCanonicalGenres();
-    method public android.media.tv.TvContentRating[]! getContentRatings();
-    method public String! getDescription();
-    method public String! getEpisodeNumber();
-    method public String! getEpisodeTitle();
-    method public long getId();
-    method public byte[]! getInternalProviderDataByteArray();
-    method public Long! getInternalProviderFlag1();
-    method public Long! getInternalProviderFlag2();
-    method public Long! getInternalProviderFlag3();
-    method public Long! getInternalProviderFlag4();
-    method public String! getLongDescription();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public String! getPackageName();
-    method public android.net.Uri! getPosterArtUri();
-    method public String! getReviewRating();
-    method public int getReviewRatingStyle();
-    method public String! getSeasonNumber();
-    method public String! getSeasonTitle();
-    method public android.net.Uri! getThumbnailUri();
-    method public String! getTitle();
-    method public int getVideoHeight();
-    method public int getVideoWidth();
-    method public boolean isSearchable();
-    method public android.content.ContentValues! toContentValues();
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final String[]! PROJECTION;
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected android.content.ContentValues! mValues;
-  }
 
   public abstract static class BaseProgram.Builder<T extends androidx.tvprovider.media.tv.BaseProgram.Builder> {
     ctor public BaseProgram.Builder();
@@ -288,7 +229,6 @@
     field public static final int TYPE_TV_SERIES = 1; // 0x1
   }
 
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class TvContractUtils {
     method public static String! audioLanguagesToString(String[]!);

diff --git a/tv-provider/api/restricted_current.txt b/tv-provider/api/restricted_current.txt
index 4fe93364..e53e078 100644
--- a/tv-provider/api/restricted_current.txt
+++ b/tv-provider/api/restricted_current.txt

@@ -1,37 +1,6 @@
 // Signature format: 3.0
 package androidx.tvprovider.media.tv {
 
-    method public String! getAuthor();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.Availability public int getAvailability();
-    method public String! getContentId();
-    method public int getDurationMillis();
-    method public long getEndTimeUtcMillis();
-    method public String! getGenre();
-    method public android.content.Intent! getIntent() throws java.net.URISyntaxException;
-    method public android.net.Uri! getIntentUri();
-    method public long getInteractionCount();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.InteractionType public int getInteractionType();
-    method public String! getInternalProviderId();
-    method public int getItemCount();
-    method public int getLastPlaybackPositionMillis();
-    method public String! getLogoContentDescription();
-    method public android.net.Uri! getLogoUri();
-    method public String! getOfferPrice();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.AspectRatio public int getPosterArtAspectRatio();
-    method public android.net.Uri! getPreviewAudioUri();
-    method public android.net.Uri! getPreviewVideoUri();
-    method public String! getReleaseDate();
-    method public long getStartTimeUtcMillis();
-    method public String! getStartingPrice();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.AspectRatio public int getThumbnailAspectRatio();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.TvSeriesItemType public int getTvSeriesItemType();
-    method @androidx.tvprovider.media.tv.BasePreviewProgram.Type public int getType();
-    method public boolean isBrowsable();
-    method public boolean isLive();
-    method public boolean isTransient();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public android.content.ContentValues! toContentValues(boolean);
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final String[]! PROJECTION;
-  }
 
   @IntDef({androidx.tvprovider.media.tv.BasePreviewProgram.ASPECT_RATIO_UNKNOWN, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_16_9, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_3_2, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_4_3, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_1_1, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_2_3, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.ASPECT_RATIO_MOVIE_POSTER}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface BasePreviewProgram.AspectRatio {
   }
@@ -82,34 +51,6 @@
   @IntDef({androidx.tvprovider.media.tv.BasePreviewProgram.TYPE_UNKNOWN, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_MOVIE, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_TV_SERIES, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_TV_SEASON, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_TV_EPISODE, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_CLIP, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_EVENT, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_CHANNEL, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_TRACK, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_ALBUM, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_ARTIST, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_PLAYLIST, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_STATION, androidx.tvprovider.media.tv.TvContractCompat.PreviewProgramColumns.TYPE_GAME}) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface BasePreviewProgram.Type {
   }
 
-    method public String[]! getAudioLanguages();
-    method @androidx.tvprovider.media.tv.TvContractCompat.Programs.Genres.Genre public String[]! getCanonicalGenres();
-    method public android.media.tv.TvContentRating[]! getContentRatings();
-    method public String! getDescription();
-    method public String! getEpisodeNumber();
-    method public String! getEpisodeTitle();
-    method public long getId();
-    method public byte[]! getInternalProviderDataByteArray();
-    method public Long! getInternalProviderFlag1();
-    method public Long! getInternalProviderFlag2();
-    method public Long! getInternalProviderFlag3();
-    method public Long! getInternalProviderFlag4();
-    method public String! getLongDescription();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public String! getPackageName();
-    method public android.net.Uri! getPosterArtUri();
-    method public String! getReviewRating();
-    method public int getReviewRatingStyle();
-    method public String! getSeasonNumber();
-    method public String! getSeasonTitle();
-    method public android.net.Uri! getThumbnailUri();
-    method public String! getTitle();
-    method public int getVideoHeight();
-    method public int getVideoWidth();
-    method public boolean isSearchable();
-    method public android.content.ContentValues! toContentValues();
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final String[]! PROJECTION;
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) protected android.content.ContentValues! mValues;
-  }
 
   public abstract static class BaseProgram.Builder<T extends androidx.tvprovider.media.tv.BaseProgram.Builder> {
     ctor public BaseProgram.Builder();
@@ -288,7 +229,6 @@
     field public static final int TYPE_TV_SERIES = 1; // 0x1
   }
 
-  }
 
   @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class TvContractUtils {
     method public static String! audioLanguagesToString(String[]!);

diff --git a/versionedparcelable/api/restricted_1.1.0-alpha02.txt b/versionedparcelable/api/restricted_1.1.0-alpha02.txt
index be8ed8a..b934327 100644
--- a/versionedparcelable/api/restricted_1.1.0-alpha02.txt
+++ b/versionedparcelable/api/restricted_1.1.0-alpha02.txt

@@ -15,13 +15,6 @@
     method public abstract int value();
   }
 
-    ctor public ParcelImpl(androidx.versionedparcelable.VersionedParcelable!);
-    ctor protected ParcelImpl(android.os.Parcel!);
-    method public int describeContents();
-    method public <T extends androidx.versionedparcelable.VersionedParcelable> T! getVersionedParcel();
-    method public void writeToParcel(android.os.Parcel!, int);
-    field public static final android.os.Parcelable.Creator<androidx.versionedparcelable.ParcelImpl>! CREATOR;
-  }
 
   public class ParcelUtils {
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static <T extends androidx.versionedparcelable.VersionedParcelable> T! fromInputStream(java.io.InputStream!);

diff --git a/versionedparcelable/api/restricted_current.txt b/versionedparcelable/api/restricted_current.txt
index be8ed8a..b934327 100644
--- a/versionedparcelable/api/restricted_current.txt
+++ b/versionedparcelable/api/restricted_current.txt

@@ -15,13 +15,6 @@
     method public abstract int value();
   }
 
-    ctor public ParcelImpl(androidx.versionedparcelable.VersionedParcelable!);
-    ctor protected ParcelImpl(android.os.Parcel!);
-    method public int describeContents();
-    method public <T extends androidx.versionedparcelable.VersionedParcelable> T! getVersionedParcel();
-    method public void writeToParcel(android.os.Parcel!, int);
-    field public static final android.os.Parcelable.Creator<androidx.versionedparcelable.ParcelImpl>! CREATOR;
-  }
 
   public class ParcelUtils {
     method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static <T extends androidx.versionedparcelable.VersionedParcelable> T! fromInputStream(java.io.InputStream!);
commit	c6367453d6859d4fa96bf3f4e9986d63282f1470	[log] [tgz]
author	Adrian Roos <[email protected]>	Fri Feb 22 09:58:21 2019 +0000
committer	Gerrit Code Review <[email protected]>	Fri Feb 22 09:58:21 2019 +0000
tree	b0348b2da2880ed5a4eb7db6f7ff86d4ceb3242a
parent	09ca4ccb5c1b6302d4e05868ffc7d85c6ffad064 [diff]
parent	0b2c8b5a3ea18e80b32b57c49dba74c2812946ee [diff]