Update to new version of metalava
- Updates signature files based on the new metalava
- Fix cases where metalava now catches wider visibility methods
inside of a narrower visibility class (e.g. ContentFrameLayout)
Relnote: N/A
Test: ./gradlew updateApi
Change-Id: Ia7275f7c8c228e52fbc560ca1720ca290fc4bcdf
diff --git a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ContentFrameLayout.java b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ContentFrameLayout.java
index fcefd9e..f654893 100644
--- a/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ContentFrameLayout.java
+++ b/appcompat/appcompat/src/main/java/androidx/appcompat/widget/ContentFrameLayout.java
@@ -21,7 +21,6 @@
import static android.view.View.MeasureSpec.getMode;
import static androidx.annotation.RestrictTo.Scope.LIBRARY;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
import android.content.Context;
import android.graphics.Rect;
@@ -74,7 +73,7 @@
/**
* @hide
*/
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public void dispatchFitSystemWindows(Rect insets) {
fitSystemWindows(insets);
}
@@ -89,7 +88,7 @@
*
* @hide
*/
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public void setDecorPadding(int left, int top, int right, int bottom) {
mDecorPadding.set(left, top, right, bottom);
if (ViewCompat.isLaidOut(this)) {
diff --git a/camera/camera-core/api/1.0.0-beta05.txt b/camera/camera-core/api/1.0.0-beta05.txt
index 59da60e..1b9883a 100644
--- a/camera/camera-core/api/1.0.0-beta05.txt
+++ b/camera/camera-core/api/1.0.0-beta05.txt
@@ -43,7 +43,7 @@
public static final class CameraSelector.Builder {
ctor public CameraSelector.Builder();
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/1.0.0-beta06.txt b/camera/camera-core/api/1.0.0-beta06.txt
index 59da60e..1b9883a 100644
--- a/camera/camera-core/api/1.0.0-beta06.txt
+++ b/camera/camera-core/api/1.0.0-beta06.txt
@@ -43,7 +43,7 @@
public static final class CameraSelector.Builder {
ctor public CameraSelector.Builder();
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/1.0.0-beta07.txt b/camera/camera-core/api/1.0.0-beta07.txt
index 59da60e..1b9883a 100644
--- a/camera/camera-core/api/1.0.0-beta07.txt
+++ b/camera/camera-core/api/1.0.0-beta07.txt
@@ -43,7 +43,7 @@
public static final class CameraSelector.Builder {
ctor public CameraSelector.Builder();
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/current.txt b/camera/camera-core/api/current.txt
index 59da60e..1b9883a 100644
--- a/camera/camera-core/api/current.txt
+++ b/camera/camera-core/api/current.txt
@@ -43,7 +43,7 @@
public static final class CameraSelector.Builder {
ctor public CameraSelector.Builder();
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/public_plus_experimental_1.0.0-beta05.txt b/camera/camera-core/api/public_plus_experimental_1.0.0-beta05.txt
index 2b746ba..9b348d20 100644
--- a/camera/camera-core/api/public_plus_experimental_1.0.0-beta05.txt
+++ b/camera/camera-core/api/public_plus_experimental_1.0.0-beta05.txt
@@ -22,10 +22,6 @@
public static final class CameraControl.OperationCanceledException extends java.lang.Exception {
}
- @androidx.camera.core.ExperimentalCameraFilter public interface CameraFilter {
- method public void filter(java.util.LinkedHashSet<androidx.camera.core.Camera!>);
- }
-
public interface CameraInfo {
method public int getSensorRotationDegrees();
method public int getSensorRotationDegrees(int);
@@ -46,9 +42,8 @@
public static final class CameraSelector.Builder {
ctor public CameraSelector.Builder();
- method @androidx.camera.core.ExperimentalCameraFilter public androidx.camera.core.CameraSelector.Builder addCameraFilter(androidx.camera.core.CameraFilter);
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
@@ -84,9 +79,6 @@
ctor public DisplayOrientedMeteringPointFactory(android.view.Display, androidx.camera.core.CameraSelector, float, float);
}
- @experimental.Experimental @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ExperimentalCameraFilter {
- }
-
@experimental.Experimental @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ExperimentalCustomizableThreads {
}
diff --git a/camera/camera-core/api/public_plus_experimental_1.0.0-beta06.txt b/camera/camera-core/api/public_plus_experimental_1.0.0-beta06.txt
index 6e77917..7893556 100644
--- a/camera/camera-core/api/public_plus_experimental_1.0.0-beta06.txt
+++ b/camera/camera-core/api/public_plus_experimental_1.0.0-beta06.txt
@@ -48,7 +48,7 @@
ctor public CameraSelector.Builder();
method @androidx.camera.core.ExperimentalCameraFilter public androidx.camera.core.CameraSelector.Builder addCameraFilter(androidx.camera.core.CameraFilter);
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/public_plus_experimental_1.0.0-beta07.txt b/camera/camera-core/api/public_plus_experimental_1.0.0-beta07.txt
index 4b119c0..11f834b 100644
--- a/camera/camera-core/api/public_plus_experimental_1.0.0-beta07.txt
+++ b/camera/camera-core/api/public_plus_experimental_1.0.0-beta07.txt
@@ -48,7 +48,7 @@
ctor public CameraSelector.Builder();
method @androidx.camera.core.ExperimentalCameraFilter public androidx.camera.core.CameraSelector.Builder addCameraFilter(androidx.camera.core.CameraFilter);
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/public_plus_experimental_current.txt b/camera/camera-core/api/public_plus_experimental_current.txt
index 4b119c0..11f834b 100644
--- a/camera/camera-core/api/public_plus_experimental_current.txt
+++ b/camera/camera-core/api/public_plus_experimental_current.txt
@@ -48,7 +48,7 @@
ctor public CameraSelector.Builder();
method @androidx.camera.core.ExperimentalCameraFilter public androidx.camera.core.CameraSelector.Builder addCameraFilter(androidx.camera.core.CameraFilter);
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/restricted_1.0.0-beta05.txt b/camera/camera-core/api/restricted_1.0.0-beta05.txt
index 59da60e..1b9883a 100644
--- a/camera/camera-core/api/restricted_1.0.0-beta05.txt
+++ b/camera/camera-core/api/restricted_1.0.0-beta05.txt
@@ -43,7 +43,7 @@
public static final class CameraSelector.Builder {
ctor public CameraSelector.Builder();
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/restricted_1.0.0-beta06.txt b/camera/camera-core/api/restricted_1.0.0-beta06.txt
index 59da60e..1b9883a 100644
--- a/camera/camera-core/api/restricted_1.0.0-beta06.txt
+++ b/camera/camera-core/api/restricted_1.0.0-beta06.txt
@@ -43,7 +43,7 @@
public static final class CameraSelector.Builder {
ctor public CameraSelector.Builder();
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/restricted_1.0.0-beta07.txt b/camera/camera-core/api/restricted_1.0.0-beta07.txt
index 59da60e..1b9883a 100644
--- a/camera/camera-core/api/restricted_1.0.0-beta07.txt
+++ b/camera/camera-core/api/restricted_1.0.0-beta07.txt
@@ -43,7 +43,7 @@
public static final class CameraSelector.Builder {
ctor public CameraSelector.Builder();
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-core/api/restricted_current.txt b/camera/camera-core/api/restricted_current.txt
index 59da60e..1b9883a 100644
--- a/camera/camera-core/api/restricted_current.txt
+++ b/camera/camera-core/api/restricted_current.txt
@@ -43,7 +43,7 @@
public static final class CameraSelector.Builder {
ctor public CameraSelector.Builder();
method public androidx.camera.core.CameraSelector build();
- method @experimental.UseExperimental(markerClass=ExperimentalCameraFilter.class) public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
+ method public androidx.camera.core.CameraSelector.Builder requireLensFacing(int);
}
public class CameraUnavailableException extends java.lang.Exception {
diff --git a/camera/camera-lifecycle/api/1.0.0-beta06.txt b/camera/camera-lifecycle/api/1.0.0-beta06.txt
index 8278c48..88187bc6 100644
--- a/camera/camera-lifecycle/api/1.0.0-beta06.txt
+++ b/camera/camera-lifecycle/api/1.0.0-beta06.txt
@@ -2,7 +2,7 @@
package androidx.camera.lifecycle {
public final class ProcessCameraProvider {
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+ method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
method public boolean isBound(androidx.camera.core.UseCase);
diff --git a/camera/camera-lifecycle/api/1.0.0-beta07.txt b/camera/camera-lifecycle/api/1.0.0-beta07.txt
index 8278c48..88187bc6 100644
--- a/camera/camera-lifecycle/api/1.0.0-beta07.txt
+++ b/camera/camera-lifecycle/api/1.0.0-beta07.txt
@@ -2,7 +2,7 @@
package androidx.camera.lifecycle {
public final class ProcessCameraProvider {
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+ method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
method public boolean isBound(androidx.camera.core.UseCase);
diff --git a/camera/camera-lifecycle/api/current.txt b/camera/camera-lifecycle/api/current.txt
index 8278c48..88187bc6 100644
--- a/camera/camera-lifecycle/api/current.txt
+++ b/camera/camera-lifecycle/api/current.txt
@@ -2,7 +2,7 @@
package androidx.camera.lifecycle {
public final class ProcessCameraProvider {
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+ method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
method public boolean isBound(androidx.camera.core.UseCase);
diff --git a/camera/camera-lifecycle/api/public_plus_experimental_1.0.0-beta06.txt b/camera/camera-lifecycle/api/public_plus_experimental_1.0.0-beta06.txt
index b28a42b..d317ea5 100644
--- a/camera/camera-lifecycle/api/public_plus_experimental_1.0.0-beta06.txt
+++ b/camera/camera-lifecycle/api/public_plus_experimental_1.0.0-beta06.txt
@@ -8,8 +8,8 @@
}
public final class ProcessCameraProvider {
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) @androidx.camera.lifecycle.ExperimentalUseCaseGroupLifecycle public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCaseGroup);
+ method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+ method @MainThread @androidx.camera.lifecycle.ExperimentalUseCaseGroupLifecycle public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCaseGroup);
method @androidx.camera.lifecycle.ExperimentalCameraProviderConfiguration public static void configureInstance(androidx.camera.core.CameraXConfig);
method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
diff --git a/camera/camera-lifecycle/api/public_plus_experimental_1.0.0-beta07.txt b/camera/camera-lifecycle/api/public_plus_experimental_1.0.0-beta07.txt
index b28a42b..d317ea5 100644
--- a/camera/camera-lifecycle/api/public_plus_experimental_1.0.0-beta07.txt
+++ b/camera/camera-lifecycle/api/public_plus_experimental_1.0.0-beta07.txt
@@ -8,8 +8,8 @@
}
public final class ProcessCameraProvider {
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) @androidx.camera.lifecycle.ExperimentalUseCaseGroupLifecycle public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCaseGroup);
+ method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+ method @MainThread @androidx.camera.lifecycle.ExperimentalUseCaseGroupLifecycle public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCaseGroup);
method @androidx.camera.lifecycle.ExperimentalCameraProviderConfiguration public static void configureInstance(androidx.camera.core.CameraXConfig);
method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
diff --git a/camera/camera-lifecycle/api/public_plus_experimental_current.txt b/camera/camera-lifecycle/api/public_plus_experimental_current.txt
index b28a42b..d317ea5 100644
--- a/camera/camera-lifecycle/api/public_plus_experimental_current.txt
+++ b/camera/camera-lifecycle/api/public_plus_experimental_current.txt
@@ -8,8 +8,8 @@
}
public final class ProcessCameraProvider {
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) @androidx.camera.lifecycle.ExperimentalUseCaseGroupLifecycle public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCaseGroup);
+ method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+ method @MainThread @androidx.camera.lifecycle.ExperimentalUseCaseGroupLifecycle public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCaseGroup);
method @androidx.camera.lifecycle.ExperimentalCameraProviderConfiguration public static void configureInstance(androidx.camera.core.CameraXConfig);
method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
diff --git a/camera/camera-lifecycle/api/restricted_1.0.0-beta06.txt b/camera/camera-lifecycle/api/restricted_1.0.0-beta06.txt
index 8278c48..88187bc6 100644
--- a/camera/camera-lifecycle/api/restricted_1.0.0-beta06.txt
+++ b/camera/camera-lifecycle/api/restricted_1.0.0-beta06.txt
@@ -2,7 +2,7 @@
package androidx.camera.lifecycle {
public final class ProcessCameraProvider {
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+ method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
method public boolean isBound(androidx.camera.core.UseCase);
diff --git a/camera/camera-lifecycle/api/restricted_1.0.0-beta07.txt b/camera/camera-lifecycle/api/restricted_1.0.0-beta07.txt
index 8278c48..88187bc6 100644
--- a/camera/camera-lifecycle/api/restricted_1.0.0-beta07.txt
+++ b/camera/camera-lifecycle/api/restricted_1.0.0-beta07.txt
@@ -2,7 +2,7 @@
package androidx.camera.lifecycle {
public final class ProcessCameraProvider {
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+ method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
method public boolean isBound(androidx.camera.core.UseCase);
diff --git a/camera/camera-lifecycle/api/restricted_current.txt b/camera/camera-lifecycle/api/restricted_current.txt
index 8278c48..88187bc6 100644
--- a/camera/camera-lifecycle/api/restricted_current.txt
+++ b/camera/camera-lifecycle/api/restricted_current.txt
@@ -2,7 +2,7 @@
package androidx.camera.lifecycle {
public final class ProcessCameraProvider {
- method @MainThread @experimental.UseExperimental(markerClass=ExperimentalUseCaseGroup.class) public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
+ method @MainThread public androidx.camera.core.Camera bindToLifecycle(androidx.lifecycle.LifecycleOwner, androidx.camera.core.CameraSelector, androidx.camera.core.UseCase!...);
method public static com.google.common.util.concurrent.ListenableFuture<androidx.camera.lifecycle.ProcessCameraProvider!> getInstance(android.content.Context);
method public boolean hasCamera(androidx.camera.core.CameraSelector) throws androidx.camera.core.CameraInfoUnavailableException;
method public boolean isBound(androidx.camera.core.UseCase);
diff --git a/slices/view/api/restricted_1.1.0-alpha02.txt b/slices/view/api/restricted_1.1.0-alpha02.txt
index ac30808..3fe4b0d 100644
--- a/slices/view/api/restricted_1.1.0-alpha02.txt
+++ b/slices/view/api/restricted_1.1.0-alpha02.txt
@@ -112,7 +112,7 @@
field public int state;
}
- @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class GridContent extends androidx.slice.widget.SliceContent {
+ @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class GridContent {
ctor public GridContent(androidx.slice.SliceItem!, int);
method public int getAccentColor();
method public CharSequence? getContentDescription();
@@ -148,7 +148,7 @@
method public boolean populate(androidx.slice.SliceItem!);
}
- @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class ListContent extends androidx.slice.widget.SliceContent {
+ @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class ListContent {
ctor public ListContent(androidx.slice.Slice);
ctor @Deprecated public ListContent(android.content.Context!, androidx.slice.Slice);
method public int getAccentColor();
@@ -172,7 +172,7 @@
method public void showTitleItems(boolean);
}
- @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class RowContent extends androidx.slice.widget.SliceContent {
+ @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class RowContent {
ctor public RowContent(androidx.slice.SliceItem!, int);
method public int getAccentColor();
method public CharSequence? getContentDescription();
diff --git a/slices/view/api/restricted_current.txt b/slices/view/api/restricted_current.txt
index ac30808..3fe4b0d 100644
--- a/slices/view/api/restricted_current.txt
+++ b/slices/view/api/restricted_current.txt
@@ -112,7 +112,7 @@
field public int state;
}
- @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class GridContent extends androidx.slice.widget.SliceContent {
+ @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class GridContent {
ctor public GridContent(androidx.slice.SliceItem!, int);
method public int getAccentColor();
method public CharSequence? getContentDescription();
@@ -148,7 +148,7 @@
method public boolean populate(androidx.slice.SliceItem!);
}
- @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class ListContent extends androidx.slice.widget.SliceContent {
+ @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class ListContent {
ctor public ListContent(androidx.slice.Slice);
ctor @Deprecated public ListContent(android.content.Context!, androidx.slice.Slice);
method public int getAccentColor();
@@ -172,7 +172,7 @@
method public void showTitleItems(boolean);
}
- @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class RowContent extends androidx.slice.widget.SliceContent {
+ @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class RowContent {
ctor public RowContent(androidx.slice.SliceItem!, int);
method public int getAccentColor();
method public CharSequence? getContentDescription();
diff --git a/tv-provider/tv-provider/api/restricted_1.1.0-alpha01.txt b/tv-provider/tv-provider/api/restricted_1.1.0-alpha01.txt
index 0747b53..2e09571 100644
--- a/tv-provider/tv-provider/api/restricted_1.1.0-alpha01.txt
+++ b/tv-provider/tv-provider/api/restricted_1.1.0-alpha01.txt
@@ -197,7 +197,6 @@
method public android.net.Uri! getLogoUri();
method public String! getLongDescription();
method public String! getOfferPrice();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public String! getPackageName();
method public int getPosterArtAspectRatio();
method public android.net.Uri! getPosterArtUri();
method public android.net.Uri! getPreviewAudioUri();
@@ -311,7 +310,6 @@
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();
@@ -802,7 +800,6 @@
method public android.net.Uri! getLogoUri();
method public String! getLongDescription();
method public String! getOfferPrice();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public String! getPackageName();
method public int getPosterArtAspectRatio();
method public android.net.Uri! getPosterArtUri();
method public android.net.Uri! getPreviewAudioUri();
diff --git a/tv-provider/tv-provider/api/restricted_current.txt b/tv-provider/tv-provider/api/restricted_current.txt
index 0747b53..2e09571 100644
--- a/tv-provider/tv-provider/api/restricted_current.txt
+++ b/tv-provider/tv-provider/api/restricted_current.txt
@@ -197,7 +197,6 @@
method public android.net.Uri! getLogoUri();
method public String! getLongDescription();
method public String! getOfferPrice();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public String! getPackageName();
method public int getPosterArtAspectRatio();
method public android.net.Uri! getPosterArtUri();
method public android.net.Uri! getPreviewAudioUri();
@@ -311,7 +310,6 @@
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();
@@ -802,7 +800,6 @@
method public android.net.Uri! getLogoUri();
method public String! getLongDescription();
method public String! getOfferPrice();
- method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public String! getPackageName();
method public int getPosterArtAspectRatio();
method public android.net.Uri! getPosterArtUri();
method public android.net.Uri! getPreviewAudioUri();
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java b/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java
index c5a2b61..97f5f71 100644
--- a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java
+++ b/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BasePreviewProgram.java
@@ -16,7 +16,6 @@
package androidx.tvprovider.media.tv;
import static androidx.annotation.RestrictTo.Scope.LIBRARY;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
import android.content.ContentValues;
import android.content.Intent;
@@ -47,7 +46,7 @@
/**
* @hide
*/
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public static final String[] PROJECTION = getProjection();
private static final int INVALID_INT_VALUE = -1;
@@ -74,7 +73,7 @@
PreviewProgramColumns.TYPE_GAME
})
@Retention(RetentionPolicy.SOURCE)
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public @interface Type {}
/**
@@ -93,7 +92,7 @@
PreviewProgramColumns.ASPECT_RATIO_MOVIE_POSTER
})
@Retention(RetentionPolicy.SOURCE)
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public @interface AspectRatio {}
/**
@@ -111,7 +110,7 @@
PreviewProgramColumns.AVAILABILITY_FREE
})
@Retention(RetentionPolicy.SOURCE)
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public @interface Availability {}
/**
@@ -131,7 +130,7 @@
PreviewProgramColumns.INTERACTION_TYPE_VIEWERS,
})
@Retention(RetentionPolicy.SOURCE)
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public @interface InteractionType {}
/** @hide */
@@ -140,7 +139,7 @@
PreviewProgramColumns.TV_SERIES_ITEM_TYPE_CHAPTER
})
@Retention(RetentionPolicy.SOURCE)
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public @interface TvSeriesItemType {}
/**
@@ -423,7 +422,7 @@
* @param includeProtectedFields Whether the fields protected by system is included or not.
* @hide
*/
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public ContentValues toContentValues(boolean includeProtectedFields) {
ContentValues values = super.toContentValues();
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
@@ -977,7 +976,7 @@
* @see androidx.tvprovider.media.tv.TvContractCompat.PreviewPrograms#COLUMN_BROWSABLE
* @hide
*/
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public T setBrowsable(boolean browsable) {
mValues.put(PreviewPrograms.COLUMN_BROWSABLE, browsable ? IS_BROWSABLE : 0);
return (T) this;
diff --git a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java b/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java
index 645ad7f..a16ca02 100644
--- a/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java
+++ b/tv-provider/tv-provider/src/main/java/androidx/tvprovider/media/tv/BaseProgram.java
@@ -16,7 +16,6 @@
package androidx.tvprovider.media.tv;
import static androidx.annotation.RestrictTo.Scope.LIBRARY;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX;
import android.content.ContentValues;
import android.database.Cursor;
@@ -47,7 +46,7 @@
/**
* @hide
*/
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public static final String[] PROJECTION = getProjection();
private static final long INVALID_LONG_VALUE = -1;
@@ -62,7 +61,7 @@
ProgramColumns.REVIEW_RATING_STYLE_PERCENTAGE,
})
@Retention(RetentionPolicy.SOURCE)
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
@interface ReviewRatingStyle {}
/**
@@ -71,7 +70,7 @@
private static final int REVIEW_RATING_STYLE_UNKNOWN = -1;
/** @hide */
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
protected ContentValues mValues;
/* package-private */
@@ -93,7 +92,7 @@
* @see androidx.tvprovider.media.tv.TvContractCompat.BaseTvColumns#COLUMN_PACKAGE_NAME
* @hide
*/
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public String getPackageName() {
return mValues.getAsString(BaseTvColumns.COLUMN_PACKAGE_NAME);
}
@@ -542,7 +541,7 @@
*/
public abstract static class Builder<T extends Builder> {
/** @hide */
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
protected ContentValues mValues;
/**
@@ -580,7 +579,7 @@
* @see androidx.tvprovider.media.tv.TvContractCompat.BaseTvColumns#COLUMN_PACKAGE_NAME
* @hide
*/
- @RestrictTo(LIBRARY_GROUP_PREFIX)
+ @RestrictTo(LIBRARY)
public T setPackageName(String packageName) {
mValues.put(BaseTvColumns.COLUMN_PACKAGE_NAME, packageName);
return (T) this;
