Snap for 6465939 from b1baf041e9f963333ec1eadc37b6cc8947044127 to mainline-release (9fde5d00) · Commits · e / os / android_frameworks_base

Android.bp

+2 −41

Original line number	Diff line number	Diff line
		@@ -1121,6 +1121,7 @@ filegroup {
		"core/java/com/android/internal/os/SomeArgs.java",
		"core/java/com/android/internal/util/BitwiseInputStream.java",
		"core/java/com/android/internal/util/BitwiseOutputStream.java",
		"core/java/com/android/internal/util/FunctionalUtils.java",
		"core/java/com/android/internal/util/HexDump.java",
		"core/java/com/android/internal/util/IndentingPrintWriter.java",
		"core/java/com/android/internal/util/Preconditions.java",
		@@ -1223,43 +1224,3 @@ build = [
		"StubLibraries.bp",
		"ApiDocs.bp",
		]
		No newline at end of file

		java_library {
		name: "framework-telephony",
		srcs: [
		//":framework-telephony-sources",
		//":framework-telephony-shared-srcs",
		],
		// TODO: change to framework-system-stub to build against system APIs.
		libs: [
		"framework-minus-apex",
		"unsupportedappusage",
		],
		static_libs: [
		"libphonenumber-platform",
		"app-compat-annotations",
		],
		sdk_version: "core_platform",
		aidl: {
		export_include_dirs: ["telephony/java"],
		include_dirs: [
		"frameworks/native/aidl/binder",
		"frameworks/native/aidl/gui",
		]
		},
		jarjar_rules: ":framework-telephony-jarjar-rules",
		dxflags: [
		"--core-library",
		"--multi-dex",
		],
		// This is to break the dependency from boot jars.
		dex_preopt: {
		enabled: false,
		},
		installable: true,
		}

		filegroup {
		name: "framework-telephony-jarjar-rules",
		srcs: ["telephony/framework-telephony-jarjar-rules.txt"],
		}
		No newline at end of file

apct-tests/perftests/core/AndroidTest.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -25,9 +25,4 @@
		<option name="package" value="com.android.perftests.core" />
		<option name="hidden-api-checks" value="false"/>
		</test>

		<metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
		<option name="directory-keys" value="/data/local/CorePerfTests" />
		<option name="collect-on-run-ended-only" value="true" />
		</metrics_collector>
		</configuration>

apct-tests/perftests/windowmanager/Android.bp

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2020 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.

		android_test {
		name: "WmPerfTests",
		srcs: ["src/*/.java"],
		static_libs: [
		"androidx.test.rules",
		"androidx.annotation_annotation",
		"apct-perftests-utils",
		],
		test_suites: ["device-tests"],
		platform_apis: true,
		certificate: "platform",
		}

packages/Tethering/res/values-mcc204-mnc04-zh-rCN/strings.xml→apct-tests/perftests/windowmanager/AndroidManifest.xml

+32 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2020 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		@@ -13,13 +13,20 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.perftests.wm">

		<resources xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="no_upstream_notification_title" msgid="6246167638178412020">"热点没有网络连接"</string>
		<string name="no_upstream_notification_message" msgid="5010177541603431003">"设备无法连接到互联网"</string>
		<string name="no_upstream_notification_disable_button" msgid="2613861474440640595">"关闭热点"</string>
		<string name="upstream_roaming_notification_title" msgid="3633925855626231152">"热点已开启"</string>
		<string name="upstream_roaming_notification_message" msgid="1396837704184358258">"漫游时可能会产生额外的费用"</string>
		<string name="upstream_roaming_notification_continue_button" msgid="5324117849715705638">"继续"</string>
		</resources>
		<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />

		<application>
		<uses-library android:name="android.test.runner" />
		<activity android:name="android.perftests.utils.PerfTestActivity">
		<intent-filter>
		<action android:name="com.android.perftests.core.PERFTEST" />
		</intent-filter>
		</activity>
		</application>

		<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
		android:targetPackage="com.android.perftests.wm"/>
		</manifest>

packages/Tethering/res/values-mcc204-mnc04-uz/strings.xml→apct-tests/perftests/windowmanager/AndroidTest.xml

+33 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2020 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		@@ -13,13 +13,21 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<configuration description="Runs WmPerfTests metric instrumentation.">
		<option name="test-suite-tag" value="apct" />
		<option name="test-suite-tag" value="apct-metric-instrumentation" />
		<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
		<option name="cleanup-apks" value="true" />
		<option name="test-file-name" value="WmPerfTests.apk" />
		</target_preparer>

		<resources xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="no_upstream_notification_title" msgid="6246167638178412020">"Hotspot internetga ulanmagan"</string>
		<string name="no_upstream_notification_message" msgid="5010177541603431003">"Qurilmalar internetga ulana olmayapti"</string>
		<string name="no_upstream_notification_disable_button" msgid="2613861474440640595">"Hotspotni faolsizlantirish"</string>
		<string name="upstream_roaming_notification_title" msgid="3633925855626231152">"Hotspot yoniq"</string>
		<string name="upstream_roaming_notification_message" msgid="1396837704184358258">"Rouming vaqtida qoʻshimcha haq olinishi mumkin"</string>
		<string name="upstream_roaming_notification_continue_button" msgid="5324117849715705638">"Davom etish"</string>
		</resources>
		<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
		<option name="package" value="com.android.perftests.wm" />
		<option name="hidden-api-checks" value="false"/>
		</test>

		<metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
		<option name="directory-keys" value="/data/local/WmPerfTests" />
		<option name="collect-on-run-ended-only" value="true" />
		</metrics_collector>
		</configuration>