Merge ab/12162526 into stage-aosp-rvc-ts-dev (8162b6e0) · Commits · e / os / android_frameworks_base

Android.bp

+10 −11

Original line number	Diff line number	Diff line
		@@ -264,6 +264,7 @@ filegroup {
		":libcamera_client_aidl",
		":libcamera_client_framework_aidl",
		":libupdate_engine_aidl",
		":resourcemanager_aidl",
		":storaged_aidl",
		":vold_aidl",

		@@ -292,13 +293,13 @@ filegroup {
		java_library {
		name: "framework-updatable-stubs-module_libs_api",
		static_libs: [
		"framework-media-stubs-module_libs_api",
		"framework-mediaprovider-stubs-module_libs_api",
		"framework-permission-stubs-module_libs_api",
		"framework-sdkextensions-stubs-module_libs_api",
		"framework-statsd-stubs-module_libs_api",
		"framework-tethering-stubs-module_libs_api",
		"framework-wifi-stubs-module_libs_api",
		"framework-media.stubs.module_lib",
		"framework-mediaprovider.stubs.module_lib",
		"framework-permission.stubs.module_lib",
		"framework-sdkextensions.stubs.module_lib",
		"framework-statsd.stubs.module_lib",
		"framework-tethering.stubs.module_lib",
		"framework-wifi.stubs.module_lib",
		],
		sdk_version: "module_current",
		visibility: [":__pkg__"],
		@@ -533,6 +534,8 @@ java_library {
		static_libs: [
		"exoplayer2-extractor",
		"android.hardware.wifi-V1.0-java-constants",
		// Additional dependencies needed to build the ike API classes.
		"ike-internals",
		],
		apex_available: ["//apex_available:platform"],
		visibility: [
		@@ -700,7 +703,6 @@ filegroup {
		"core/java/com/android/internal/util/TrafficStatsConstants.java",
		"core/java/com/android/internal/util/WakeupMessage.java",
		"core/java/com/android/internal/util/TokenBucket.java",
		"core/java/android/net/shared/*.java",
		],
		}

		@@ -708,7 +710,6 @@ filegroup {
		name: "framework-services-net-module-wifi-shared-srcs",
		srcs: [
		"core/java/android/net/DhcpResults.java",
		"core/java/android/net/shared/InetAddressUtils.java",
		"core/java/android/net/util/IpUtils.java",
		"core/java/android/util/LocalLog.java",
		],
		@@ -725,7 +726,6 @@ filegroup {
		"core/java/com/android/internal/util/State.java",
		"core/java/com/android/internal/util/StateMachine.java",
		"core/java/com/android/internal/util/TrafficStatsConstants.java",
		"core/java/android/net/shared/Inet4AddressUtils.java",
		],
		}

		@@ -1162,7 +1162,6 @@ java_library {
		srcs: [
		"core/java/android/content/pm/BaseParceledListSlice.java",
		"core/java/android/content/pm/ParceledListSlice.java",
		"core/java/android/net/shared/Inet4AddressUtils.java",
		"core/java/android/os/HandlerExecutor.java",
		"core/java/com/android/internal/util/AsyncChannel.java",
		"core/java/com/android/internal/util/AsyncService.java",

StubLibraries.bp

+14 −14

Original line number	Diff line number	Diff line
		@@ -329,13 +329,13 @@ java_library_static {
		srcs: [ ":api-stubs-docs-non-updatable" ],
		static_libs: [
		"conscrypt.module.public.api.stubs",
		"framework-media-stubs-publicapi",
		"framework-mediaprovider-stubs-publicapi",
		"framework-permission-stubs-publicapi",
		"framework-sdkextensions-stubs-publicapi",
		"framework-statsd-stubs-publicapi",
		"framework-tethering-stubs-publicapi",
		"framework-wifi-stubs-publicapi",
		"framework-media.stubs",
		"framework-mediaprovider.stubs",
		"framework-permission.stubs",
		"framework-sdkextensions.stubs",
		"framework-statsd.stubs",
		"framework-tethering.stubs",
		"framework-wifi.stubs",
		"private-stub-annotations-jar",
		],
		defaults: ["android_defaults_stubs_current"],
		@@ -359,13 +359,13 @@ java_library_static {
		srcs: [ ":system-api-stubs-docs-non-updatable" ],
		static_libs: [
		"conscrypt.module.public.api.stubs",
		"framework-media-stubs-systemapi",
		"framework-mediaprovider-stubs-systemapi",
		"framework-permission-stubs-systemapi",
		"framework-sdkextensions-stubs-systemapi",
		"framework-statsd-stubs-systemapi",
		"framework-tethering-stubs-systemapi",
		"framework-wifi-stubs-systemapi",
		"framework-media.stubs.system",
		"framework-mediaprovider.stubs.system",
		"framework-permission.stubs.system",
		"framework-sdkextensions.stubs.system",
		"framework-statsd.stubs.system",
		"framework-tethering.stubs.system",
		"framework-wifi.stubs.system",
		"private-stub-annotations-jar",
		],
		defaults: ["android_defaults_stubs_current"],

apct-tests/perftests/multiuser/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ android_test {
		srcs: ["src/*/.java"],
		static_libs: [
		"androidx.test.rules",
		"collector-device-lib-platform",
		"apct-perftests-utils",
		],
		platform_apis: true,

apct-tests/perftests/multiuser/AndroidManifest.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -17,12 +17,16 @@
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.perftests.multiuser">

		<uses-sdk android:targetSdkVersion="28" />

		<uses-permission android:name="android.permission.CONTROL_KEYGUARD" />
		<uses-permission android:name="android.permission.MANAGE_USERS" />
		<uses-permission android:name="android.permission.INSTALL_PACKAGES" />
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
		<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
		<uses-permission android:name="android.permission.REAL_GET_TASKS" />

		<application>
		<uses-library android:name="android.test.runner" />

apct-tests/perftests/windowmanager/src/android/wm/RecentsAnimationPerfTest.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat
		import static org.hamcrest.core.AnyOf.anyOf;
		import static org.hamcrest.core.Is.is;

		import android.app.ActivityManager;
		import android.app.ActivityManager.TaskSnapshot;
		import android.app.ActivityTaskManager;
		import android.app.IActivityTaskManager;
		@@ -121,6 +122,12 @@ public class RecentsAnimationPerfTest extends WindowManagerPerfTestBase {
		@AfterClass
		public static void tearDownClass() {
		sSetUpClassException = null;
		try {
		// Recents activity may stop app switches. Restore the state to avoid affecting
		// the next test.
		ActivityManager.resumeAppSwitches();
		} catch (RemoteException ignored) {
		}
		sUiAutomation.dropShellPermissionIdentity();
		}