diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 5f6c24bff3f7d..84f04c12cf512 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -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 */ diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 22f84b6e961af..9ae16304b6c82 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -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(displayId.value); -} - static jobject nativeGetPhysicalDisplayToken(JNIEnv* env, jclass clazz, jlong physicalDisplayId) { const auto id = DisplayId::fromValue(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;",