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

Commit 94be9659 authored by Rachel Lee's avatar Rachel Lee Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L38900000962607726:N28500001397100516"... 

Merge changes from topic "cherrypicker-L38900000962607726:N28500001397100516" into udc-qpr-dev am: 97c11a93

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



Change-Id: I494d64d867442a3d9a9d836194a5dfa130899adc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c730443 97c11a93

core/java/android/view/Choreographer.java

+3 −3
Original line number Diff line number Diff line
@@ -1207,10 +1207,10 @@ public final class Choreographer { 
                DisplayEventReceiver.VsyncEventData latestVsyncEventData =

                        displayEventReceiver.getLatestVsyncEventData();

                if (latestVsyncEventData == null) {

                    throw new IllegalArgumentException(

                            "Could not get VsyncEventData. Did SurfaceFlinger crash?");

                }

                    Log.w(TAG, "Could not get latest VsyncEventData. Did SurfaceFlinger crash?");

                } else {

                    update(frameTimeNanos, latestVsyncEventData);

                }

            } else {

                update(frameTimeNanos, newPreferredIndex);

            }