Merge "Disable WM Extensions on Watch" into main
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 0d2aae0..75c063d 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -104,6 +104,7 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.PixelFormat;
@@ -1490,7 +1491,13 @@
}
try {
- return ActivityTaskManager.supportsMultiWindow(ActivityThread.currentApplication());
+ final Context context = ActivityThread.currentApplication();
+ if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+ // Watch supports multi-window to present essential system UI, but it doesn't need
+ // WM Extensions.
+ return false;
+ }
+ return ActivityTaskManager.supportsMultiWindow(context);
} catch (Exception e) {
// In case the PackageManager is not set up correctly in test.
Log.e("WindowManager", "Unable to read if the device supports multi window", e);