Snap for 11704135 from 6f9738e9e434710bc8b98f6bc3cf058c0b70f596 to 24Q3-release (b941a9e7) · Commits · e / os / android_frameworks_base

apct-tests/perftests/inputmethod/AndroidManifest.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		<application>
		<uses-library android:name="android.test.runner" />
		<activity android:name="android.perftests.utils.PerfTestActivity"
		android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
		android:exported="true">
		<intent-filter>
		<action android:name="com.android.perftests.core.PERFTEST" />

apct-tests/perftests/utils/src/android/perftests/utils/PerfTestActivity.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -19,7 +19,9 @@ package android.perftests.utils;
		import android.app.Activity;
		import android.content.Context;
		import android.content.Intent;
		import android.graphics.Insets;
		import android.os.Bundle;
		import android.view.WindowInsets;
		import android.view.WindowManager;
		import android.widget.EditText;
		import android.widget.LinearLayout;
		@@ -42,6 +44,11 @@ public class PerfTestActivity extends Activity {
		if (getIntent().getBooleanExtra(INTENT_EXTRA_ADD_EDIT_TEXT, false)) {
		final LinearLayout layout = new LinearLayout(this);
		layout.setOrientation(LinearLayout.VERTICAL);
		layout.setOnApplyWindowInsetsListener((v, w) -> {
		final Insets insets = w.getSystemWindowInsets();
		v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
		return WindowInsets.CONSUMED;
		});

		final EditText editText = new EditText(this);
		editText.setId(ID_EDITOR);

apex/jobscheduler/service/aconfig/device_idle.aconfig

+10 −0

Original line number	Diff line number	Diff line
		package: "com.android.server.deviceidle"
		container: "system"

		flag {
		name: "remove_idle_location"
		namespace: "location"
		description: "Remove DeviceIdleController usage of location"
		bug: "332770178"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "disable_wakelocks_in_light_idle"
		namespace: "backstage_power"

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@ import com.android.modules.expresslog.Counter;
		import com.android.server.am.BatteryStatsService;
		import com.android.server.deviceidle.ConstraintController;
		import com.android.server.deviceidle.DeviceIdleConstraintTracker;
		import com.android.server.deviceidle.Flags;
		import com.android.server.deviceidle.IDeviceIdleConstraint;
		import com.android.server.deviceidle.TvConstraintController;
		import com.android.server.net.NetworkPolicyManagerInternal;
		@@ -2558,7 +2559,7 @@ public class DeviceIdleController extends SystemService
		}

		boolean isLocationPrefetchEnabled() {
		return mContext.getResources().getBoolean(
		return !Flags.removeIdleLocation() && mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_autoPowerModePrefetchLocation);
		}

api/StubLibraries.bp

+60 −58

Original line number	Diff line number	Diff line
		@@ -54,34 +54,34 @@ non_updatable_exportable_droidstubs {
		baseline_file: ":non-updatable-lint-baseline.txt",
		},
		},
		soong_config_variables: {
		release_hidden_api_exportable_stubs: {
		dists: [
		{
		targets: ["sdk"],
		dir: "apistubs/android/public/api",
		dest: "android-non-updatable.txt",
		tag: ".exportable.api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/public/api",
		dest: "android-non-updatable-removed.txt",
		},
		],
		soong_config_variables: {
		release_hidden_api_exportable_stubs: {
		dists: [
		{
		tag: ".exportable.api.txt",
		},
		{
		tag: ".exportable.removed-api.txt",
		},
		],
		conditions_default: {
		dists: [
		{
		targets: ["sdk"],
		dir: "apistubs/android/public/api",
		dest: "android-non-updatable.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/public/api",
		dest: "android-non-updatable-removed.txt",
		tag: ".removed-api.txt",
		},
		],
		@@ -134,34 +134,34 @@ non_updatable_exportable_droidstubs {
		baseline_file: ":non-updatable-system-lint-baseline.txt",
		},
		},
		soong_config_variables: {
		release_hidden_api_exportable_stubs: {
		dists: [
		{
		targets: ["sdk"],
		dir: "apistubs/android/system/api",
		dest: "android-non-updatable.txt",
		tag: ".exportable.api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/system/api",
		dest: "android-non-updatable-removed.txt",
		},
		],
		soong_config_variables: {
		release_hidden_api_exportable_stubs: {
		dists: [
		{
		tag: ".exportable.api.txt",
		},
		{
		tag: ".exportable.removed-api.txt",
		},
		],
		conditions_default: {
		dists: [
		{
		targets: ["sdk"],
		dir: "apistubs/android/system/api",
		dest: "android-non-updatable.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/system/api",
		dest: "android-non-updatable-removed.txt",
		tag: ".removed-api.txt",
		},
		],
		@@ -189,56 +189,58 @@ non_updatable_exportable_droidstubs {
		baseline_file: ":non-updatable-test-lint-baseline.txt",
		},
		},
		soong_config_variables: {
		release_hidden_api_exportable_stubs: {
		dists: [
		{
		targets: ["sdk"],
		dir: "apistubs/android/test/api",
		dest: "android.txt",
		tag: ".exportable.api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/test/api",
		dest: "removed.txt",
		tag: ".exportable.removed-api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/test/api",
		dest: "android-non-updatable.txt",
		tag: ".exportable.api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/test/api",
		dest: "android-non-updatable-removed.txt",
		},
		],
		soong_config_variables: {
		release_hidden_api_exportable_stubs: {
		dists: [
		{
		tag: ".exportable.api.txt",
		},
		{
		tag: ".exportable.removed-api.txt",
		},
		{
		tag: ".exportable.api.txt",
		},
		{
		tag: ".exportable.removed-api.txt",
		},
		],
		conditions_default: {
		dists: [
		{
		targets: ["sdk"],
		dir: "apistubs/android/test/api",
		dest: "android.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/test/api",
		dest: "removed.txt",
		tag: ".removed-api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/test/api",
		dest: "android-non-updatable.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/test/api",
		dest: "android-non-updatable-removed.txt",
		tag: ".removed-api.txt",
		},
		],
		@@ -271,34 +273,34 @@ non_updatable_exportable_droidstubs {
		baseline_file: ":non-updatable-module-lib-lint-baseline.txt",
		},
		},
		soong_config_variables: {
		release_hidden_api_exportable_stubs: {
		dists: [
		{
		targets: ["sdk"],
		dir: "apistubs/android/module-lib/api",
		dest: "android-non-updatable.txt",
		tag: ".exportable.api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/module-lib/api",
		dest: "android-non-updatable-removed.txt",
		},
		],
		soong_config_variables: {
		release_hidden_api_exportable_stubs: {
		dists: [
		{
		tag: ".exportable.api.txt",
		},
		{
		tag: ".exportable.removed-api.txt",
		},
		],
		conditions_default: {
		dists: [
		{
		targets: ["sdk"],
		dir: "apistubs/android/module-lib/api",
		dest: "android-non-updatable.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk"],
		dir: "apistubs/android/module-lib/api",
		dest: "android-non-updatable-removed.txt",
		tag: ".removed-api.txt",
		},
		],