Commit Graph

772314 Commits

Author SHA1 Message Date
Hawkwood Glazier
341b5a877a Merge "Add exception handling to ClockRegistry to prevent crashes" into tm-qpr-dev 2022-08-02 21:58:58 +00:00
Caitlin Cassidy
91b6e7c0ac Merge changes I0d063c25,I27d2e4ae,Ieef1681c into tm-qpr-dev
* changes:
  [Media TTT] Remove the tap-to-dismiss option for the phone chip.
  [Media TTT] Increase the default timeout to 10s, and the timeout for the "transfer started but not finished" state to 30s.
  [Media TTT] Don't wake the screen if the screen is already in dream state.
2022-08-02 21:38:52 +00:00
Alejandro Nijamkin
619cd2a8a4 Developer-facing document for quick affordances
This is a guide for developers for how to add new quick affordance
buttons to the lockscreen.

Bug: 235403546
Test: N/A
Change-Id: Id8417c48732e25331027f11442c16d0220e690c4
2022-08-02 14:31:03 -07:00
Darrell Shi
111c26fe78 Merge changes from topic "home-controls-type" into tm-qpr-dev
* changes:
  Add home controls complication type.
  Add home controls complication type in settingslib.
2022-08-02 21:30:22 +00:00
Jeff DeCew
d657a62950 [automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours am: 2bd5ab6f26 -s ours am: 04928c8771 -s ours am: 7c5b922af8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498370

Change-Id: I6a167176e3d8096b559ab436cc9a353bb927003c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 21:26:12 +00:00
Jeff DeCew
17c5ac1df5 [automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours am: 2bd5ab6f26 -s ours am: 04928c8771 -s ours am: 7c5b922af8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498370

Change-Id: Ib899a052e6f771c9543cdc1c493590ee64dfef37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 21:25:12 +00:00
Alejandro Nijamkin
7eabd5f4bd Merge "Moves quickaffordance tests to correct pakcage." into tm-qpr-dev 2022-08-02 21:23:24 +00:00
Alejandro Nijamkin
7e09869954 Merge "Fixes quick affordance visibility bug." into tm-qpr-dev 2022-08-02 21:20:38 +00:00
Jeff DeCew
7c5b922af8 [automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours am: 2bd5ab6f26 -s ours am: 04928c8771 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498370

Change-Id: Id1104933e284fd70066ed54ac294a7491323e633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 20:55:08 +00:00
Jeff DeCew
b5a509e7ff [automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1 am: 37dc894a6f am: 2bbb7a4138 -s ours am: b00db46a98 -s ours am: a825b67ac8 -s ours
am skip reason: Merged-In I95443ee6b77377aceb54b983d34131628027da9b with SHA-1 9d20909eae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459069

Change-Id: Iaa05c413a61f3542f306581ebf1d0fc65fe665a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 20:40:20 +00:00
Jeff DeCew
3deed15990 [automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1 am: 71227bd648 -s ours am: e2652afc6f -s ours am: 7dce68af95 -s ours
am skip reason: Merged-In I95443ee6b77377aceb54b983d34131628027da9b with SHA-1 09d333e09c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459069

Change-Id: I31a35ecd26dda3f66290ea68a16fe39a8cc53c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 20:40:12 +00:00
Jeff DeCew
04928c8771 [automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours am: 2bd5ab6f26 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498370

Change-Id: I2192402fbd836aa9a4777721c8ecc3e5f9eb63da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 20:38:50 +00:00
Evan Rosky
0b3ad39abf Strip transition information from activityoptions once it is read.
The implementation of shared-element transitions takes the
ActivityOptions from the calling activity and sends them to
another activity. This means that any sensitive information
passed into ActivityManager via ActivityOptions can make its
way to an unrelated app. Recently a RemoteTransition object
was added which includes some sensitive information.

This CL strips the sensitive information from the activity
options after it is extracted so that it can't be sent
to the target.

Bug: 237290578
Test: atest ActivityManagerTest#testActivityManager_stripTransitionFromActivityOptions
Change-Id: Ic9f8062e67ab895292af75e97a9ce2f4aa45d467
2022-08-02 20:37:50 +00:00
Jeff DeCew
2bd5ab6f26 [automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 518980587b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19498370

Change-Id: Idf13340b59f5d67c7c4582d339d92f94905fae08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 20:21:28 +00:00
Jeff DeCew
a825b67ac8 [automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1 am: 37dc894a6f am: 2bbb7a4138 -s ours am: b00db46a98 -s ours
am skip reason: Merged-In I95443ee6b77377aceb54b983d34131628027da9b with SHA-1 9d20909eae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459069

Change-Id: Ia9effe40de5589625fec8f70e38e3a2d4db4f96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 20:15:18 +00:00
Jeff DeCew
7dce68af95 [automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1 am: 71227bd648 -s ours am: e2652afc6f -s ours
am skip reason: Merged-In I95443ee6b77377aceb54b983d34131628027da9b with SHA-1 09d333e09c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459069

Change-Id: Ibd9748991cecc5e0fe8239097dbc8c83779fad00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 20:15:10 +00:00
Evan Rosky
8dc61b1ee2 Merge "Hook up setWillFinishToHome in recents wrapper" into tm-qpr-dev 2022-08-02 20:13:54 +00:00
Jeff DeCew
b00db46a98 [automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1 am: 37dc894a6f am: 2bbb7a4138 -s ours
am skip reason: Merged-In I95443ee6b77377aceb54b983d34131628027da9b with SHA-1 9d20909eae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459069

Change-Id: I06f241de2d442c75798c6eed2a2189e243ca7962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 20:13:45 +00:00
Ben Lin
d9df20c23f Don't resize PiP on aspect ratio change if nothing changed.
Aspect ratio changes could be deferred, and thus only the aspect ratio
itself needs to be updated, but the bounds itself is already correct.

Bug: 234615306
Bug: 241096069
Test: Enter PiP and move it around right after animation finishes
Change-Id: Ia1078a6492358e694d4eadf97fa0f242a4033c6f
2022-08-02 12:51:57 -07:00
Jeff DeCew
2bbb7a4138 Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1 am: 37dc894a6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459069

Change-Id: Ife130410d4a2bc8050f28c464bed9f22dbda50a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 19:49:28 +00:00
Jeff DeCew
e2652afc6f [automerger skipped] Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1 am: 71227bd648 -s ours
am skip reason: Merged-In I95443ee6b77377aceb54b983d34131628027da9b with SHA-1 09d333e09c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459069

Change-Id: I3231da16b48ab3b471bb1bfce356e0390dbdcc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 19:49:15 +00:00
TreeHugger Robot
0995b7089b Merge "Fix concurrency in BATTERY_USAGE_STATS_* statsd atom generation" into tm-qpr-dev 2022-08-02 19:46:27 +00:00
Jeff DeCew
37dc894a6f Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459069

Change-Id: I9af5cc1f1b70733bfb87aa10562e3bb8915e29c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 19:33:27 +00:00
Jeff DeCew
71227bd648 Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev am: 279ecc9dc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459069

Change-Id: I2797e1eae6a942734511f466fe32303011918854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 19:32:14 +00:00
TreeHugger Robot
a33ff80ac3 Merge "Adds OWNERS for ScreenshotHelper" into tm-qpr-dev 2022-08-02 18:57:44 +00:00
Jeff DeCew
279ecc9dc1 Merge "Fix Notification redaction when power cycling a non-dozing device while occluded." into sc-dev 2022-08-02 18:56:23 +00:00
Winson Chung
91a416bae9 3/ Fix inverted ShellInit dependency order (no functional changes)
- We were previously initializing components manually because some startup
  is order-dependent, which led to an increasing number of dependencies
  from ShellTaskOrganizer on things that it really doesn't need to know
  about.  The initialization order actually matches the dependency order
  pretty closely, so instead we can have these components add callbacks
  in the order they are created and initalize in sequence.
- Also move some logic out of constructors to the init callback
- The other subtle issue is that the provider for ShellInitImpl was
  implicitly also ensuring that certain shell components were created at
  startup (since they aren't otherwise referenced by any SysUI component
  directly or indirectly).  Instead, separate that out into another
  more explicit provider, with the @ShellCreateTrigger annotation, and
  allow subclasses to provide a @ShellCreateTriggerOverride annotated
  provider for product-specific initialization

Test: atest WMShellUnitTests
Test: atest SystemUITests
Bug: 238217847

Change-Id: I4a2583ceeaf469130ac07fc8c4e267c28843b7b8
Signed-off-by: Winson Chung <winsonc@google.com>
2022-08-02 18:15:40 +00:00
Issei Suzuki
e12c8f5de3 Clear ActivityRecord#mDismissKeyguard flag after app launches.
This flag is used by the SysUI to dismiss an insecure keyguard
when an app is launched from an insecure lock screen. The flag
should only affect the app launch once, so needs to be cleared
once the flag is processed.

Bug: 234583880
Test: atest KeyguardTests#testDismissKeyguard_fromActivityOption_onlyOnce
Change-Id: Ia4179b40de7d45b2199b175a6dcc24016dfba091
(cherry picked from commit 41cbf49af7)
2022-08-02 17:02:23 +00:00
Caitlin Cassidy
5696976846 [SB Refactor] Create the callback collector object for the new pipeline
and have the processor connect to it.

Test: Compiles
Test: ConnectivityInfoProcessorTest
Bug: 238425913
Change-Id: I1a363caaddd8e731be617a0030e81c2411dec0b8
2022-08-02 17:00:19 +00:00
Alejandro Nijamkin
f32a6f88f1 KeyguardBottomAreaView: turns on flag for teamfood.
Title says it all.

Bug: 235403546
Test: Made sure that the feature is enabled while the teamfood flag is
enabled and the feature flag itself is disabled using the flag flipping
app

Change-Id: I1bef5c65fc17bff7c80c8997d823d048cb8c4f19
2022-08-02 09:55:36 -07:00
Issei Suzuki
811c0f0b02 Clear ActivityRecord#mDismissKeyguard flag after app launches.
This flag is used by the SysUI to dismiss an insecure keyguard
when an app is launched from an insecure lock screen. The flag
should only affect the app launch once, so needs to be cleared
once app launch animation finishes.

Bug: 234583880
Test: atest KeyguardTests
Change-Id: I74e9e00caad0d9af80127b2fc930c4ff0d52af76
2022-08-02 16:52:46 +00:00
Evan Laird
3b218416e0 Allow system info to be set visible even if we don't animate
CollapsedStatusBarFragment uses disable flags to show and hide the
system info in two cases: when showing the keyguard and when showing
quick settings. This animation causes the alpha to animate to zero AND
the visibility to be View.INVISIBLE.

This means that the system event animation only has the context to set
the alpha of the system status area -- _not_ the visibility.

In the case where the disable flags change while a system status event
animation is in progress, CollapsedStatusBarFragment would bail on the
_entire_ animation, including the change from View.INVISIBLE to
View.VISIBLE, which is crucial for unhiding the view eventually.

This change simply allows CollapsedStatusBarFragment to set the system
info area back to View.VISIBLE even if it doens't control the overall
animation.

Test: atest CollapsedStatusBarFragmentTest
Fixes: 238968127
Fixes: 239508705
Change-Id: I7ad8c4a4df8ff335ea9b3de428521b24e59002ee
Merged-In: I7ad8c4a4df8ff335ea9b3de428521b24e59002ee
2022-08-02 16:49:02 +00:00
Alejandro Nijamkin
5629159dd2 Moves quickaffordance tests to correct pakcage.
The code was moved to another package but the tests weren't.

Bug: 235403546
Test: N/A - just a file move of test files.
Change-Id: I74e2f5b792d58cf02510ab62ab1bafa084e972b9
2022-08-02 09:40:16 -07:00
Alejandro Nijamkin
99404d72b1 Fixes quick affordance visibility bug.
In the new implementation of the KeyguardBottomAreaView, when the user
locks their device, moving directly from the unlocked state into
AOD/doze, we erroneously show the home controls quick affordance button
for a moment/frame before hiding it.

This was caused by our reliance on isDozing and dozeAmount where, what
we should really look at is isDozing and isKeyguardShowing - like the CL
is doing.

The approach taken here is actually refactored out of the wallet quick
affordance config implementation and applied generically to all quick
affordance config implementation at the use-case layer. The reason I
thought this could work is because I was only seeing the home controls
button exhibit this bug while the wallet one was not. I didn't test the
QR Code scanner one, but I bet it would have worked just like the home
controls one.

Bug: 240969525
Fix: 240969525
Test: locking from the unlocked home-screen proves that the fix works
because it no longer flickers the quick affordance view over the AOD
screen. Also, unit tests were added/modified to capture this.

Change-Id: Id2917989991802825d1024d5a0d9161d4452265f
2022-08-02 09:40:13 -07:00
TreeHugger Robot
4ca3922aec Merge "Flow-based connectivity listener" into tm-qpr-dev 2022-08-02 15:46:34 +00:00
Darrell Shi
0471f7b84a Merge changes from topic "dream-complications-relayout" into tm-qpr-dev
* changes:
  Update complications layout.
  Refactor dream complications.
  Remove clock date complication.
2022-08-02 15:38:31 +00:00
Nicolò Mazzucato
25ab210588 Merge "Fix sidefps on portrait large screens" into tm-qpr-dev 2022-08-02 14:32:14 +00:00
Jeff DeCew
fb50080c39 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours am: ac47d942ee -s ours am: 3bde57adaf -s ours am: b941153889 -s ours am: 499f8362a1 -s ours am: a53c1e5f88 -s ours am: 63ceb948c3 -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142

Change-Id: I6e517c6ce054b4774d61094fb668033fe29a56f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 14:29:53 +00:00
Jeff DeCew
3275e518a9 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours am: ac47d942ee -s ours am: 3bde57adaf -s ours am: 2b3924da48 -s ours am: 9948e28391 -s ours am: f4c49c4940 -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142

Change-Id: I028ee5d66fa1e7ceba340abdaad665d64826f685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 14:29:46 +00:00
Fabian Kozynski
da2de7c9ed Merge "Do not post a change in brightness if temporary" into tm-qpr-dev 2022-08-02 14:29:13 +00:00
Justin Weir
ef03db052e Clean up most Shade package warnings
Bug: 240554750
Test: atest SystemUITests SystemUIGoogleTests
Change-Id: I91c3104acb76e140136aaf07d4fa3d230b45e527
2022-08-02 10:16:55 -04:00
Eric Laurent
20ad9ed954 AudioService: fix initial spatial audio enable state.
Fix SpatializerHelper.setSpatializerEnabledInt() to
avoid overriding the enable state computed by onRoutingUpdated()
when spatial audio is enabled.

Bug: 238378679
Test: repro steps in the bug
Change-Id: I2e77945c889c1db093832f780c632a626e979e7c
2022-08-02 16:15:52 +02:00
Jeff DeCew
63ceb948c3 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours am: ac47d942ee -s ours am: 3bde57adaf -s ours am: b941153889 -s ours am: 499f8362a1 -s ours am: a53c1e5f88 -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142

Change-Id: I7cac4b66558e784a7b7b19b48eb051cebabfe7e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 14:12:44 +00:00
Jeff DeCew
f4c49c4940 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours am: ac47d942ee -s ours am: 3bde57adaf -s ours am: 2b3924da48 -s ours am: 9948e28391 -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142

Change-Id: I8a55ba4fe5d4cc7299769bf819d767f93cb5cba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 14:12:37 +00:00
Jeff DeCew
a53c1e5f88 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours am: ac47d942ee -s ours am: 3bde57adaf -s ours am: b941153889 -s ours am: 499f8362a1 -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142

Change-Id: Ia5216bc6bb887399f2ac9b3e1ce971621b0c6588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 14:11:12 +00:00
Jeff DeCew
518980587b RESTRICT AUTOMERGE: Fix build breakage from merge conflict.
Merging 8ce3c53fcf into qt-qpr1-dev resulted in a merge conflict due to a method being moved between qt-qpr1-dev and rvc-dev, such that the patch backported from rvc-dev didn't match at all.  Removing the old method makes this branch match qt-dev and rvc-dev.

Test: will use abtd to validate the build and the resulting logic.

Original changes: Id82d20c9f1f2001400871b5381f52b40fbdf81c5

Original
Bug: 231322873

Breakage
Bug: 241087006

Change-Id: Ic4f8d701d97aa9b6c72875df8c7eab5fd51934e0
2022-08-02 14:05:08 +00:00
Jeff DeCew
499f8362a1 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours am: ac47d942ee -s ours am: 3bde57adaf -s ours am: b941153889 -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142

Change-Id: Ic337ab75e2cd29fbe061ace0a04578fe750437f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 13:54:22 +00:00
Jeff DeCew
9948e28391 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours am: ac47d942ee -s ours am: 3bde57adaf -s ours am: 2b3924da48 -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142

Change-Id: Ib4d7c3b7f1a99b4566a5f0d6dfd81dba601870c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 13:54:21 +00:00
Hyundo Moon
c98f072404 Merge "Set LE audio volume when audio mode is changed" into tm-qpr-dev 2022-08-02 13:53:42 +00:00
Jeff DeCew
b941153889 [automerger skipped] Merge "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior." into qt-dev am: b38c650ea9 am: 7330570922 -s ours am: d011967068 -s ours am: ac47d942ee -s ours am: 3bde57adaf -s ours
am skip reason: Merged-In Id82d20c9f1f2001400871b5381f52b40fbdf81c5 with SHA-1 09761a98b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142

Change-Id: I45f808a554572fb86f57121b10d48690d845df26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 13:37:46 +00:00