Commits · eaa129138096bc00b663bca93a5af9786aa47154 · Dhina17 / platform_frameworks_base

Sep 18, 2023

Revert "On device lockdown, always show the keyguard" · eaa12913

Beverly Tai authored 1 year ago

This reverts commit c851ef6d.

Reason for revert: b/300463732 regression
Bug: 300463732
Bug: 218495634

Change-Id: I314e5615b798487d9a965eaa0937905b65aa85fc
Merged-In: I314e5615b798487d9a965eaa0937905b65aa85fc

eaa12913

Sep 14, 2023
- Merge "Store trusted AttributionSources without token" into udc-dev · f0ebf508
  Nate Myren authored 1 year ago
  
  f0ebf508
- Merge "Do not register OnBackInvokedCallback for SoftInputWindow." into udc-dev · a2e448b2
  Wei Sheng Shih authored 1 year ago
  
  a2e448b2
- Merge "Restore trimMemory behaviour from T" into udc-dev · 90c9dbf7
  Lucas Dupin authored 1 year ago
  
  90c9dbf7
- Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev · fe4e586e
  Lucas Dupin authored 1 year ago
  
  fe4e586e
- Merge "AudioDeviceBroker: restore use of hearing aids by default for VoIP calls" into udc-dev · 4e54a895
  Eric Laurent authored 1 year ago
  
  4e54a895
Sep 13, 2023

Restore trimMemory behaviour from T · 16a1cf9e

Jernej Virag authored 1 year ago

When we moved trimming code to ResourceTrimmer in I84637049a106a94bf9f06c5261c2941b55db4ba0, we also moved trimMemory(ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN) which happens after unlock from StatusBarKeyguardViewManager to the ResourceTrimmer behind a TRIM_FONT_CACHES_AT_UNLOCK flag.

Now that we've disabled TRIM_FONT_CACHES_AT_UNLOCK, this also disabled the trimMemory call we were doing since way before Android U.

To full restore pre-U trim font behaviour, this call should not be flag guarded behind the font caching flag.

Bug: 275486055
Bug: 290898642
Bug: 293929945
Test: Updated unit tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4bc215c4101b9504c244356ad0264ea1f4912bbd)
Merged-In: I677855fff144a53d212b65575111491c78803817
Change-Id: I677855fff144a53d212b65575111491c78803817

16a1cf9e

Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached · c9c3e0f8

Hawkwood Glazier authored 1 year ago

Bug: 295143740
Bug: 293929945
Test: Manually checked codepath with secondary display
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dea88a049ba8eabe381b5a5318dd77b5aa1d186f)
Merged-In: I8807d1d58b58f1e5c990c21cef6a810e8b13c1db
Change-Id: I8807d1d58b58f1e5c990c21cef6a810e8b13c1db

c9c3e0f8

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 43aaaacb

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours am: 7bfeb1b9 -s ours am: 6f9b58df -s ours am: b8780fe6 -s ours am: 35b55f9b -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I03c3a2c882a843907d333283af5760afd8fe7805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

43aaaacb

[automerger skipped] Disable priority conversation widget for secondary users... · 80b78453

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours am: 2f082e1a -s ours am: 17f9c965 -s ours am: 8f2c5b84 -s ours am: 935b1e01 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I76a166d4d62397defe5eb93de1124392c29b3591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

80b78453

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 4b195fd2

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours am: 7bfeb1b9 -s ours am: 6f9b58df -s ours am: 78f3f837 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I380771d090359f9b24160e664af5dd71263cdbe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4b195fd2

[automerger skipped] Disable priority conversation widget for secondary users... · aebbf096

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours am: 2f082e1a -s ours am: 17f9c965 -s ours am: c90335ef -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I592713710a2e975825b20e86f16f1f549e5d219a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

aebbf096

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 35b55f9b

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours am: 7bfeb1b9 -s ours am: 6f9b58df -s ours am: b8780fe6 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: Ib359c3241ccd9b61431df6bb71bd4bb551d76078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

35b55f9b

[automerger skipped] Disable priority conversation widget for secondary users... · 935b1e01

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours am: 2f082e1a -s ours am: 17f9c965 -s ours am: 8f2c5b84 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I082042a83435f3580e1f297c71a7cb9974c27ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

935b1e01

[automerger skipped] Merge "Disable priority conversation widget for secondary... · b8780fe6

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours am: 7bfeb1b9 -s ours am: 6f9b58df -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I4fa02e1b62bed36ad0c66a94a4e149eeab1c16f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b8780fe6

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 78f3f837

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours am: 7bfeb1b9 -s ours am: 6f9b58df -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: Ifa7cc7aa607798b4378578c79a036700fa241a93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

78f3f837

[automerger skipped] Disable priority conversation widget for secondary users... · 8f2c5b84

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours am: 2f082e1a -s ours am: 17f9c965 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I75de0ac93df5d87a52060c0f6519741df9b97dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8f2c5b84

