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

Merge changes from topics "cdma_eri_api", "cdma_eri_displaynumber" am: b6d1f47cf9

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

Change-Id: Id6f1b07d0251b803127b1d8f5699d55202f18918
This commit is contained in:
Sarah Chin
2020-11-19 22:55:31 +00:00
committed by Automerger Merge Worker
parent bc0ff8946f b6d1f47cf9
commit 4319ed36db
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -10108,7 +10108,7 @@ package android.telephony {
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCarrierPrivilegeStatus(int);
method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPrivilegedPackagesForAllActiveSubscriptions();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCdmaEnhancedRoamingIndicatorIconIndex();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getCdmaEnhancedRoamingIndicatorDisplayNumber();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMin();

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
View File

@@ -423,7 +423,8 @@ public class MobileSignalController extends SignalController<
return false;
}
if (isCdma()) {
return mPhone.getCdmaEnhancedRoamingIndicatorIconIndex() != TelephonyManager.ERI_OFF;
return mPhone.getCdmaEnhancedRoamingIndicatorDisplayNumber()
!= TelephonyManager.ERI_OFF;
} else {
return mServiceState != null && mServiceState.getRoaming();
}

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
View File

@@ -300,7 +300,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
}
public void setCdmaRoaming(boolean isRoaming) {
when(mMockTm.getCdmaEnhancedRoamingIndicatorIconIndex()).thenReturn(
when(mMockTm.getCdmaEnhancedRoamingIndicatorDisplayNumber()).thenReturn(
isRoaming ? TelephonyManager.ERI_ON : TelephonyManager.ERI_OFF);
}

6
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -5657,14 +5657,14 @@ public class TelephonyManager {
public static final int ERI_ICON_MODE_FLASH = 1;
/**
* Returns the CDMA ERI icon index to display. The number is assigned by
* 3GPP2 C.R1001-H v1.0 Table 8.1-1. Additionally carriers define their own ERI icon index.
* Returns the CDMA ERI icon display number. The number is assigned by
* 3GPP2 C.R1001-H v1.0 Table 8.1-1. Additionally carriers define their own ERI display numbers.
* Defined values are {@link #ERI_ON}, {@link #ERI_OFF}, and {@link #ERI_FLASH}.
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @EriIconIndex int getCdmaEnhancedRoamingIndicatorIconIndex() {
public @EriIconIndex int getCdmaEnhancedRoamingIndicatorDisplayNumber() {
return getCdmaEriIconIndex(getSubId());
}