From d1f0f42cba5c3df1e99cb377f4892dd4717af6ae Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Fri, 12 Feb 2021 15:08:12 -0800 Subject: [PATCH] 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 --- .../src/androidx/window/extensions/SampleExtensionImpl.java | 2 +- .../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 0bf6965beb5ff..5c91cf41bfc64 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 getDisplayFeatures(@NonNull Activity activity) { List 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 1094a0e2b4da9..d3700f88d97fc 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 getDisplayFeatures(@NonNull Activity activity) { List 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;