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

am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev

Browse Source 
* commit 'ef6178a99c57b6de3dc02455e570f932b154b8e1':
  Add hasMatchedTetherApnSetting to telmgr API.
This commit is contained in:
Junda Liu
2014-12-02 18:23:49 +00:00
committed by Android Git Automerger
parent a7ee124305 ef6178a99c
commit 50e2d6c2ce
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -42,6 +42,7 @@ import android.os.Message;
import android.os.RemoteException;
import android.os.UserHandle;
import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.internal.telephony.Phone;
@@ -630,8 +631,11 @@ public class Tethering extends BaseNetworkObserver {
}
public void checkDunRequired() {
int secureSetting = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.TETHER_DUN_REQUIRED, 2);
int secureSetting = 2;
TelephonyManager tm = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
if (tm != null) {
secureSetting = tm.getTetherApnRequired();
}
synchronized (mPublicSync) {
// 2 = not set, 0 = DUN not required, 1 = DUN required
if (secureSetting != 2) {

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

@@ -3086,6 +3086,26 @@ public class TelephonyManager {
return setPreferredNetworkType(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
}
/**
* Check TETHER_DUN_REQUIRED and TETHER_DUN_APN settings, net.tethering.noprovisioning
* SystemProperty, and config_tether_apndata to decide whether DUN APN is required for
* tethering.
*
* @return 0: Not required. 1: required. 2: Not set.
* @hide
*/
public int getTetherApnRequired() {
try {
return getITelephony().getTetherApnRequired();
} catch (RemoteException ex) {
Rlog.e(TAG, "hasMatchedTetherApnSetting RemoteException", ex);
} catch (NullPointerException ex) {
Rlog.e(TAG, "hasMatchedTetherApnSetting NPE", ex);
}
return 2;
}
/**
* Values used to return status for hasCarrierPrivileges call.
*/

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

@@ -656,6 +656,15 @@ interface ITelephony {
*/
int getPreferredNetworkType();
/**
* Check TETHER_DUN_REQUIRED and TETHER_DUN_APN settings, net.tethering.noprovisioning
* SystemProperty, and config_tether_apndata to decide whether DUN APN is required for
* tethering.
*
* @return 0: Not required. 1: required. 2: Not set.
*/
int getTetherApnRequired();
/**
* Set the preferred network type.
* Used for device configuration by some CDMA operators.