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

Migrate to using Mockito directly.

Browse Source 
Change-Id: I1fcc5d1a780f5831bd6685f0735d4c0c6d245735
This commit is contained in:
Jeff Sharkey
2013-01-31 17:22:26 -08:00
parent 7209c0bb2f
commit 760c62064b
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/ConnectivityService.java
View File

@@ -16,7 +16,6 @@
package com.android.server; package com.android.server;
import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
import static android.Manifest.permission.MANAGE_NETWORK_POLICY; import static android.Manifest.permission.MANAGE_NETWORK_POLICY;
import static android.Manifest.permission.RECEIVE_DATA_ACTIVITY_CHANGE; import static android.Manifest.permission.RECEIVE_DATA_ACTIVITY_CHANGE;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION; import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
@@ -32,7 +31,6 @@ import static android.net.ConnectivityManager.isNetworkTypeValid;
import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL; import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
import static android.net.NetworkPolicyManager.RULE_REJECT_METERED; import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
import android.app.Activity;
import android.bluetooth.BluetoothTetheringDataTracker; import android.bluetooth.BluetoothTetheringDataTracker;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -88,7 +86,6 @@ import android.provider.Settings;
import android.security.Credentials; import android.security.Credentials;
import android.security.KeyStore; import android.security.KeyStore;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.EventLog;
import android.util.Slog; import android.util.Slog;
import android.util.SparseIntArray; import android.util.SparseIntArray;
@@ -3336,7 +3333,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
@Override @Override
public boolean updateLockdownVpn() { public boolean updateLockdownVpn() {
enforceSystemUid(); if (Binder.getCallingUid() != Process.SYSTEM_UID) {
Slog.w(TAG, "Lockdown VPN only available to AID_SYSTEM");
return false;
}
// Tear down existing lockdown if profile was removed // Tear down existing lockdown if profile was removed
mLockdownEnabled = LockdownVpnTracker.isEnabled(); mLockdownEnabled = LockdownVpnTracker.isEnabled();
@@ -3387,11 +3387,4 @@ public class ConnectivityService extends IConnectivityManager.Stub {
throw new IllegalStateException("Unavailable in lockdown mode"); throw new IllegalStateException("Unavailable in lockdown mode");
} }
} }
private static void enforceSystemUid() {
final int uid = Binder.getCallingUid();
if (uid != Process.SYSTEM_UID) {
throw new SecurityException("Only available to AID_SYSTEM");
}
}
} }

23
services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
View File

@@ -21,16 +21,15 @@ import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.getNetworkTypeName; import static android.net.ConnectivityManager.getNetworkTypeName;
import static android.net.NetworkStateTracker.EVENT_STATE_CHANGED; import static android.net.NetworkStateTracker.EVENT_STATE_CHANGED;
import static com.google.testing.littlemock.LittleMock.anyInt; import static org.mockito.Matchers.anyInt;
import static com.google.testing.littlemock.LittleMock.createCaptor; import static org.mockito.Matchers.eq;
import static com.google.testing.littlemock.LittleMock.doNothing; import static org.mockito.Matchers.isA;
import static com.google.testing.littlemock.LittleMock.doReturn; import static org.mockito.Mockito.doNothing;
import static com.google.testing.littlemock.LittleMock.doThrow; import static org.mockito.Mockito.doReturn;
import static com.google.testing.littlemock.LittleMock.eq; import static org.mockito.Mockito.doThrow;
import static com.google.testing.littlemock.LittleMock.isA; import static org.mockito.Mockito.mock;
import static com.google.testing.littlemock.LittleMock.mock; import static org.mockito.Mockito.reset;
import static com.google.testing.littlemock.LittleMock.reset; import static org.mockito.Mockito.verify;
import static com.google.testing.littlemock.LittleMock.verify;
import android.content.Context; import android.content.Context;
import android.net.INetworkPolicyManager; import android.net.INetworkPolicyManager;
@@ -48,7 +47,7 @@ import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log; import android.util.Log;
import android.util.LogPrinter; import android.util.LogPrinter;
import com.google.testing.littlemock.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.concurrent.Future; import java.util.concurrent.Future;
@@ -128,7 +127,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
doReturn(mWifi.tracker) doReturn(mWifi.tracker)
.when(mNetFactory).createTracker(eq(TYPE_WIFI), isA(NetworkConfig.class)); .when(mNetFactory).createTracker(eq(TYPE_WIFI), isA(NetworkConfig.class));
final ArgumentCaptor<Handler> trackerHandler = createCaptor(); final ArgumentCaptor<Handler> trackerHandler = ArgumentCaptor.forClass(Handler.class);
doNothing().when(mMobile.tracker) doNothing().when(mMobile.tracker)
.startMonitoring(isA(Context.class), trackerHandler.capture()); .startMonitoring(isA(Context.class), trackerHandler.capture());