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

Merge "VpnDialogs: use IConnectivityManager instead or ConnectivityManager."

Browse Source
This commit is contained in:
Chia-chi Yeh
2011-06-15 17:07:09 -07:00
committed by Android (Google) Code Review
parent 7ff1c2aefd f530da67b4
commit b2eeb05889
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java
View File

@@ -23,7 +23,8 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.IConnectivityManager;
import android.os.ServiceManager;
import android.util.Log;
import android.view.View;
import android.widget.Button;
@@ -37,7 +38,7 @@ public class ConfirmDialog extends Activity implements CompoundButton.OnCheckedC
private String mPackageName;
private ConnectivityManager mService;
private IConnectivityManager mService;
private AlertDialog mDialog;
private Button mButton;
@@ -47,7 +48,9 @@ public class ConfirmDialog extends Activity implements CompoundButton.OnCheckedC
super.onResume();
try {
mPackageName = getCallingPackage();
mService = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
mService = IConnectivityManager.Stub.asInterface(
ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
if (mPackageName.equals(mService.prepareVpn(null))) {
setResult(RESULT_OK);

8
packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java
View File

@@ -23,9 +23,10 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.IConnectivityManager;
import android.os.Handler;
import android.os.Message;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.util.Log;
import android.view.View;
@@ -45,7 +46,7 @@ public class ManageDialog extends Activity implements
private String mInterfaceName;
private long mStartTime;
private ConnectivityManager mService;
private IConnectivityManager mService;
private AlertDialog mDialog;
private TextView mDuration;
@@ -64,7 +65,8 @@ public class ManageDialog extends Activity implements
mInterfaceName = intent.getStringExtra("interfaceName");
mStartTime = intent.getLongExtra("startTime", 0);
mService = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
mService = IConnectivityManager.Stub.asInterface(
ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
PackageManager pm = getPackageManager();
ApplicationInfo app = pm.getApplicationInfo(mPackageName, 0);