joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add tests to verify app has network access in onResume." into tm-dev

Browse source
This commit is contained in:
Sudheer Shanka 2022-04-28 22:00:08 +00:00 • committed by Android (Google) Code Review
commit fdbffad274
5 changed files with 182 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View file

@ -916,7 +916,7 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
final Intent intent = new Intent();
if (type == TYPE_COMPONENT_ACTIVTIY) {
intent.setComponent(new ComponentName(TEST_APP2_PKG, TEST_APP2_ACTIVITY_CLASS))
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
} else if (type == TYPE_COMPONENT_FOREGROUND_SERVICE) {
intent.setComponent(new ComponentName(TEST_APP2_PKG, TEST_APP2_SERVICE_CLASS))
.setFlags(1);

98
tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnOnActivityStartTest.java Normal file
View file

@ -0,0 +1,98 @@
/*
* Copyright (C) 2022 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.cts.net.hostside;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.getUiDevice;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.setRestrictBackground;
import static com.android.cts.net.hostside.Property.APP_STANDBY_MODE;
import static com.android.cts.net.hostside.Property.BATTERY_SAVER_MODE;
import static com.android.cts.net.hostside.Property.DATA_SAVER_MODE;
import static com.android.cts.net.hostside.Property.DOZE_MODE;
import static com.android.cts.net.hostside.Property.METERED_NETWORK;
import static com.android.cts.net.hostside.Property.NON_METERED_NETWORK;
import android.util.Log;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@RequiredProperties({NON_METERED_NETWORK})
public class ConnOnActivityStartTest extends AbstractRestrictBackgroundNetworkTestCase {
private static final int TEST_ITERATION_COUNT = 5;
@Before
public final void setUp() throws Exception {
super.setUp();
resetDeviceState();
}
@After
public final void tearDown() throws Exception {
super.tearDown();
resetDeviceState();
}
private void resetDeviceState() throws Exception {
resetBatteryState();
setBatterySaverMode(false);
setRestrictBackground(false);
setAppIdle(false);
setDozeMode(false);
}
@Test
@RequiredProperties({BATTERY_SAVER_MODE})
public void testStartActivity_batterySaver() throws Exception {
setBatterySaverMode(true);
assertLaunchedActivityHasNetworkAccess("testStartActivity_batterySaver");
}
@Test
@RequiredProperties({DATA_SAVER_MODE, METERED_NETWORK})
public void testStartActivity_dataSaver() throws Exception {
setRestrictBackground(true);
assertLaunchedActivityHasNetworkAccess("testStartActivity_dataSaver");
}
@Test
@RequiredProperties({DOZE_MODE})
public void testStartActivity_doze() throws Exception {
setDozeMode(true);
assertLaunchedActivityHasNetworkAccess("testStartActivity_doze");
}
@Test
@RequiredProperties({APP_STANDBY_MODE})
public void testStartActivity_appStandby() throws Exception {
turnBatteryOn();
setAppIdle(true);
assertLaunchedActivityHasNetworkAccess("testStartActivity_appStandby");
}
private void assertLaunchedActivityHasNetworkAccess(String testName) throws Exception {
for (int i = 0; i < TEST_ITERATION_COUNT; ++i) {
Log.i(TAG, testName + " start #" + i);
launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY);
getUiDevice().pressHome();
assertBackgroundState();
Log.i(TAG, testName + " end #" + i);
}
}
}

5
tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkPolicyTestUtils.java
View file

@ -57,6 +57,7 @@ import android.telephony.data.ApnSetting;
import android.util.Log;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.uiautomator.UiDevice;
import com.android.compatibility.common.util.AppStandbyUtils;
import com.android.compatibility.common.util.BatteryUtils;
@ -438,6 +439,10 @@ public class NetworkPolicyTestUtils {
return InstrumentationRegistry.getInstrumentation();
}
public static UiDevice getUiDevice() {
return UiDevice.getInstance(getInstrumentation());
}
// When power saver mode or restrict background enabled or adding any white/black list into
// those modes, NetworkPolicy may need to take some time to update the rules of uids. So having
// this function and using PollingCheck to try to make sure the uid has updated and reduce the

41
tests/cts/hostside/app2/src/com/android/cts/net/hostside/app2/MyActivity.java
View file

@ -39,6 +39,33 @@ public class MyActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.d(TAG, "MyActivity.onCreate()");
}
@Override
public void finish() {
if (finishCommandReceiver != null) {
unregisterReceiver(finishCommandReceiver);
}
super.finish();
}
@Override
protected void onStart() {
super.onStart();
Log.d(TAG, "MyActivity.onStart()");
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
Log.d(TAG, "MyActivity.onNewIntent()");
setIntent(intent);
}
@Override
protected void onResume() {
super.onResume();
Log.d(TAG, "MyActivity.onResume(): " + getIntent());
Common.notifyNetworkStateObserver(this, getIntent(), TYPE_COMPONENT_ACTIVTY);
finishCommandReceiver = new BroadcastReceiver() {
@Override
@ -56,20 +83,6 @@ public class MyActivity extends Activity {
}
}
@Override
public void finish() {
if (finishCommandReceiver != null) {
unregisterReceiver(finishCommandReceiver);
}
super.finish();
}
@Override
protected void onStart() {
super.onStart();
Log.d(TAG, "MyActivity.onStart()");
}
@Override
protected void onDestroy() {
Log.d(TAG, "MyActivity.onDestroy()");

51
tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest.java Normal file
View file

@ -0,0 +1,51 @@
/*
* Copyright (C) 2022 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.cts.net;
public class HostsideConnOnActivityStartTest extends HostsideNetworkTestCase {
private static final String TEST_CLASS = TEST_PKG + ".ConnOnActivityStartTest";
@Override
public void setUp() throws Exception {
super.setUp();
uninstallPackage(TEST_APP2_PKG, false);
installPackage(TEST_APP2_APK);
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
uninstallPackage(TEST_APP2_PKG, true);
}
public void testStartActivity_batterySaver() throws Exception {
runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_batterySaver");
}
public void testStartActivity_dataSaver() throws Exception {
runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_dataSaver");
}
public void testStartActivity_doze() throws Exception {
runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_doze");
}
public void testStartActivity_appStandby() throws Exception {
runDeviceTests(TEST_PKG, TEST_CLASS, "testStartActivity_appStandby");
}
}