Update current API w/ Metalava update
Fix nullability for inherited generic type for property/accessor.
RelNote: N/A
Bug: 10009114
Test: presubmit
Change-Id: Ia8b248fc5022234d898e1ef38ef8ab4dd7300110
diff --git a/collection/collection/api/current.txt b/collection/collection/api/current.txt
index 3fbf783..a16f02c 100644
--- a/collection/collection/api/current.txt
+++ b/collection/collection/api/current.txt
@@ -63,16 +63,16 @@
method public void addLast(E element);
method public void clear();
method public operator E get(int index);
- method public E! getFirst();
- method public E! getLast();
+ method public E getFirst();
+ method public E getLast();
method public boolean isEmpty();
method public E popFirst();
method public E popLast();
method public void removeFromEnd(int count);
method public void removeFromStart(int count);
method public int size();
- property public final E! first;
- property public final E! last;
+ property public final E first;
+ property public final E last;
}
public final class CircularIntArray {
diff --git a/collection/collection/api/public_plus_experimental_current.txt b/collection/collection/api/public_plus_experimental_current.txt
index 3fbf783..a16f02c 100644
--- a/collection/collection/api/public_plus_experimental_current.txt
+++ b/collection/collection/api/public_plus_experimental_current.txt
@@ -63,16 +63,16 @@
method public void addLast(E element);
method public void clear();
method public operator E get(int index);
- method public E! getFirst();
- method public E! getLast();
+ method public E getFirst();
+ method public E getLast();
method public boolean isEmpty();
method public E popFirst();
method public E popLast();
method public void removeFromEnd(int count);
method public void removeFromStart(int count);
method public int size();
- property public final E! first;
- property public final E! last;
+ property public final E first;
+ property public final E last;
}
public final class CircularIntArray {
diff --git a/collection/collection/api/restricted_current.txt b/collection/collection/api/restricted_current.txt
index 3fbf783..a16f02c 100644
--- a/collection/collection/api/restricted_current.txt
+++ b/collection/collection/api/restricted_current.txt
@@ -63,16 +63,16 @@
method public void addLast(E element);
method public void clear();
method public operator E get(int index);
- method public E! getFirst();
- method public E! getLast();
+ method public E getFirst();
+ method public E getLast();
method public boolean isEmpty();
method public E popFirst();
method public E popLast();
method public void removeFromEnd(int count);
method public void removeFromStart(int count);
method public int size();
- property public final E! first;
- property public final E! last;
+ property public final E first;
+ property public final E last;
}
public final class CircularIntArray {
diff --git a/compose/animation/animation-core/api/current.txt b/compose/animation/animation-core/api/current.txt
index ac05bf2..ae892a1 100644
--- a/compose/animation/animation-core/api/current.txt
+++ b/compose/animation/animation-core/api/current.txt
@@ -12,8 +12,8 @@
method public T getTargetValue();
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
method public T? getUpperBound();
- method public T! getValue();
- method public T! getVelocity();
+ method public T getValue();
+ method public T getVelocity();
method public V getVelocityVector();
method public boolean isRunning();
method public suspend Object? snapTo(T targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -25,8 +25,8 @@
property public final T targetValue;
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
property public final T? upperBound;
- property public final T! value;
- property public final T! velocity;
+ property public final T value;
+ property public final T velocity;
property public final V velocityVector;
}
@@ -104,7 +104,7 @@
method public T getTargetValue();
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
method public T getValue();
- method public T! getVelocity();
+ method public T getVelocity();
method public V getVelocityVector();
method public boolean isRunning();
method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
@@ -115,7 +115,7 @@
property public final T targetValue;
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
property public final T value;
- property public final T! velocity;
+ property public final T velocity;
property public final V velocityVector;
}
@@ -140,7 +140,7 @@
method public long getLastFrameTimeNanos();
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
method public T getValue();
- method public T! getVelocity();
+ method public T getVelocity();
method public V getVelocityVector();
method public boolean isRunning();
property public final long finishedTimeNanos;
@@ -148,7 +148,7 @@
property public final long lastFrameTimeNanos;
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
property public T value;
- property public final T! velocity;
+ property public final T velocity;
property public final V velocityVector;
}
@@ -567,7 +567,7 @@
@androidx.compose.runtime.Stable public final class Transition<S> {
method public java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> getAnimations();
- method public S! getCurrentState();
+ method public S getCurrentState();
method public String? getLabel();
method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
method public S getTargetState();
@@ -575,7 +575,7 @@
method public java.util.List<androidx.compose.animation.core.Transition<?>> getTransitions();
method public boolean isRunning();
property public final java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> animations;
- property public final S! currentState;
+ property public final S currentState;
property public final boolean isRunning;
property public final String? label;
property public final androidx.compose.animation.core.Transition.Segment<S> segment;
diff --git a/compose/animation/animation-core/api/public_plus_experimental_current.txt b/compose/animation/animation-core/api/public_plus_experimental_current.txt
index 03897cb..7a2c3a4 100644
--- a/compose/animation/animation-core/api/public_plus_experimental_current.txt
+++ b/compose/animation/animation-core/api/public_plus_experimental_current.txt
@@ -12,8 +12,8 @@
method public T getTargetValue();
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
method public T? getUpperBound();
- method public T! getValue();
- method public T! getVelocity();
+ method public T getValue();
+ method public T getVelocity();
method public V getVelocityVector();
method public boolean isRunning();
method public suspend Object? snapTo(T targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -25,8 +25,8 @@
property public final T targetValue;
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
property public final T? upperBound;
- property public final T! value;
- property public final T! velocity;
+ property public final T value;
+ property public final T velocity;
property public final V velocityVector;
}
@@ -104,7 +104,7 @@
method public T getTargetValue();
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
method public T getValue();
- method public T! getVelocity();
+ method public T getVelocity();
method public V getVelocityVector();
method public boolean isRunning();
method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
@@ -115,7 +115,7 @@
property public final T targetValue;
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
property public final T value;
- property public final T! velocity;
+ property public final T velocity;
property public final V velocityVector;
}
@@ -140,7 +140,7 @@
method public long getLastFrameTimeNanos();
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
method public T getValue();
- method public T! getVelocity();
+ method public T getVelocity();
method public V getVelocityVector();
method public boolean isRunning();
property public final long finishedTimeNanos;
@@ -148,7 +148,7 @@
property public final long lastFrameTimeNanos;
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
property public T value;
- property public final T! velocity;
+ property public final T velocity;
property public final V velocityVector;
}
@@ -573,7 +573,7 @@
@androidx.compose.runtime.Stable public final class Transition<S> {
method public java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> getAnimations();
- method public S! getCurrentState();
+ method public S getCurrentState();
method public String? getLabel();
method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
method public S getTargetState();
@@ -581,7 +581,7 @@
method public java.util.List<androidx.compose.animation.core.Transition<?>> getTransitions();
method public boolean isRunning();
property public final java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> animations;
- property public final S! currentState;
+ property public final S currentState;
property public final boolean isRunning;
property public final String? label;
property public final androidx.compose.animation.core.Transition.Segment<S> segment;
diff --git a/compose/animation/animation-core/api/restricted_current.txt b/compose/animation/animation-core/api/restricted_current.txt
index fa302aa..b2e9658 100644
--- a/compose/animation/animation-core/api/restricted_current.txt
+++ b/compose/animation/animation-core/api/restricted_current.txt
@@ -12,8 +12,8 @@
method public T getTargetValue();
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
method public T? getUpperBound();
- method public T! getValue();
- method public T! getVelocity();
+ method public T getValue();
+ method public T getVelocity();
method public V getVelocityVector();
method public boolean isRunning();
method public suspend Object? snapTo(T targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -25,8 +25,8 @@
property public final T targetValue;
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
property public final T? upperBound;
- property public final T! value;
- property public final T! velocity;
+ property public final T value;
+ property public final T velocity;
property public final V velocityVector;
}
@@ -104,7 +104,7 @@
method public T getTargetValue();
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
method public T getValue();
- method public T! getVelocity();
+ method public T getVelocity();
method public V getVelocityVector();
method public boolean isRunning();
method public androidx.compose.animation.core.AnimationState<T,V> toAnimationState();
@@ -115,7 +115,7 @@
property public final T targetValue;
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
property public final T value;
- property public final T! velocity;
+ property public final T velocity;
property public final V velocityVector;
}
@@ -140,7 +140,7 @@
method public long getLastFrameTimeNanos();
method public androidx.compose.animation.core.TwoWayConverter<T,V> getTypeConverter();
method public T getValue();
- method public T! getVelocity();
+ method public T getVelocity();
method public V getVelocityVector();
method public boolean isRunning();
property public final long finishedTimeNanos;
@@ -148,7 +148,7 @@
property public final long lastFrameTimeNanos;
property public final androidx.compose.animation.core.TwoWayConverter<T,V> typeConverter;
property public T value;
- property public final T! velocity;
+ property public final T velocity;
property public final V velocityVector;
}
@@ -568,7 +568,7 @@
@androidx.compose.runtime.Stable public final class Transition<S> {
ctor @kotlin.PublishedApi internal Transition(androidx.compose.animation.core.MutableTransitionState<S> transitionState, optional String? label);
method public java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> getAnimations();
- method public S! getCurrentState();
+ method public S getCurrentState();
method public String? getLabel();
method public androidx.compose.animation.core.Transition.Segment<S> getSegment();
method public S getTargetState();
@@ -576,7 +576,7 @@
method public java.util.List<androidx.compose.animation.core.Transition<?>> getTransitions();
method public boolean isRunning();
property public final java.util.List<androidx.compose.animation.core.Transition<S>.TransitionAnimationState<?,?>> animations;
- property public final S! currentState;
+ property public final S currentState;
property public final boolean isRunning;
property public final String? label;
property public final androidx.compose.animation.core.Transition.Segment<S> segment;
diff --git a/compose/material/material/api/public_plus_experimental_current.txt b/compose/material/material/api/public_plus_experimental_current.txt
index 0a71de1..d9fe905 100644
--- a/compose/material/material/api/public_plus_experimental_current.txt
+++ b/compose/material/material/api/public_plus_experimental_current.txt
@@ -777,7 +777,7 @@
method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
method public final androidx.compose.material.SwipeProgress<T> getProgress();
- method public final T! getTargetValue();
+ method public final T getTargetValue();
method public final boolean isAnimationRunning();
method public final float performDrag(float delta);
method public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -788,7 +788,7 @@
property public final androidx.compose.runtime.State<java.lang.Float> offset;
property public final androidx.compose.runtime.State<java.lang.Float> overflow;
property @androidx.compose.material.ExperimentalMaterialApi public final androidx.compose.material.SwipeProgress<T> progress;
- property @androidx.compose.material.ExperimentalMaterialApi public final T! targetValue;
+ property @androidx.compose.material.ExperimentalMaterialApi public final T targetValue;
field public static final androidx.compose.material.SwipeableState.Companion Companion;
}
diff --git a/compose/runtime/runtime/api/current.txt b/compose/runtime/runtime/api/current.txt
index 59a556b..3ddd28d 100644
--- a/compose/runtime/runtime/api/current.txt
+++ b/compose/runtime/runtime/api/current.txt
@@ -200,8 +200,8 @@
}
@androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
- method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
- property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T getCurrent();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T current;
}
@androidx.compose.runtime.Stable public final class CompositionLocalContext {
diff --git a/compose/runtime/runtime/api/public_plus_experimental_current.txt b/compose/runtime/runtime/api/public_plus_experimental_current.txt
index 9ce9384..1bea3e6 100644
--- a/compose/runtime/runtime/api/public_plus_experimental_current.txt
+++ b/compose/runtime/runtime/api/public_plus_experimental_current.txt
@@ -218,8 +218,8 @@
}
@androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
- method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
- property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T getCurrent();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T current;
}
@androidx.compose.runtime.Stable public final class CompositionLocalContext {
diff --git a/compose/runtime/runtime/api/restricted_current.txt b/compose/runtime/runtime/api/restricted_current.txt
index 366b6db..55a4ec2 100644
--- a/compose/runtime/runtime/api/restricted_current.txt
+++ b/compose/runtime/runtime/api/restricted_current.txt
@@ -218,8 +218,8 @@
}
@androidx.compose.runtime.Stable public abstract sealed class CompositionLocal<T> {
- method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! getCurrent();
- property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T! current;
+ method @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T getCurrent();
+ property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public final inline T current;
}
@androidx.compose.runtime.Stable public final class CompositionLocalContext {
diff --git a/compose/ui/ui/api/current.txt b/compose/ui/ui/api/current.txt
index 2067c04..b03200b 100644
--- a/compose/ui/ui/api/current.txt
+++ b/compose/ui/ui/api/current.txt
@@ -2229,7 +2229,7 @@
}
public interface ModifierLocalNode extends androidx.compose.ui.modifier.ModifierLocalReadScope androidx.compose.ui.node.DelegatableNode {
- method public default <T> T! getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
+ method public default <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
method public default androidx.compose.ui.modifier.ModifierLocalMap getProvidedValues();
method public default <T> void provide(androidx.compose.ui.modifier.ModifierLocal<T> key, T value);
property public default androidx.compose.ui.modifier.ModifierLocalMap providedValues;
diff --git a/compose/ui/ui/api/public_plus_experimental_current.txt b/compose/ui/ui/api/public_plus_experimental_current.txt
index d4ac072..2520afc 100644
--- a/compose/ui/ui/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui/api/public_plus_experimental_current.txt
@@ -2440,7 +2440,7 @@
}
public interface ModifierLocalNode extends androidx.compose.ui.modifier.ModifierLocalReadScope androidx.compose.ui.node.DelegatableNode {
- method public default <T> T! getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
+ method public default <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
method public default androidx.compose.ui.modifier.ModifierLocalMap getProvidedValues();
method public default <T> void provide(androidx.compose.ui.modifier.ModifierLocal<T> key, T value);
property public default androidx.compose.ui.modifier.ModifierLocalMap providedValues;
diff --git a/compose/ui/ui/api/restricted_current.txt b/compose/ui/ui/api/restricted_current.txt
index ded4438..b449e04 100644
--- a/compose/ui/ui/api/restricted_current.txt
+++ b/compose/ui/ui/api/restricted_current.txt
@@ -2236,7 +2236,7 @@
}
public interface ModifierLocalNode extends androidx.compose.ui.modifier.ModifierLocalReadScope androidx.compose.ui.node.DelegatableNode {
- method public default <T> T! getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
+ method public default <T> T getCurrent(androidx.compose.ui.modifier.ModifierLocal<T>);
method public default androidx.compose.ui.modifier.ModifierLocalMap getProvidedValues();
method public default <T> void provide(androidx.compose.ui.modifier.ModifierLocal<T> key, T value);
property public default androidx.compose.ui.modifier.ModifierLocalMap providedValues;
diff --git a/playground-common/playground.properties b/playground-common/playground.properties
index 599b0b2..e17b5c1 100644
--- a/playground-common/playground.properties
+++ b/playground-common/playground.properties
@@ -26,5 +26,5 @@
# Disable docs
androidx.enableDocumentation=false
androidx.playground.snapshotBuildId=9971607
-androidx.playground.metalavaBuildId=9975079
+androidx.playground.metalavaBuildId=10009114
androidx.studio.type=playground
diff --git a/wear/compose/compose-material/api/public_plus_experimental_current.txt b/wear/compose/compose-material/api/public_plus_experimental_current.txt
index fb0f899..02e12cd 100644
--- a/wear/compose/compose-material/api/public_plus_experimental_current.txt
+++ b/wear/compose/compose-material/api/public_plus_experimental_current.txt
@@ -706,7 +706,7 @@
method public final androidx.compose.runtime.State<java.lang.Float> getOffset();
method public final androidx.compose.runtime.State<java.lang.Float> getOverflow();
method public final androidx.wear.compose.material.SwipeProgress<T> getProgress();
- method public final T! getTargetValue();
+ method public final T getTargetValue();
method public final boolean isAnimationRunning();
method @androidx.wear.compose.material.ExperimentalWearMaterialApi public final suspend Object? performFling(float velocity, kotlin.coroutines.Continuation<? super kotlin.Unit>);
method @androidx.wear.compose.material.ExperimentalWearMaterialApi public final suspend Object? snapTo(T targetValue, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -716,7 +716,7 @@
property @androidx.wear.compose.material.ExperimentalWearMaterialApi public final androidx.compose.runtime.State<java.lang.Float> offset;
property @androidx.wear.compose.material.ExperimentalWearMaterialApi public final androidx.compose.runtime.State<java.lang.Float> overflow;
property @androidx.wear.compose.material.ExperimentalWearMaterialApi public final androidx.wear.compose.material.SwipeProgress<T> progress;
- property @androidx.wear.compose.material.ExperimentalWearMaterialApi public final T! targetValue;
+ property @androidx.wear.compose.material.ExperimentalWearMaterialApi public final T targetValue;
field public static final androidx.wear.compose.material.SwipeableState.Companion Companion;
}