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

Commit e05dd41d authored by Huihong Luo's avatar Huihong Luo
Browse files

Remove getPrimaryPhysicalDisplayId 

SurfaceFlinger marks the first connected display as primary, which is
not really useful, and surfaceflinger should not care about this.

The display manager can decide whether a display is primary when needed.

Bug: 240703637
Test: atest libgui_test
Change-Id: Ie33fda8958da7985ceb17526f15a4ab6c6b19403
parent 95ffdae9

core/java/android/view/SurfaceControl.java

+0 −10
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ public final class SurfaceControl implements Parcelable { 
    private static native boolean nativeGetAnimationFrameStats(WindowAnimationFrameStats outStats);



    private static native long[] nativeGetPhysicalDisplayIds();

    private static native long nativeGetPrimaryPhysicalDisplayId();

    private static native IBinder nativeGetPhysicalDisplayToken(long physicalDisplayId);

    private static native IBinder nativeCreateDisplay(String name, boolean secure);

    private static native void nativeDestroyDisplay(IBinder displayToken);
@@ -2394,15 +2393,6 @@ public final class SurfaceControl implements Parcelable { 
        return nativeGetPhysicalDisplayIds();

    }



    /**

     * Exposed to identify the correct display to apply the primary display orientation. Avoid using

     * for any other purpose.

     * @hide

     */

    public static long getPrimaryPhysicalDisplayId() {

        return nativeGetPrimaryPhysicalDisplayId();

    }



    /**

     * @hide

     */

core/jni/android_view_SurfaceControl.cpp

+0 −8
Original line number Diff line number Diff line
@@ -1116,12 +1116,6 @@ static jlongArray nativeGetPhysicalDisplayIds(JNIEnv* env, jclass clazz) { 
    return array;

}



static jlong nativeGetPrimaryPhysicalDisplayId(JNIEnv* env, jclass clazz) {

    PhysicalDisplayId displayId;

    SurfaceComposerClient::getPrimaryPhysicalDisplayId(&displayId);

    return static_cast<jlong>(displayId.value);

}



static jobject nativeGetPhysicalDisplayToken(JNIEnv* env, jclass clazz, jlong physicalDisplayId) {

    const auto id = DisplayId::fromValue<PhysicalDisplayId>(physicalDisplayId);

    if (!id) return nullptr;
@@ -2210,8 +2204,6 @@ static const JNINativeMethod sSurfaceControlMethods[] = { 
            (void*)nativeSetDefaultFrameRateCompatibility},

    {"nativeGetPhysicalDisplayIds", "()[J",

            (void*)nativeGetPhysicalDisplayIds },

    {"nativeGetPrimaryPhysicalDisplayId", "()J",

            (void*)nativeGetPrimaryPhysicalDisplayId },

    {"nativeGetPhysicalDisplayToken", "(J)Landroid/os/IBinder;",

            (void*)nativeGetPhysicalDisplayToken },

    {"nativeCreateDisplay", "(Ljava/lang/String;Z)Landroid/os/IBinder;",