OSDN Git Service

Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf
authorXiangyu/Malcolm Chen <refuhoo@google.com>
Tue, 29 Oct 2019 23:15:58 +0000 (16:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Oct 2019 23:15:58 +0000 (16:15 -0700)
am: dd9d9fde68

Change-Id: I48303451f2ad1eeab2513ac5994de2b97649d82b

1  2 
packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java
telephony/java/android/telephony/SubscriptionManager.java
telephony/java/android/telephony/TelephonyManager.java