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

Merge "Remove Obsolete enable/disableApn functions."

Browse Source
This commit is contained in:
Robert Greenwalt
2014-06-18 18:57:32 +00:00
committed by Android (Google) Code Review
parent 779d2cffbc e356825e4a
commit 19f01ebe90
3 changed files with 9 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/net/MobileDataStateTracker.java
View File

@@ -699,15 +699,15 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker {
break;
}
try {
if (enable) {
return mPhoneService.enableApnType(apnType);
} else {
return mPhoneService.disableApnType(apnType);
}
} catch (RemoteException e) {
if (retry == 0) getPhoneService(true);
}
// try {
// if (enable) {
// return mPhoneService.enableApnType(apnType);
// } else {
// return mPhoneService.disableApnType(apnType);
// }
// } catch (RemoteException e) {
// if (retry == 0) getPhoneService(true);
// }
}
loge("Could not " + (enable ? "enable" : "disable") + " APN type \"" + apnType + "\"");

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

@@ -3033,28 +3033,6 @@ public class TelephonyManager {
}
}
/** @hide */
@SystemApi
public int enableApnType(String type) {
try {
return getITelephony().enableApnType(type);
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#enableApnType", e);
}
return PhoneConstants.APN_REQUEST_FAILED;
}
/** @hide */
@SystemApi
public int disableApnType(String type) {
try {
return getITelephony().disableApnType(type);
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelephony#disableApnType", e);
}
return PhoneConstants.APN_REQUEST_FAILED;
}
/** @hide */
@SystemApi
public boolean enableDataConnectivity() {

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

@@ -310,27 +310,6 @@ interface ITelephony {
*/
void disableLocationUpdatesUsingSubId(long subId);
/**
* Enable a specific APN type.
*/
int enableApnType(String type);
/**
* Disable a specific APN type.
*/
int disableApnType(String type);
/**
* Enable a specific APN type with subscription.
*/
int enableApnTypeUsingSub(long subId, String type);
/**
* Disable a specific APN type with subscription.
*/
int disableApnTypeUsingSub(long subId, String type);
/**
* Allow mobile data connections.
*/