Bug: N/A
Test: Treehugger
Change-Id: I058b0e550c7ed9197934f2bbda1146e776324934

* changes:
  locksettings: clean up references to managed profiles
  Sync tieProfileLockIfNecessary() with internal main

The terms "unified challenge" and "separate challenge" apply only in the
context of a profile whose credential is shareable with its parent.  It
is possible for a profile's credential to not be shareable with its
parent.  Update TrustManagerService's dump method to not show "profile
with unified challenge" for such profiles.  To make this possible, also
add a new method LockPatternUtils#isProfileWithUnifiedChallenge().

Bug: 296464083
Test: dumpsys trust
Flag: exempt, just changes dumpsys
Change-Id: I52a5c68633b3be969863c10cd1740f700af9cc07

Test: Treehugger
Change-Id: I432ad0335f97604b9ca01a7fbbea541534badc27

Clean up some code (comments, method names, class names) in
LockSettingsService that referred to managed profiles (or work profiles,
which are the same thing as managed profiles), when they really meant
any profile with unified challenge.  Originally only managed profiles
supported unified challenge, so this code was fine originally.  But now
"clone profiles" support unified challenge too.  There's also a plan to
add another profile type that supports unified challenge.

Bug: 214355283
Test: atest com.android.server.locksettings
Flag: exempt, mechanical refactoring
Change-Id: Ica472482983de13a19fcd9da966273e8d2e974ad

The internal-first commit ab75d2ce (http://ag/23150174) modified
tieProfileLockIfNecessary(), which is now causing conflicts.  As the
modification to tieProfileLockIfNecessary() (which simply made it not
crash when called with a profile that does not have a parent) does not
depend on the rest of the change, cherry-pick it separately.

Test: atest com.android.server.locksettings
Merged-In: Ib0e4e52c10f0e95913ddfde606d6995de3538f27
Change-Id: I323811363d8801d4f0bc84f241ad042f45bb3358

The merge commit 8a5dadb7 (http://ag/25090532) duplicated the line
'mLockSettingsService.deleteRepairModePersistentDataIfNeeded();'.
Fix this to make AOSP main match internal main.

Test: atest com.android.server.locksettings
Change-Id: I8e4326c33b715bc6a1fef7dbf6ce53cd69c1b93a

Revert submission 2862771-cuttlefish_aidl_audio-2

Reason for revert: b/316027906

Reverted changes: /q/submissionid:2862771-cuttlefish_aidl_audio-2

Change-Id: I8809260bab6efb1d7f4fb31c55b6f4380b1d2df2

Clear the buffer again whenever we have to reconnect. It's unclear
this matters in normal operation, but this precludes some failure
modes.

Check poll() for an error return like ENOMEM.

Bug: 315482121
Test: Treehugger
Change-Id: I67fb6d73bde6a8f54ce297e5269641abea48b9b0

* changes:
  Add compile_data to AaptSymlinkTest
  Disable use_resource_processor for aapt2 integration tests

- used code gen to precompute metric ids hash & type

Bug: 276463350
Test: atest ExpressLogApisTests
Test: atest android.cts.statsdatom.express.ExpresslogAtomsTests
Change-Id: I97947b8953df5a943b2e41afd92a49b73cf6a8d8
Merged-In: I97947b8953df5a943b2e41afd92a49b73cf6a8d8

* changes:
  Revert "Add isHidlSupported Java API"
  Revert "Create a HwNoService class that fakes hwservicemanager"

* changes:
  Add testing for MusicFxHelper
  MusicFxHelper: avoid modify AudioSession list while iterating
  Start/stop foreground service delegate for musicfx app.

Bug: 288050380
Test: m
Change-Id: Ia8c4a060625d7309131b05706857c1cd3975ca1c

Bug: 315483862
Change-Id: I501547e1b78ac6e95bb058ea83e33004738f0fc9

Revert submission 2866127-HwNoService

Reason for revert:
DroidMonitor: Potential culprit for Bug 315883998 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2866127-HwNoService

Change-Id: I4e98dfecdc3c7f1ecd10f713f45c8245769dd03e

Revert submission 2866127-HwNoService

Reason for revert:
DroidMonitor: Potential culprit for Bug 315883998 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2866127-HwNoService

Change-Id: Ib3aea655d19bc0a508abfaa093b75c7a16c29b5e

Which not allowed in androidx.compose.material.ripple library anymore.

And by removing this, we can follow material3, and align with other
parts in  Settings.

Using LocalContentColor provides MaterialTheme.colorScheme.onSurface
to fix ripple color instead.

Fix: 313682621
Test: visual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cb737f8159198f111429be693f73abb11c352c5f)
Merged-In: I7337d25889c4091ae8d3c063caa30cbf1edd4930
Change-Id: I7337d25889c4091ae8d3c063caa30cbf1edd4930

* changes:
  Create a HwNoService class that fakes hwservicemanager
  Add isHidlSupported Java API