Snap for 5406228 from a4f57f0496d32af349d5c99aacaa5a0e3437a745 to qt-release (d3e2efbb) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1583,6 +1583,9 @@ static void DumpstateTelephonyOnly() {

	RunDumpsys("DUMPSYS", {"connectivity"}, CommandOptions::WithTimeout(90).Build(),		RunDumpsys("DUMPSYS", {"connectivity"}, CommandOptions::WithTimeout(90).Build(),
	SEC_TO_MSEC(10));		SEC_TO_MSEC(10));
			RunDumpsys("DUMPSYS", {"connmetrics"}, CommandOptions::WithTimeout(90).Build(),
			SEC_TO_MSEC(10));
			RunDumpsys("DUMPSYS", {"netd"}, CommandOptions::WithTimeout(90).Build(), SEC_TO_MSEC(10));
	RunDumpsys("DUMPSYS", {"carrier_config"}, CommandOptions::WithTimeout(90).Build(),		RunDumpsys("DUMPSYS", {"carrier_config"}, CommandOptions::WithTimeout(90).Build(),
	SEC_TO_MSEC(10));		SEC_TO_MSEC(10));
	RunDumpsys("DUMPSYS", {"wifi"}, CommandOptions::WithTimeout(90).Build(),		RunDumpsys("DUMPSYS", {"wifi"}, CommandOptions::WithTimeout(90).Build(),

cmds/installd/tests/Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@ cc_test {
	"libinstalld",		"libinstalld",
	"liblog",		"liblog",
	],		],
			test_config: "installd_utils_test.xml",
	}		}

	cc_test {		cc_test {
	@@ -39,6 +40,7 @@ cc_test {
	"liblog",		"liblog",
	"liblogwrap",		"liblogwrap",
	],		],
			test_config: "installd_cache_test.xml",
	}		}

	cc_test {		cc_test {
	@@ -63,6 +65,7 @@ cc_test {
	"liblog",		"liblog",
	"liblogwrap",		"liblogwrap",
	],		],
			test_config: "installd_service_test.xml",
	}		}

	cc_test {		cc_test {
	@@ -87,6 +90,7 @@ cc_test {
	"liblog",		"liblog",
	"liblogwrap",		"liblogwrap",
	],		],
			test_config: "installd_dexopt_test.xml",
	}		}

	cc_test {		cc_test {

cmds/installd/tests/installd_cache_test.xml

0 → 100644

+34 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2019 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.
			-->
			<!-- Note: this is derived from the autogenerated configuration. We require
			root support. -->
			<configuration description="Runs installd_cache_test.">
			<option name="test-suite-tag" value="apct" />
			<option name="test-suite-tag" value="apct-native" />

			<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
			<option name="cleanup" value="true" />
			<option name="push" value="installd_cache_test->/data/local/tmp/installd_cache_test" />
			</target_preparer>

			<!-- The test requires root for file access. -->
			<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

			<test class="com.android.tradefed.testtype.GTest" >
			<option name="native-test-device-path" value="/data/local/tmp" />
			<option name="module-name" value="installd_cache_test" />
			</test>
			</configuration>

cmds/installd/tests/installd_dexopt_test.cpp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -936,8 +936,7 @@ class ProfileTest : public DexoptTest {
	protected:		protected:
	void TransitionToSystemServer() {		void TransitionToSystemServer() {
	ASSERT_TRUE(DropCapabilities(kSystemUid, kSystemGid));		ASSERT_TRUE(DropCapabilities(kSystemUid, kSystemGid));
	int32_t res = selinux_android_setcontext(		int32_t res = selinux_android_setcon("u:r:system_server:s0");
	kSystemUid, true, se_info_.c_str(), "system_server");
	ASSERT_EQ(0, res) << "Failed to setcon " << strerror(errno);		ASSERT_EQ(0, res) << "Failed to setcon " << strerror(errno);
	}		}

cmds/installd/tests/installd_dexopt_test.xml

0 → 100644

+35 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2019 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.
			-->
			<!-- Note: this is derived from the autogenerated configuration. We require
			root support. -->
			<configuration description="Runs installd_dexopt_test.">
			<option name="test-suite-tag" value="apct" />
			<option name="test-suite-tag" value="apct-native" />

			<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
			<option name="cleanup" value="true" />
			<option name="push" value="installd_dexopt_test->/data/local/tmp/installd_dexopt_test" />
			</target_preparer>

			<!-- The test runs as root to prepare the temporary directory, make selinux adjustments
			and so on. -->
			<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

			<test class="com.android.tradefed.testtype.GTest" >
			<option name="native-test-device-path" value="/data/local/tmp" />
			<option name="module-name" value="installd_dexopt_test" />
			</test>
			</configuration>