[automerger skipped] Disable priority conversation widget for secondary users... · c90335ef

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours am: 2f082e1a -s ours am: 17f9c965 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I25dd6a19f476c1ee95612b67b63a9a92f86f4a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c90335ef

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 6f9b58df

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours am: 7bfeb1b9 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: Icef360cf765da454ed16ca9f99699a03f83707d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6f9b58df

[automerger skipped] Disable priority conversation widget for secondary users... · 17f9c965

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours am: 2f082e1a -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I915e80a8b835ff32776cfbfd4cede663e2396b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

17f9c965

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 7bfeb1b9

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I10a2564c5c2f431c283e901e3b47f85168ab4c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7bfeb1b9

[automerger skipped] Disable priority conversation widget for secondary users... · 2f082e1a

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I186982441187685b9a6d4b5de6cd6b54748cb41f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2f082e1a

[automerger skipped] Merge "Disable priority conversation widget for secondary... · fefbfeea

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I2ebf8ed4213c483bd1ff2c0c964f70c09ae8c39f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fefbfeea

[automerger skipped] Disable priority conversation widget for secondary users... · c7395484

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: If4575056ad62cff194092d0f79ff118f56ccdbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c7395484

Merge "Disable priority conversation widget for secondary users" into sc-dev · c2a52889
Julia Reynolds authored 1 year ago

c2a52889

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 04cc4301

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours am: 6c73f28c -s ours am: d39052c7 -s ours am: 90893cff -s ours am: add8193a -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: I8bf6badb42fad938c2c6230c246295cc05362232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

04cc4301

[automerger skipped] Disable priority conversation widget for secondary users... · 5c2338f3

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760c -s ours am: 0574a0ea -s ours am: 23598c2f -s ours am: e8f6c57c -s ours am: ff538fe4 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: Ib1a74aa7e3ab243a778d0dbd41a76a9609618fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5c2338f3

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 09270a1e

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours am: 6c73f28c -s ours am: d39052c7 -s ours am: df85f263 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: Ia7c4fc1cfb1c1935f845eb0390e37f90489bb63b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

09270a1e

[automerger skipped] Disable priority conversation widget for secondary users... · 70e1b8e7

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760c -s ours am: 0574a0ea -s ours am: 23598c2f -s ours am: c79116d5 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: Id216841a1a66b02fd2286d07ba1889b6d534b449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

70e1b8e7

[automerger skipped] Merge "Disable priority conversation widget for secondary... · add8193a

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours am: 6c73f28c -s ours am: d39052c7 -s ours am: 90893cff -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: I91f0364ce79602b86cff4ee634c24e2428e1085f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

add8193a

[automerger skipped] Disable priority conversation widget for secondary users... · ff538fe4

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760c -s ours am: 0574a0ea -s ours am: 23598c2f -s ours am: e8f6c57c -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: I1b509b370d9c1d5787f44fb1d209a2156e1702ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ff538fe4

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 90893cff

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours am: 6c73f28c -s ours am: d39052c7 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: Ica6cc4c91f104c04e957047b0468ecc1e46a1647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

90893cff

[automerger skipped] Disable priority conversation widget for secondary users... · e8f6c57c

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760c -s ours am: 0574a0ea -s ours am: 23598c2f -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: I8849750a435f81fbd554ab0065bae3d4fb154a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e8f6c57c

[automerger skipped] Merge "Disable priority conversation widget for secondary... · df85f263

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours am: 6c73f28c -s ours am: d39052c7 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: Ie48b48cbc0b67b478a6a4eec1ccaf3e2e3ab443d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

df85f263

[automerger skipped] Disable priority conversation widget for secondary users... · c79116d5

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760c -s ours am: 0574a0ea -s ours am: 23598c2f -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: Ia95d07c81e8f31c4e6b844e08c4ce294b9bc1e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c79116d5

Sep 12, 2023

[automerger skipped] Merge "Disable priority conversation widget for secondary... · d39052c7

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours am: 6c73f28c -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: Ie6c6b7ba25a2b465d574c8768c4b98b8074468ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d39052c7

[automerger skipped] Disable priority conversation widget for secondary users... · 23598c2f

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760c -s ours am: 0574a0ea -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: I547d2ff26c87726b8b2c39a780cd65b26097259b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

23598c2f

[automerger skipped] Merge "Disable priority conversation widget for secondary... · e1f73d53

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into tm-dev am: 6ddb560a -s ours am: 3ac285db -s ours am: bcabda40 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: I40efcc92bda673563d3f70ba1442d45247bdcc81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e1f73d53

[automerger skipped] Disable priority conversation widget for secondary users... · 9434eece

Julia Reynolds authored 1 year ago

[automerger skipped] Disable priority conversation widget for secondary users am: 7444c007 -s ours am: 937658ca -s ours am: 92c5ced9 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: Ie3b9efe14cb6ec62b9fdf212be639e349fe43c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9434eece

[automerger skipped] Merge "Disable priority conversation widget for secondary... · 2947bcfd

Julia Reynolds authored 1 year ago

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into tm-dev am: 6ddb560a -s ours am: 90a76e03 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



Change-Id: I30af62be39f14d5a98bb099a65951c71e5cc0003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2947bcfd