commit f30a4cd11287ceaa9cb83cdf9c828e7229215f6c
author SongFerng Wang <songferngwang@google.com> Fri Sep 10 02:32:11 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 10 02:32:11 2021 +0000
tree 1529948967518273c8f934a46c895b8aa7a70ded
parent f632b44030324a277f69f4fafe13f5866c5fc8bb
parent 5e9cca3afd5f925e84941b7ebdd110ea8141835e

Merge "The telephonyDisplayInfo is wrong after doing compatibility." into sc-dev

services/core/java/com/android/server/TelephonyRegistry.java

diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index edf832f..b4413a4 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -1889,11 +1889,12 @@
                         try {
                             if (!mConfigurationProvider.isDisplayInfoNrAdvancedSupported(
                                     r.callingPackage, Binder.getCallingUserHandle())) {
-                                telephonyDisplayInfo =
+                                r.callback.onDisplayInfoChanged(
                                         getBackwardCompatibleTelephonyDisplayInfo(
-                                                telephonyDisplayInfo);
+                                                telephonyDisplayInfo));
+                            } else {
+                                r.callback.onDisplayInfoChanged(telephonyDisplayInfo);
                             }
-                            r.callback.onDisplayInfoChanged(telephonyDisplayInfo);
                         } catch (RemoteException ex) {
                             mRemoveList.add(r.binder);
                         }