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

Merge "Revert "TelephonyManager System APIs process""

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-20 19:25:14 +00:00
committed by Android (Google) Code Review
parent 09275b69a5 eadd25ad0e
commit 5ab8ad86f9
3 changed files with 20 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/system-current.txt
View File

@@ -5213,10 +5213,10 @@ package android.telephony {
method public boolean handlePinMmi(java.lang.String);
method public boolean handlePinMmiForSubscriber(int, java.lang.String);
method public boolean isDataConnectivityPossible();
method public deprecated boolean isIdle();
method public deprecated boolean isOffhook();
method public deprecated boolean isRadioOn();
method public deprecated boolean isRinging();
method public boolean isIdle();
method public boolean isOffhook();
method public boolean isRadioOn();
method public boolean isRinging();
method public boolean isVideoCallingEnabled();
method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
method public boolean needsOtaServiceProvisioning();

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

@@ -1462,7 +1462,6 @@ public class TelephonyManager {
* {@hide}
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public int getCurrentPhoneType() {
return getCurrentPhoneType(getSubId());
}
@@ -1478,17 +1477,7 @@ public class TelephonyManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public int getCurrentPhoneType(int subId) {
return getCurrentPhoneType(subId, false);
}
/**
* getCurrentPhoneType() with optional check if device is voice capable.
*
* @hide
*/
public int getCurrentPhoneType(int subId, boolean checkIsVoiceCapable) {
int phoneId;
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
// if we don't have any sims, we don't have subscriptions, but we
@@ -1497,7 +1486,8 @@ public class TelephonyManager {
} else {
phoneId = SubscriptionManager.getPhoneId(subId);
}
return getCurrentPhoneTypeForSlot(phoneId, checkIsVoiceCapable);
return getCurrentPhoneTypeForSlot(phoneId);
}
/**
@@ -1505,15 +1495,11 @@ public class TelephonyManager {
*
* @hide
*/
public int getCurrentPhoneTypeForSlot(int slotIndex, boolean checkIsVoiceCapable) {
public int getCurrentPhoneTypeForSlot(int slotIndex) {
try{
ITelephony telephony = getITelephony();
if (telephony != null) {
if (checkIsVoiceCapable) {
return telephony.getVoiceCapableActivePhoneTypeForSlot(slotIndex);
} else {
return telephony.getActivePhoneTypeForSlot(slotIndex);
}
return telephony.getActivePhoneTypeForSlot(slotIndex);
} else {
// This can happen when the ITelephony interface is not up yet.
return getPhoneTypeFromProperty(slotIndex);
@@ -1539,7 +1525,10 @@ public class TelephonyManager {
* @see #PHONE_TYPE_SIP
*/
public int getPhoneType() {
return getCurrentPhoneType(getSubId(), true);
if (!isVoiceCapable()) {
return PHONE_TYPE_NONE;
}
return getCurrentPhoneType();
}
private int getPhoneTypeFromProperty() {
@@ -5879,14 +5868,12 @@ public class TelephonyManager {
/** @hide */
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public List<String> getCarrierPackageNamesForIntent(Intent intent) {
return getCarrierPackageNamesForIntentAndPhone(intent, getPhoneId());
}
/** @hide */
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public List<String> getCarrierPackageNamesForIntentAndPhone(Intent intent, int phoneId) {
try {
ITelephony telephony = getITelephony();
@@ -5996,11 +5983,7 @@ public class TelephonyManager {
}
}
/**
* @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead
* @hide
*/
@Deprecated
/** @hide */
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6017,11 +6000,7 @@ public class TelephonyManager {
return false;
}
/**
* @deprecated Use {@link android.telecom.TelecomManager#isRinging} instead
* @hide
*/
@Deprecated
/** @hide */
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6038,11 +6017,7 @@ public class TelephonyManager {
return false;
}
/**
* @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead
* @hide
*/
@Deprecated
/** @hide */
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6059,11 +6034,7 @@ public class TelephonyManager {
return true;
}
/**
* @deprecated Use {@link android.telephony.TelephonyManager#getServiceState} instead
* @hide
*/
@Deprecated
/** @hide */
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
@@ -6354,7 +6325,6 @@ public class TelephonyManager {
/** @hide */
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public boolean isDataConnectivityPossible() {
try {
ITelephony telephony = getITelephony();
@@ -6369,7 +6339,6 @@ public class TelephonyManager {
/** @hide */
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public boolean needsOtaServiceProvisioning() {
try {
ITelephony telephony = getITelephony();
@@ -6472,7 +6441,10 @@ public class TelephonyManager {
/** @hide */
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
android.Manifest.permission.READ_PHONE_STATE
})
public boolean isVideoCallingEnabled() {
try {
ITelephony telephony = getITelephony();

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

@@ -375,8 +375,6 @@ interface ITelephony {
/**
* Report whether data connectivity is possible.
*
* <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE
*/
boolean isDataConnectivityPossible(int subId);
@@ -415,24 +413,10 @@ interface ITelephony {
* Returns the current active phone type as integer for particular slot.
* Returns TelephonyManager.PHONE_TYPE_CDMA if RILConstants.CDMA_PHONE
* and TelephonyManager.PHONE_TYPE_GSM if RILConstants.GSM_PHONE
*
* <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE
*
* @param slotIndex - slot to query.
*/
int getActivePhoneTypeForSlot(int slotIndex);
/**
* Returns the current active phone type as integer for particular slot.
* Returns TelephonyManager.PHONE_TYPE_CDMA if RILConstants.CDMA_PHONE
* and TelephonyManager.PHONE_TYPE_GSM if RILConstants.GSM_PHONE
*
* If the device is not voice-capable, return PHONE_TYPE_NONE
*
* @param slotIndex - slot to query.
*/
int getVoiceCapableActivePhoneTypeForSlot(int slotIndex);
/**
* Returns the CDMA ERI icon index to display
* @param callingPackage package making the call.
@@ -480,8 +464,6 @@ interface ITelephony {
* Returns true if OTA service provisioning needs to run.
* Only relevant on some technologies, others will always
* return false.
*
* <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE
*/
boolean needsOtaServiceProvisioning();
@@ -988,8 +970,6 @@ interface ITelephony {
* Returns list of the package names of the carrier apps that should handle the input intent
* and have carrier privileges for the given phoneId.
*
* <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE
*
* @param intent Intent that will be sent.
* @param phoneId The phoneId on which the carrier app has carrier privileges.
* @return list of carrier app package names that can handle the intent on phoneId.
@@ -1114,8 +1094,6 @@ interface ITelephony {
/**
* Whether video calling has been enabled by the user.
*
* <p>Requires that the calling app has READ_PRIVILEGED_PHONE_STATE
*
* @param callingPackage The package making the call.
* @return {@code true} if the user has enabled video calling, {@code false} otherwise.
*/