diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-07-31 05:24:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 05:24:49 +0000 |
| commit | c70348c194a26176ac54720fe4eabeeb7e4d9993 (patch) | |
| tree | 0c8cb2901746ae572440b956d1e646f3d57cdff4 /services/tests | |
| parent | b880a036b12c8a8613fbd7fb41328ca93146bf85 (diff) | |
| parent | 496a9d269b0778ffa1965f3b11d768fe70fd7719 (diff) | |
| download | frameworks_base-c70348c194a26176ac54720fe4eabeeb7e4d9993.zip frameworks_base-c70348c194a26176ac54720fe4eabeeb7e4d9993.tar.gz frameworks_base-c70348c194a26176ac54720fe4eabeeb7e4d9993.tar.bz2 | |
am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
* commit '496a9d269b0778ffa1965f3b11d768fe70fd7719':
Stop supporting legacy ConnectivityManager routing methods in M.
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java index 3618e1a..19d29f3 100644 --- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java @@ -463,7 +463,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { mService = new WrappedConnectivityService( mServiceContext, mNetManager, mStatsService, mPolicyService); mService.systemReady(); - mCm = new ConnectivityManager(mService); + mCm = new ConnectivityManager(getContext(), mService); } private int transportToLegacyType(int transport) { |