LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '3463b3ff' into fix-merge-conflict

Browse Source 
* commit '3463b3ff':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
This commit is contained in:
Wink Saville
2013-07-01 16:12:31 -07:00
parent d78d557cb8 3463b3ff48
commit 0cc0a44c2f
3 changed files with 575 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
core/java/android/net/ConnectivityManager.java
View File

@@ -25,6 +25,7 @@ import android.os.Binder;
import android.os.Build.VERSION_CODES;
import android.os.Messenger;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.provider.Settings;
import java.net.InetAddress;
@@ -1309,4 +1310,67 @@ public class ConnectivityManager {
} catch (RemoteException e) {
}
}
/**
* The ResultReceiver resultCode for checkMobileProvisioning (CMP_RESULT_CODE)
*/
/**
* No connection was possible to the network.
* {@hide}
*/
public static final int CMP_RESULT_CODE_NO_CONNECTION = 0;
/**
* A connection was made to the internet, all is well.
* {@hide}
*/
public static final int CMP_RESULT_CODE_CONNECTABLE = 1;
/**
* A connection was made but there was a redirection, we appear to be in walled garden.
* This is an indication of a warm sim on a mobile network.
* {@hide}
*/
public static final int CMP_RESULT_CODE_REDIRECTED = 2;
/**
* A connection was made but no dns server was available to resolve a name to address.
* This is an indication of a warm sim on a mobile network.
*
* {@hide}
*/
public static final int CMP_RESULT_CODE_NO_DNS = 3;
/**
* A connection was made but could not open a TCP connection.
* This is an indication of a warm sim on a mobile network.
* {@hide}
*/
public static final int CMP_RESULT_CODE_NO_TCP_CONNECTION = 4;
/**
* Check mobile provisioning. The resultCode passed to
* onReceiveResult will be one of the CMP_RESULT_CODE_xxxx values above.
* This may take a minute or more to complete.
*
* @param sendNotificaiton, when true a notification will be sent to user.
* @param suggestedTimeOutMs, timeout in milliseconds
* @param resultReceiver needs to be supplied to receive the result
*
* @return time out that will be used, maybe less that suggestedTimeOutMs
* -1 if an error.
*
* {@hide}
*/
public int checkMobileProvisioning(boolean sendNotification, int suggestedTimeOutMs,
ResultReceiver resultReceiver) {
int timeOutMs = -1;
try {
timeOutMs = mService.checkMobileProvisioning(sendNotification, suggestedTimeOutMs,
resultReceiver);
} catch (RemoteException e) {
}
return timeOutMs;
}
}

3
core/java/android/net/IConnectivityManager.aidl
View File

@@ -24,6 +24,7 @@ import android.net.ProxyProperties;
import android.os.IBinder;
import android.os.Messenger;
import android.os.ParcelFileDescriptor;
import android.os.ResultReceiver;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
@@ -131,4 +132,6 @@ interface IConnectivityManager
void supplyMessenger(int networkType, in Messenger messenger);
int findConnectionTypeForIface(in String iface);
int checkMobileProvisioning(boolean sendNotification, int suggestedTimeOutMs, in ResultReceiver resultReceiver);
}