frameworks/base/core/jni/com_android_internal_content_FileSystemUtils.cpp:198:37: error: format specifies type 'long' but the argument has type 'int' [-Werror,-Wformat]
  196 |         ALOGD("Size after punching holes st_blocks: %" PRIu64 ", st_blksize: %ld, st_size: %" PRIu64
      |                                                                              ~~~
      |                                                                              %d
  197 |               "",
  198 |               afterPunch.st_blocks, afterPunch.st_blksize,
      |                                     ^~~~~~~~~~~~~~~~~~~~~

Test: presubmit
Bug: 315250603
Change-Id: I449937f824ef7423d2c909a64b34d4df678ac62b

Merge "JobSchedulerService:fix arrayIndexOutOfBoundsException to aviod systemServer crash." into main

systemServer crash.

As can be seen from the AOSP code, the set collection mTrackedTasks is accessed under mLock, but there is no mLock lock in the reportNewIdleState function. Therefore, we should put onControllerStateChanged into the mLock lock for execution, just like all other Controllers calling this method with mLock, there is no risk of deadlock.

Test: OEM monkey test
Bug: 342554438
Change-Id: I596defa8ca018a7161cd149a54a029f6adb96937

The help/usage text for the notification cmd is not wrapped
correctly when displaying the 'allow_dnd' parameter.

This was introduced in commit 08d381b8.

Test: manual, run cmd notification and check the wrapping
Change-Id: I9a7af1d9e3de91c9124f21eb66817bb73a3512be

This reverts commit ec7f7207.

Reason for revert: Fixed tests

Change-Id: Iadd0ea6f09f7f3159f94489c03f28c326bbbb664

Bug: 342527967
Change-Id: I41811e2dae454c67435c1c99d10bc3a28894fbd1
Test: presubmit

Make sure we display the Intent extras as string, not spannable
char sequences.

Change-Id: Ifd08941179ee809ee038e25be9d92a283e7ab2cc
Fix: 197874968
Test: Launch SoundPicker with CharSequence intent extra

Merge "[Thread] add permission THREAD_NETWORK_TESTING for guarding testing APIs or shell commands" into main

Bug: 339934804
Test: atest --iterations 5 android.alarmmanager.cts.ExactAlarmsTest#alarmClockGrantsWhitelist
Change-Id: I1f032cb3e983ecf75e5607d9510a6f8ffee13607
Signed-off-by: Abhishek Gadewar <abhishekgadewar@meta.com>

For some low-end or bad performance devices, sometimes keyguard
flingToHeight animation still not complete, at this moment if received
the onStartedWakingUp while try turn screen on, it will cause the
remote SystemUI keyguard dismiss transition can't run.

Before execute a fling animation of Keyguard, set the animation execution time to 0 determines that it is Screen Off state.
This solution makes Screen On can not affect animation.

Bug: 301196699
Test: run cts KeyguardTests

Change-Id: Ic7be1b5e41814adb44ce79857b79283040b4e3a4
Merged-In: I4743c0ad53f89ee2fdc2f8e9eed864fe79f3bfc3

* changes:
  Remove redudant string conversions
  Add hid command support for uniq device attribute

When receive the DYNAMIC_SENSOR_CHANGED broadcast,thread A will
call the updateDynamicSensorList method to traverse mDynamicSensorCallbacks
map. Meanwhile,thread B call the register/unregister the dynamicSensorCallback,
it may cause CWE.So we should add a lock to protect.

Test: OEM monkey test
Bug: 342282013
Change-Id: Ic380ae23ecdcb0f501e85b19db4fcabc275f17c5

In the review of ag/26174212, an unnecessary string conversion was
identified; this CL corrects that, plus two other instances in
the same function.

Bug: 314732730
Test: Presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:60e4fdfa0897b94c003ba3df3b39a16e10c886d1

)
Merged-In: Id2b620088e12266f041be864271493ffe7e1a3b1
Change-Id: Id2b620088e12266f041be864271493ffe7e1a3b1
Signed-off-by: Edward Liaw <edliaw@google.com>

Sony gamepads need a uniq attribute of a certain size in order to
obtain the MAC address, which makes our CTS test fail. This CL
adds the ability to define this attribute in our test definitions.

Bug: 314732730
Test: Compiles properly, will be tested together with the test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:93a4c0fbdc14d99cbd382fd50be83b7058ca6b56

)
Merged-In: I83203e8eb876b27d0e6e60adfbf6de3f4a6e9872
Change-Id: I83203e8eb876b27d0e6e60adfbf6de3f4a6e9872
Signed-off-by: Edward Liaw <edliaw@google.com>

Revert submission 2864688-apc-deprecate

Reason for revert: fix inadvertent partial deprecation

Reverted changes: /q/submissionid:2864688-apc-deprecate

Change-Id: I820e2916acfc711c6a092ac1371548f54fd170af

Bug: 317747397
Change-Id: Iee1fa722c6c773aa3ceb84ac13e05e8935360f45
Test: OWNERS

This reduces the latency before we are able to generate a profile from
the server backend.

Test: cmd jobscheduler run -f android 260817
Change-Id: Icdbdf809435580b131f5b6677e039f3043264abe

Removed hard-coded "version"s in assertions. Instead, the test now
parses XML documents and then compare root elements and "type"s.

Plus, the test now checks if report() reports all four
matrices/manifests.

Bug: 317747397
Test: atest VintfObjectTest
Change-Id: I4bb514e9c0bd78214cb3f03e1b12afec8a301915

Bug: n/a
Test: n/a
Change-Id: I3c359283b8efa04d0731018c0d6647586221f8cc