Merge "Update window-extensions aar." into sc-v2-dev am: dcbaaffe41

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15959741

Change-Id: I445ff9576077249ce4525128863e00b5618984cb

libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java

@@ -39,11 +39,12 @@ public class WindowExtensionsImpl implements WindowExtensions {
         return 1;
     }
 
-    @Override
+    /**
-    public boolean isWindowLayoutComponentAvailable() {
+     * Returns a reference implementation of {@link WindowLayoutComponent} if available,
-        return true;
+     * {@code null} otherwise. The implementation must match the API level reported in
-    }
+     * {@link WindowExtensions#getWindowLayoutComponent()}.
-
+     * @return {@link WindowLayoutComponent} OEM implementation
+     */
     @Override
     public WindowLayoutComponent getWindowLayoutComponent() {
         if (mWindowLayoutComponent == null) {
@@ -58,24 +59,10 @@ public class WindowExtensionsImpl implements WindowExtensions {
     }
 
     /**
-     * Returns {@code true} if {@link ActivityEmbeddingComponent} is present on the device,
+     * Returns a reference implementation of {@link ActivityEmbeddingComponent} if available,
-     * {@code false} otherwise. If the component is not available the developer will receive a
+     * {@code null} otherwise. The implementation must match the API level reported in
-     * single callback with empty data or default values where possible.
+     * {@link WindowExtensions#getWindowLayoutComponent()}.
-     */
+     * @return {@link ActivityEmbeddingComponent} OEM implementation.
-    @Override
-    public boolean isEmbeddingComponentAvailable() {
-        return true;
-    }
-
-    /**
-     * Returns the OEM implementation of {@link ActivityEmbeddingComponent} if it is supported on
-     * the device. The implementation must match the API level reported in
-     * {@link androidx.window.extensions.WindowExtensions}. An
-     * {@link UnsupportedOperationException} will be thrown if the device does not support
-     * Activity Embedding. Use
-     * {@link WindowExtensions#isEmbeddingComponentAvailable()} to determine if
-     * {@link ActivityEmbeddingComponent} is present.
-     * @return the OEM implementation of {@link ActivityEmbeddingComponent}
      */
     @NonNull
     public ActivityEmbeddingComponent getActivityEmbeddingComponent() {