ecfb37b868af559397a462054a98929cc2159290 - platform_frameworks_base

commit	ecfb37b868af559397a462054a98929cc2159290	[log] [tgz]
author	Jack Yu <jackyu@google.com>	Wed Mar 18 14:53:32 2020 -0700
committer	Jack Yu <jackyu@google.com>	Mon Apr 20 09:22:33 2020 -0700
tree	e41ac09ae40becd9eedad830cb78cf1b73f075bf
parent	3bb2dcf6070a5cf84bc1bc9460ec773a491c4aa3 [diff]

Renamed DisplayInfo to TelephonyDisplayInfo

To reduce ambiguity with android.view.DisplayInfo.

Test: Telephony sanity tests + unit tests
Bug: 151101989
Merged-In: Ic507b6bf082ca5510ff6d1dcde501f5be9ef074f
Change-Id: Ic507b6bf082ca5510ff6d1dcde501f5be9ef074f
(cherry picked from commit ac3ca3356722b9352ed845dbeabbbc6a800dc22f)

api/current.txt[diff]
core/java/android/telephony/PhoneStateListener.java[diff]
core/java/android/telephony/TelephonyRegistryManager.java[diff]
core/java/com/android/internal/telephony/IPhoneStateListener.aidl[diff]
core/java/com/android/internal/telephony/ITelephonyRegistry.aidl[diff]
packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java[diff]
services/core/java/com/android/server/TelephonyRegistry.java[diff]
telephony/java/android/telephony/Annotation.java[diff]
telephony/java/android/telephony/TelephonyDisplayInfo.aidl[Renamed from telephony/java/android/telephony/DisplayInfo.aidl - diff]
telephony/java/android/telephony/TelephonyDisplayInfo.java[Renamed from telephony/java/android/telephony/DisplayInfo.java - diff]

12 files changed