Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d014bb74 authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

Merge "Remove hidden API usage in WM Extensions impl" into sc-dev

parents d74bfec9 d1f0f42c

libs/WindowManager/Jetpack/src/androidx/window/extensions/SampleExtensionImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

libs/WindowManager/Jetpack/src/androidx/window/sidecar/SampleSidecarImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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;