Merge " * Move connectivity manager test closer to source. * Add license... (e0a29d6f) · Commits · e / os / android_frameworks_base

tests/ConnectivityManagerTest/Android.mk→core/tests/ConnectivityManagerTest/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		# Copyright 2010, The Android Open Source Project
		# Copyright (C) 2010, The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.

+0 −0

File moved.

+16 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.connectivitymanagertest;

		import android.app.Activity;

+18 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.connectivitymanagertest;

		import android.os.Bundle;
		@@ -13,7 +29,7 @@ import junit.framework.TestSuite;
		*
		* To run the connectivity manager tests:
		*
		* adb shell am instrument \
		* adb shell am instrument -e ssid <ssid> \
		* -w com.android.connectivitymanagertest/.ConnectivityManagerTestRunner
		*/

		@@ -39,5 +55,5 @@ public class ConnectivityManagerTestRunner extends InstrumentationTestRunner {
		}
		}

		public String TEST_SSID = "GoogleGuest";
		public String TEST_SSID = null;
		}

+16 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.connectivitymanagertest;

		import android.net.NetworkInfo.State;