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

Commit 662c3239 authored by Xiang Wang's avatar Xiang Wang Committed by Automerger Merge Worker
Browse files

Merge "Add getAssociatedDisplayId to ContextWrapper" into udc-dev am: c122093e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21485222



Change-Id: I1737e5e643ffde4be55528220adde16afd03ff27
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7813f60 c122093e

core/java/android/content/ContextWrapper.java

+8 −0
Original line number Diff line number Diff line
@@ -1205,6 +1205,14 @@ public class ContextWrapper extends Context { 
        return mBase.getDisplayId();

    }



    /**

     * @hide

     */

    @Override

    public int getAssociatedDisplayId() {

        return mBase.getAssociatedDisplayId();

    }



    /**

     * @hide

     */