summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrii Kulian <akulian@google.com> 2021-02-12 15:08:12 -0800
committer Andrii Kulian <akulian@google.com> 2021-02-12 15:08:12 -0800
commitd1f0f42cba5c3df1e99cb377f4892dd4717af6ae (patch)
treeb7eac28fb5c43564444a55233ab065bc93900a67
parent7d0e92c50945100784be756ab7b1f27ba4a9ef13 (diff)
Remove hidden API usage in WM Extensions impl
Reference implementation of WM Extensions included a hidden API call, which is prohibited when coming from non-system apps. Bug: 179968070 Test: Build, test on YT and sample apps Change-Id: Ic8b215b811a5e5d6abaacdb8ff0bf82fc3995d99
-rw-r--r--libs/WindowManager/Jetpack/src/androidx/window/extensions/SampleExtensionImpl.java2
-rw-r--r--libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java2
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;