Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie6f4fad470bf9dd4443a98fa3220651319613fb6
This commit is contained in:
SongFerng Wang
2021-09-10 02:48:59 +00:00
committed by Automerger Merge Worker
parent 2974556789 f30a4cd112
commit f6519efeff
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -1889,11 +1889,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
try { try {
if (!mConfigurationProvider.isDisplayInfoNrAdvancedSupported( if (!mConfigurationProvider.isDisplayInfoNrAdvancedSupported(
r.callingPackage, Binder.getCallingUserHandle())) { r.callingPackage, Binder.getCallingUserHandle())) {
telephonyDisplayInfo = r.callback.onDisplayInfoChanged(
getBackwardCompatibleTelephonyDisplayInfo( getBackwardCompatibleTelephonyDisplayInfo(
telephonyDisplayInfo); telephonyDisplayInfo));
} else {
r.callback.onDisplayInfoChanged(telephonyDisplayInfo);
} }
r.callback.onDisplayInfoChanged(telephonyDisplayInfo);
} catch (RemoteException ex) { } catch (RemoteException ex) {
mRemoveList.add(r.binder); mRemoveList.add(r.binder);
} }