Snap for 14087972 from d47825435970b5285a6f202380689cb07cc936aa to 25Q4-release (820f67ae) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -671,6 +671,13 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "android.view.inputmethod.flags-aconfig-java-host",
		aconfig_declarations: "android.view.inputmethod.flags-aconfig",
		host_supported: true,
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Vibrator
		aconfig_declarations {
		name: "android.os.vibrator.flags-aconfig",

apex/jobscheduler/service/aconfig/job.aconfig

+1 −9

Original line number	Diff line number	Diff line
		@@ -80,15 +80,7 @@ flag {
		}
		}

		flag {
		name: "fix_deadline_delay_job_stall"
		namespace: "backstage_power"
		description: "Fix deadline and delay job stall due to a incorrect time check in TimeController"
		bug: "400440145"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}


		flag {
		name: "fix_reporting_active_jobs"

apex/jobscheduler/service/java/com/android/server/job/controllers/TimeController.java

+7 −18

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import android.util.proto.ProtoOutputStream;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.modules.expresslog.Counter;
		import com.android.server.AppSchedulingModuleThread;
		import com.android.server.job.Flags;

		import com.android.server.job.JobSchedulerService;
		import com.android.server.job.StateControllerProto;

		@@ -149,8 +149,7 @@ public final class TimeController extends StateController {
		* Checking here avoids unnecessary delays in starting the job.
		*/
		private boolean isDelayAlarmDelayed() {
		return Flags.fixDeadlineDelayJobStall()
		&& sElapsedRealtimeClock.millis() >= mNextDelayExpiredElapsedMillis;
		return sElapsedRealtimeClock.millis() >= mNextDelayExpiredElapsedMillis;
		}

		/**
		@@ -159,8 +158,7 @@ public final class TimeController extends StateController {
		* Checking here avoids unnecessary delays in starting the job.
		*/
		private boolean isDeadlineAlarmDelayed() {
		return Flags.fixDeadlineDelayJobStall()
		&& sElapsedRealtimeClock.millis() >= mNextJobExpiredElapsedMillis;
		return sElapsedRealtimeClock.millis() >= mNextJobExpiredElapsedMillis;
		}

		@Override
		@@ -424,14 +422,10 @@ public final class TimeController extends StateController {
		Slog.d(TAG, "Deadline-expired alarm fired");
		}

		if (Flags.fixDeadlineDelayJobStall()) {
		synchronized (mLock) {
		mNextJobExpiredElapsedMillis = Long.MAX_VALUE;
		checkExpiredDeadlinesAndResetAlarm();
		}
		} else {
		checkExpiredDeadlinesAndResetAlarm();
		}
		}
		};

		@@ -442,16 +436,11 @@ public final class TimeController extends StateController {
		Slog.d(TAG, "Delay-expired alarm fired");
		}

		if (Flags.fixDeadlineDelayJobStall()) {
		synchronized (mLock) {
		mLastFiredDelayExpiredElapsedMillis = sElapsedRealtimeClock.millis();
		mNextDelayExpiredElapsedMillis = Long.MAX_VALUE;
		checkExpiredDelaysAndResetAlarm();
		}
		} else {
		mLastFiredDelayExpiredElapsedMillis = sElapsedRealtimeClock.millis();
		checkExpiredDelaysAndResetAlarm();
		}
		}
		};

api/ApiDocs.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -318,6 +318,13 @@ droiddoc {
		"-title \"Android SDK\"",
		],
		static_doc_index_redirect: "docs/docs-preview-index.html",
		// The directory to publish the generated documentation under out/target/common/docs.
		publish_dir: "offline-sdk",
		}

		phony_rule {
		name: "docs",
		phony_deps: ["offline-sdk-docs"],
		}

		droiddoc {

core/api/current.txt

+26 −0

Original line number	Diff line number	Diff line
		@@ -10254,6 +10254,29 @@ package android.appwidget {

		package android.companion {

		@FlaggedApi("android.companion.enable_data_sync") public final class ActionRequest implements android.os.Parcelable {
		method public int describeContents();
		method public int getAction();
		method public int getOperation();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.companion.ActionRequest> CREATOR;
		field public static final int OP_ACTIVATE = 0; // 0x0
		field public static final int OP_DEACTIVATE = 1; // 0x1
		field public static final int REQUEST_NEARBY_ADVERTISING = 1; // 0x1
		field public static final int REQUEST_NEARBY_SCANNING = 0; // 0x0
		field public static final int REQUEST_TRANSPORT = 2; // 0x2
		}

		@FlaggedApi("android.companion.enable_data_sync") public final class ActionResult implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.companion.ActionRequest getActionRequest();
		method public int getResultCode();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.companion.ActionResult> CREATOR;
		field public static final int RESULT_FAILED = 1; // 0x1
		field public static final int RESULT_SUCCESS = 0; // 0x0
		}

		public final class AssociatedDevice implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public android.bluetooth.le.ScanResult getBleDevice();
		@@ -10391,6 +10414,7 @@ package android.companion {
		ctor public CompanionDeviceService();
		method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public final void attachSystemDataTransport(int, @NonNull java.io.InputStream, @NonNull java.io.OutputStream) throws android.companion.DeviceNotAssociatedException;
		method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public final void detachSystemDataTransport(int) throws android.companion.DeviceNotAssociatedException;
		method @FlaggedApi("android.companion.enable_data_sync") @MainThread public void onActionRequested(@NonNull android.companion.AssociationInfo, @NonNull android.companion.ActionRequest);
		method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
		method @Deprecated @MainThread public void onDeviceAppeared(@NonNull String);
		method @Deprecated @MainThread public void onDeviceAppeared(@NonNull android.companion.AssociationInfo);
		@@ -10439,6 +10463,8 @@ package android.companion {
		field public static final int EVENT_BT_DISCONNECTED = 3; // 0x3
		field public static final int EVENT_SELF_MANAGED_APPEARED = 4; // 0x4
		field public static final int EVENT_SELF_MANAGED_DISAPPEARED = 5; // 0x5
		field @FlaggedApi("android.companion.enable_data_sync") public static final int EVENT_SELF_MANAGED_NEARBY = 7; // 0x7
		field @FlaggedApi("android.companion.enable_data_sync") public static final int EVENT_SELF_MANAGED_NOT_NEARBY = 8; // 0x8
		field public static final int NO_ASSOCIATION = -1; // 0xffffffff
		}