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

Merge "skip permission check for TelephonyManager API getMmsUserAgent" into qt-dev

Browse Source 
am: 924c6eb536

Change-Id: Ia7a563f8e46a869c39d4aeb6baba7f79d7a6e190
This commit is contained in:
Chen Xu
2019-05-28 21:32:44 -07:00
committed by android-build-merger
parent 87d0dceecd 924c6eb536
commit fbc75e2a7f
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5356,18 +5356,30 @@ public class TelephonyManager {
* Returns the MMS user agent.
*/
public String getMmsUserAgent() {
if (mContext == null) return null;
return SubscriptionManager.getResourcesForSubId(mContext, getSubId()).getString(
com.android.internal.R.string.config_mms_user_agent);
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getMmsUserAgent(getSubId());
}
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
}
return null;
}
/**
* Returns the MMS user agent profile URL.
*/
public String getMmsUAProfUrl() {
if (mContext == null) return null;
return SubscriptionManager.getResourcesForSubId(mContext, getSubId()).getString(
com.android.internal.R.string.config_mms_user_agent_profile_url);
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getMmsUAProfUrl(getSubId());
}
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
}
return null;
}
/**

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

@@ -1986,4 +1986,14 @@ interface ITelephony {
* outgoing SmsManager operation.
*/
oneway void enqueueSmsPickResult(String callingPackage, IIntegerConsumer subIdResult);
/**
* Returns the MMS user agent.
*/
String getMmsUserAgent(int subId);
/**
* Returns the MMS user agent profile URL.
*/
String getMmsUAProfUrl(int subId);
}