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

Merge "Remove hidden setRadioIndicationUpdateMode in TelephonyManager" am: 7aae076657

Browse Source 
Change-Id: Iec2b6cf55ace8cfed766447479f05c9c33afec5d
This commit is contained in:
Automerger Merge Worker
2020-03-10 23:29:16 +00:00
parent b3720cd31c 7aae076657
commit bff28a86b4
2 changed files with 0 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11166,14 +11166,6 @@ public class TelephonyManager {
*/
public static final int INDICATION_UPDATE_MODE_IGNORE_SCREEN_OFF = 2;
/** @hide */
@IntDef(prefix = { "INDICATION_UPDATE_MODE_" }, value = {
INDICATION_UPDATE_MODE_NORMAL,
INDICATION_UPDATE_MODE_IGNORE_SCREEN_OFF
})
@Retention(RetentionPolicy.SOURCE)
public @interface IndicationUpdateMode{}
/**
* The indication for signal strength update.
* @hide
@@ -11204,51 +11196,6 @@ public class TelephonyManager {
*/
public static final int INDICATION_FILTER_PHYSICAL_CHANNEL_CONFIG = 0x10;
/** @hide */
@IntDef(flag = true, prefix = { "INDICATION_FILTER_" }, value = {
INDICATION_FILTER_SIGNAL_STRENGTH,
INDICATION_FILTER_FULL_NETWORK_STATE,
INDICATION_FILTER_DATA_CALL_DORMANCY_CHANGED,
INDICATION_FILTER_LINK_CAPACITY_ESTIMATE,
INDICATION_FILTER_PHYSICAL_CHANNEL_CONFIG
})
@Retention(RetentionPolicy.SOURCE)
public @interface IndicationFilters{}
/**
* Sets radio indication update mode. This can be used to control the behavior of indication
* update from modem to Android frameworks. For example, by default several indication updates
* are turned off when screen is off, but in some special cases (e.g. carkit is connected but
* screen is off) we want to turn on those indications even when the screen is off.
*
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
*
* @param filters Indication filters. Should be a bitmask of INDICATION_FILTER_XXX.
* @see #INDICATION_FILTER_SIGNAL_STRENGTH
* @see #INDICATION_FILTER_FULL_NETWORK_STATE
* @see #INDICATION_FILTER_DATA_CALL_DORMANCY_CHANGED
* @param updateMode The voice activation state
* @see #INDICATION_UPDATE_MODE_NORMAL
* @see #INDICATION_UPDATE_MODE_IGNORE_SCREEN_OFF
* @hide
*/
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void setRadioIndicationUpdateMode(@IndicationFilters int filters,
@IndicationUpdateMode int updateMode) {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
telephony.setRadioIndicationUpdateMode(getSubId(), filters, updateMode);
}
} catch (RemoteException ex) {
// This could happen if binder process crashes.
if (!isSystemProcess()) {
ex.rethrowAsRuntimeException();
}
}
}
/**
* A test API to override carrier information including mccmnc, imsi, iccid, gid1, gid2,
* plmn and spn. This would be handy for, eg, forcing a particular carrier id, carrier's config

8
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -1815,14 +1815,6 @@ interface ITelephony {
*/
boolean switchSlots(in int[] physicalSlots);
/**
* Sets radio indication update mode. This can be used to control the behavior of indication
* update from modem to Android frameworks. For example, by default several indication updates
* are turned off when screen is off, but in some special cases (e.g. carkit is connected but
* screen is off) we want to turn on those indications even when the screen is off.
*/
void setRadioIndicationUpdateMode(int subId, int filters, int mode);
/**
* Returns whether mobile data roaming is enabled on the subscription with id {@code subId}.
*