commit 797a9a9a5f3e39be15d6fedd214049f7054ad173
author Anvesh Renikindi <renikindi@google.com> Fri Feb 10 08:27:31 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 10 08:27:31 2023 +0000
tree 28847898ae5ad3e3092730154169f18425f2f765
parent 752ed842470fb0bd4c82c1023f0926be76c10bc5
parent fcf9938ec768be7b65d2a1baf76d4fcf1b6a2fca

Merge "Update ActivityEmbedding Usage" into tm-qpr-dev-plus-aosp

packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java

diff --git a/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java b/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java
index 2db0a8f..33fc37e 100644
--- a/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java
+++ b/packages/SettingsLib/ActivityEmbedding/src/com/android/settingslib/activityembedding/ActivityEmbeddingUtils.java
@@ -25,7 +25,7 @@
 import android.util.Log;
 
 import androidx.core.os.BuildCompat;
-import androidx.window.embedding.SplitController;
+import androidx.window.embedding.ActivityEmbeddingController;
 
 import com.android.settingslib.utils.BuildCompatUtils;
 
@@ -86,7 +86,7 @@
      * @param activity Activity that needs the check
      */
     public static boolean isActivityEmbedded(Activity activity) {
-        return SplitController.getInstance().isActivityEmbedded(activity);
+        return ActivityEmbeddingController.getInstance(activity).isActivityEmbedded(activity);
     }
 
     /**