Bug: 295291019
Test: NA
Change-Id: I1386c343d48f8a3c0a8dfac71b7db1599c49cba0

Merge "refactor(TwoFingerTripleTap): Rename FLAG_FEATURE_SCREEN_MAGNIFIER to FLAG_FEATURE_MAGNIFICATION_SINGLE_FINGER_TRIPLE_TAP" into main

Merge "Add google-owned SMS short codes for Indonesia, Bangladesh, Mexico and Newzealand" into main am: 6b530f2a am: 781761c2 am: 22294861

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



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

Merge "Add google-owned SMS short codes for Indonesia, Bangladesh, Mexico and Newzealand" into main am: 6b530f2a am: 781761c2

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



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

refactor(TwoFingerTripleTap): Rename FLAG_FEATURE_SCREEN_MAGNIFIER to FLAG_FEATURE_MAGNIFICATION_SINGLE_FINGER_TRIPLE_TAP

Rename flag and related parameters are used to improve readability

Bug: 297805269
Test: manual
Change-Id: If9d1e4025534d4d5206652a80919bbdc4828fd09

Merge "Add google-owned SMS short codes for Indonesia, Bangladesh, Mexico and Newzealand" into main am: 6b530f2a

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



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

Also prevent double auto mirror for BackAction.

Bug: 304200229
Test: Run Gallery
Change-Id: Ia629959f7c803325717c6e24ca049a96cf971520

Fix: 304697323
Test: N/A
Change-Id: I4c7c0cd7f822a348a65282eac13db3c3947d38a2

[automerger skipped] Merge "[Cherry-pick] Load native GLES driver when specified." into main am: 40e068e6 am: 3a26c1df -s ours am: f752f66f -s ours

am skip reason: Merged-In I5b0b6df40daf436eb81009c83a5b585531765f4c with SHA-1 a19c130b is already in history

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



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

* changes:
  Disable use_resource_processor for framework-res
  Disable use_resource_processor for aapt2 integration tests

This reverts commit ccbcf335.

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

Change-Id: If5f2d63140f58add543fb0a9a4ca8895a683be37

[automerger skipped] Merge "[Cherry-pick] Load native GLES driver when specified." into main am: 40e068e6 am: 3a26c1df -s ours

am skip reason: Merged-In I5b0b6df40daf436eb81009c83a5b585531765f4c with SHA-1 a19c130b is already in history

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



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

[automerger skipped] Merge "Fix getWallpaperSafeLocked" into udc-qpr-dev am: 417b153e am: 146583ef -s ours

am skip reason: Merged-In Ib37f83233deac7198997910991ffcce75b357aae with SHA-1 ec29cb22 is already in history

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



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

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



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

Android Studio uses adb to launch a process for screen mirroring. This
kind of processes is not managed by AMS and run with uid shell or root.
In such a case, that process behaves like a gone Android app so it will
miss display events. This won't impact any normal Android apps.

Check if the uid belongs to an Android app for Android Studio.

Bug: 303684492
Test: Enable display mirroring in Android Studio and check logs
Change-Id: I3fb20327979eca8774f7ddf143b2b8f2386e6b56

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



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

Since ANGLE and native GLES drivers can coexist, when native is
specified, the loader must load the native GLES drivers specified in
ro.hardware.egl. This patch passes this information down to the native
graphics environment so that the EGL loader can properly check.

Bug: b/283858001
Test: atest CtsAngleDeveloperOptionHostTest -c with ANGLE being default
Test: atest CtsAngleDeveloperOptionHostTest -c with native being default
Change-Id: I5b0b6df40daf436eb81009c83a5b585531765f4c
Merged-In: I5b0b6df40daf436eb81009c83a5b585531765f4c