diff options
| author | 2021-02-16 16:48:29 +0000 | |
|---|---|---|
| committer | 2021-02-16 16:48:29 +0000 | |
| commit | d014bb7414fbe235f04560ce26862ff397d978e8 (patch) | |
| tree | 4e1b2f166c6babb4b4d3f39c8cc9bceed12a8f31 | |
| parent | d74bfec966def262bc2cc6f5aa550800a6b8e820 (diff) | |
| parent | d1f0f42cba5c3df1e99cb377f4892dd4717af6ae (diff) | |
Merge "Remove hidden API usage in WM Extensions impl" into sc-dev
| -rw-r--r-- | libs/WindowManager/Jetpack/src/androidx/window/extensions/SampleExtensionImpl.java | 2 | ||||
| -rw-r--r-- | libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/SampleExtensionImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/SampleExtensionImpl.java index 0bf6965beb5f..5c91cf41bfc6 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/SampleExtensionImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/SampleExtensionImpl.java @@ -72,7 +72,7 @@ class SampleExtensionImpl extends StubExtension implements private List<ExtensionDisplayFeature> getDisplayFeatures(@NonNull Activity activity) { List<ExtensionDisplayFeature> features = new ArrayList<>(); - int displayId = activity.getDisplayId(); + int displayId = activity.getDisplay().getDisplayId(); if (displayId != DEFAULT_DISPLAY) { Log.w(TAG, "This sample doesn't support display features on secondary displays"); return features; diff --git a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java index 1094a0e2b4da..d3700f88d97f 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java @@ -84,7 +84,7 @@ class SampleSidecarImpl extends StubSidecar implements private List<SidecarDisplayFeature> getDisplayFeatures(@NonNull Activity activity) { List<SidecarDisplayFeature> features = new ArrayList<SidecarDisplayFeature>(); - int displayId = activity.getDisplayId(); + int displayId = activity.getDisplay().getDisplayId(); if (displayId != DEFAULT_DISPLAY) { Log.w(TAG, "This sample doesn't support display features on secondary displays"); return features; |