diff options
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 21 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 10 |
4 files changed, 23 insertions, 11 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index c0cd6386aec2..03be333d6e20 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -3294,6 +3294,7 @@ package android.view { public interface WindowManager extends android.view.ViewManager { method public default int getDisplayImePolicy(int); + method public static boolean hasWindowExtensionsEnabled(); method public default void holdLock(android.os.IBinder, int); method public default boolean isGlobalKey(int); method public default boolean isTaskSnapshotSupported(); diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 725eb511737b..e7cefd60002b 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -108,6 +108,7 @@ import android.os.Bundle; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; +import android.os.SystemProperties; import android.text.TextUtils; import android.util.Log; import android.util.proto.ProtoOutputStream; @@ -1105,6 +1106,26 @@ public interface WindowManager extends ViewManager { public static final String PARCEL_KEY_SHORTCUTS_ARRAY = "shortcuts_array"; /** + * Whether the device supports the WindowManager Extensions. + * OEMs can enable this by having their device config to inherit window_extensions.mk, such as: + * <pre> + * $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + * </pre> + * @hide + */ + boolean WINDOW_EXTENSIONS_ENABLED = + SystemProperties.getBoolean("persist.wm.extensions.enabled", false); + + /** + * @see #WINDOW_EXTENSIONS_ENABLED + * @hide + */ + @TestApi + static boolean hasWindowExtensionsEnabled() { + return WINDOW_EXTENSIONS_ENABLED; + } + + /** * Application-level * {@link android.content.pm.PackageManager.Property PackageManager.Property} * tag that specifies whether OEMs are permitted to provide activity diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 3545747a67e3..89b796836617 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2159,7 +2159,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A boolean appActivityEmbeddingEnabled = false; try { - appActivityEmbeddingEnabled = WindowManagerService.sWindowExtensionsEnabled + appActivityEmbeddingEnabled = WindowManager.hasWindowExtensionsEnabled() && mAtmService.mContext.getPackageManager() .getProperty(PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED, packageName) .getBoolean(); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index d5bf9f9a516c..c30aef43585d 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -442,16 +442,6 @@ public class WindowManagerService extends IWindowManager.Stub static final boolean ENABLE_FIXED_ROTATION_TRANSFORM = SystemProperties.getBoolean("persist.wm.fixed_rotation_transform", true); - /** - * Whether the device supports the WindowManager Extensions. - * OEMs can enable this by having their device config to inherit window_extensions.mk, such as: - * <pre> - * $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - * </pre> - */ - static final boolean sWindowExtensionsEnabled = - SystemProperties.getBoolean("persist.wm.extensions.enabled", false); - // Enums for animation scale update types. @Retention(RetentionPolicy.SOURCE) @IntDef({WINDOW_ANIMATION_SCALE, TRANSITION_ANIMATION_SCALE, ANIMATION_DURATION_SCALE}) |