diff options
| author | SongFerngWang <songferngwang@google.com> | 2021-09-09 01:29:41 +0800 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-20 22:30:56 +0000 |
| commit | da859a99e875e2154967b9230d80525ecbc0d77b (patch) | |
| tree | 25e453ec50247f5a04df98d2bc81277432969bde | |
| parent | 90a90b2bdca10c9c758e8da2b031858fa8f71164 (diff) | |
| download | base-da859a99e875e2154967b9230d80525ecbc0d77b.tar.gz | |
The telephonyDisplayInfo is wrong after doing compatibility.
If one of the callers is do compatibility, then other caller get wrong
telephonyDisplayInfo.
Bug: 197521539
Test: Manually test at local and test the compatibility part and verify
the 5G+ icon.
Test: atest com.android.internal.telephony.TelephonyRegistryTest
Change-Id: Ic938f7623c802d04edc67678391cadc80c7dd084
(cherry picked from commit 5e9cca3afd5f925e84941b7ebdd110ea8141835e)
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index edf832f0fc22..b4413a4447b7 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1889,11 +1889,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 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); } |