Commit Graph

813479 Commits

Author SHA1 Message Date
Treehugger Robot
75e703a7bd Merge "[Bugfix]create different pendingintent via appwidgetId" am: 71a5559a8b am: c25019ff07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2370509

Change-Id: I46499071a6b68ec4749defc1bc8a376942c85ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 22:54:18 +00:00
Treehugger Robot
71a037c25d Merge "TP - Message reference for SMS SUBMIT type" am: 3aee49a593 am: 5a85d8a74f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378849

Change-Id: I531a79f8ace273e3e06afff1c400a896a72e05ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 22:53:26 +00:00
Treehugger Robot
c25019ff07 Merge "[Bugfix]create different pendingintent via appwidgetId" am: 71a5559a8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2370509

Change-Id: Ifd3afe28f0071150a4f1cc05976ddc49531db27a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 22:23:58 +00:00
Treehugger Robot
5a85d8a74f Merge "TP - Message reference for SMS SUBMIT type" am: 3aee49a593
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378849

Change-Id: Iff25ebbd6d9113ec24d2ce14580b5db5612a9b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 22:22:30 +00:00
Treehugger Robot
71a5559a8b Merge "[Bugfix]create different pendingintent via appwidgetId" 2023-01-06 21:54:02 +00:00
Aishwarya Mallampati
03992b38b4 Add user handle in SimInfo database.
Bug: 247166170
Test: Basic testing,
       atest com.android.providers.telephony.TelephonyDatabaseHelperTest,
       atest com.android.providers.telephony.TelephonyProviderTest
Merged-In: I899a9ecb93f6f972aa12233fe4380e6d05405791
Change-Id: I899a9ecb93f6f972aa12233fe4380e6d05405791
2023-01-06 21:46:20 +00:00
Treehugger Robot
3aee49a593 Merge "TP - Message reference for SMS SUBMIT type" 2023-01-06 21:43:58 +00:00
Treehugger Robot
f3be8c92af Merge "Add owners for Overlayproperties file." am: d37100e347 am: 10546fdfb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2366537

Change-Id: I98008a5122388bfd0d8f41b75b477ba95258432e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 21:31:53 +00:00
Jack Yu
ec6766ef7b Merge "Merge similar data profile - ignore gid difference" am: d403dae9b8 am: 7c9054f785
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378848

Change-Id: I53cf9c3882bc0c940b6081075213aaab97d5eb01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 21:31:20 +00:00
Treehugger Robot
10546fdfb5 Merge "Add owners for Overlayproperties file." am: d37100e347
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2366537

Change-Id: I89d8361d3892b03ef8ea7cc42ee70ac671a99819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 21:03:59 +00:00
Jack Yu
7c9054f785 Merge "Merge similar data profile - ignore gid difference" am: d403dae9b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378848

Change-Id: I844fa9012adf3b137f9eeda8a2fd6add55dc49fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 21:00:27 +00:00
Treehugger Robot
d37100e347 Merge "Add owners for Overlayproperties file." 2023-01-06 20:53:21 +00:00
Jag Saund
d248c91ced Camera: Register LensShadingMap marshaler
- CameraMetadataNative has a LensShadingMap unmarshaler to unpack the
  LensShadingMap in to an object
- this adds the marshaler to pack the LensShadingMap into
  CameraMetadataNative

Test: atest frameworks/base/core/tests/coretests/src/android/hardware/camera2/impl/CaptureMetadataNativeTest.java
Bug: 264307946

Change-Id: Ic8eedcea4b65df34ae63b9b43059d77278c76b34
2023-01-06 20:32:02 +00:00
Bill Yi
ec6bc422b7 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: f7df86ee44 -s ours am: 8038c0ba7d -s ours
am skip reason: Merged-In I6c001e8ab8ef233c4e764d7c6753429b472dac94 with SHA-1 a40a18edcc is already in history

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

Change-Id: I8cff47e3f1a4a8f3380fd328892fd6e072139ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:26:52 +00:00
Bill Yi
1bb0cb4bbd [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 2274b9a64e -s ours am: 55e04f10ec -s ours
am skip reason: Merged-In I6c001e8ab8ef233c4e764d7c6753429b472dac94 with SHA-1 a40a18edcc is already in history

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

Change-Id: I6918108b0d9c9c51005ec9802f911802104dcb3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:26:01 +00:00
Beverly Tai
ecf55b23bf Merge "Update lock icon view when biometrics cleared" into tm-qpr-dev am: 6651ac5100
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20883842

Change-Id: I9a3657666ebc0c952e333415e718ca9f392e7a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:22:54 +00:00
Jack Yu
d403dae9b8 Merge "Merge similar data profile - ignore gid difference" 2023-01-06 20:22:31 +00:00
Beverly Tai
6651ac5100 Merge "Update lock icon view when biometrics cleared" into tm-qpr-dev 2023-01-06 20:13:25 +00:00
Shan Huang
9970ac99bc Merge "Allow IME to register system back callbacks in ImeOnBackInvokedDispatcher#switchRootView." into tm-qpr-dev am: 467383f0fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20874663

Change-Id: I60b4dc86284c54e956c84054cec3d696465eafc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:05:52 +00:00
Pietro Maggi
448a01755a Merge "Docs: Updating NFC and QR provisioning information" into tm-dev am: 5ebf0a5685 am: bfc6364c74 am: b8f0a2b550
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20881922

Change-Id: I05763b9b42fa89fbc491dac93d7c326728a2ff28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:04:52 +00:00
Bill Yi
8038c0ba7d [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: f7df86ee44 -s ours
am skip reason: Merged-In I6c001e8ab8ef233c4e764d7c6753429b472dac94 with SHA-1 a40a18edcc is already in history

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

Change-Id: I708a2bf39fabe664050171aad5546b1617276ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:00:45 +00:00
Bill Yi
55e04f10ec [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 2274b9a64e -s ours
am skip reason: Merged-In I6c001e8ab8ef233c4e764d7c6753429b472dac94 with SHA-1 a40a18edcc is already in history

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

Change-Id: I128587c3c0fc36f980ef2248906b017283dfa72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 19:59:58 +00:00
Shan Huang
467383f0fd Merge "Allow IME to register system back callbacks in ImeOnBackInvokedDispatcher#switchRootView." into tm-qpr-dev 2023-01-06 19:54:30 +00:00
Nolan Scobie
ff0bf7b109 Enable hwui_unit_tests in presubmit for libs/hwui
Test: presubmits
Bug: 257123741
Change-Id: I4a5f754875936b757c6d239f9d1a087386a4087e
Merged-In: I4a5f754875936b757c6d239f9d1a087386a4087e
2023-01-06 14:47:04 -05:00
Nolan Scobie
24921a0325 Fix GraphicsStats#findRootPath and disable CacheManager#trimMemory tests
...in hwui_unit_tests

Test: atest hwui_unit_tests
Bug: 257123741
Bug: 258700630
Change-Id: Ibadb457d0c8f45ceca8153320ae5b896ae55bba2
Merged-In: Ibadb457d0c8f45ceca8153320ae5b896ae55bba2
2023-01-06 14:45:49 -05:00
Nolan Scobie
1aa54918b8 Change hwui_unit_tests (and benchmarks) to push to non-root writable dir
...and switch to more appropriate "general-tests" suite type.

This allows the test suite to be run in certain lab/infra scenarios,
like on ABTD.

Docs
device-tests to general-tests:
https://source.android.com/docs/core/tests/development/test-mapping#packaging_build_script_rules

Tests
Without this change: [redacted]
(tooling fails to push content)
With this change: [redacted]
(gets past tooling failure, and fails on an actually failing unit test)

Test: see internal CL for links
Bug: 257123741
Change-Id: I33696a0f1c9279622138e4dc4c49d73c99f359eb
Merged-In: I33696a0f1c9279622138e4dc4c49d73c99f359eb
2023-01-06 14:43:26 -05:00
Pietro Maggi
b8f0a2b550 Merge "Docs: Updating NFC and QR provisioning information" into tm-dev am: 5ebf0a5685 am: bfc6364c74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20881922

Change-Id: I78121ab86eaa8c8a58995618978b780a5eb0c2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 19:34:02 +00:00
Bill Yi
f7df86ee44 Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:50 +00:00
Seth Moore
44e66d3522 Merge "Add unit tests for RemoteProvisioningRegistration" am: 6c5c89edc5 am: 5cc7f80a84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2359449

Change-Id: I3b324dd567756bc53bc27e53a4e7629bd89b8f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 19:31:52 +00:00
Pietro Maggi
bfc6364c74 Merge "Docs: Updating NFC and QR provisioning information" into tm-dev am: 5ebf0a5685
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20881922

Change-Id: I9dfdd6c824006d32793fbfacaa73745ff48e09ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 19:00:59 +00:00
Dave Mankoff
e676fa4fe4 Merge "Adding a feature flag for Auto Pin Confirmation feature" into tm-qpr-dev am: d999318f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20860082

Change-Id: I49c16597941103ac67e6d8d0fba34c146ddc2479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 19:00:22 +00:00
Seth Moore
5cc7f80a84 Merge "Add unit tests for RemoteProvisioningRegistration" am: 6c5c89edc5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2359449

Change-Id: I9955d8850b8d0d9a31f2fa2b5fae30e6d2d5b9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 18:59:47 +00:00
Dave Mankoff
d999318f3a Merge "Adding a feature flag for Auto Pin Confirmation feature" into tm-qpr-dev 2023-01-06 18:42:01 +00:00
Bill Yi
c2ca3862e2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 46906927a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1c51ec3902f09bb61d67e7bb0fbfa7e1bf9334eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 18:31:43 +00:00
Bill Yi
d41649a08d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09340b651b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10b09c770741f9fa53180efa4b0e0d25c184a327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 18:31:32 +00:00
Bill Yi
8b974623bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a64a66c8b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic91f84c48029b9558a156c641aef69c4ad7d5c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 18:31:21 +00:00
Bill Yi
9d713e47c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d9ca18593 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91fa0668cc7454d8580280acbf2c0ba5460b7307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 18:30:40 +00:00
Seth Moore
6c5c89edc5 Merge "Add unit tests for RemoteProvisioningRegistration" 2023-01-06 18:25:14 +00:00
Xiaowen Lei
e9c64702fa Merge "Add feature flag for Smartspace date/weather decoupling." into tm-qpr-dev am: ad829f2c1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20873047

Change-Id: I5a1bafc24d907b8a14b913a4f428e9eeb52952e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 18:25:09 +00:00
Bill Yi
46906927a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-06 18:19:09 +00:00
Bill Yi
a64a66c8b9 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-06 18:19:09 +00:00
Pietro Maggi
5ebf0a5685 Merge "Docs: Updating NFC and QR provisioning information" into tm-dev 2023-01-06 18:17:45 +00:00
Winson Chung
9a81477e86 Fix issue with leaking death recipients
- When invalidating an existing external interface, we also need to
  unregister any listeners to ensure that binder death recipients are
  unlinked.  Otherwise, a crash in the process for the old listener
  can cause the current listener to be unregistered.

Bug: 242377577
Test: atest WMShellUnitTests
Change-Id: Ibb77ac19e4ebc616b8977db70d6269e3b930848e
2023-01-06 17:53:56 +00:00
Rupesh Bansal
c16b2af4a2 Setting the display state to off when the default display is being changed
This fixes the issue of the display state change always being "in progress". PhotonicModulator thread fails to make any progress while waiting for a notify call to release the lock. This happensbecause the screenState is set to invalid when a device is being folded/unfolded, forcing it to wait until the screen state is recovered.

Bug: 262294651
Test:  adb shell dumpsys display | grep "Photonic Modulator" -A 10 ->
Shows mStateChangeInProgress is false
Test: Manually folding/unfolding the device wont cause the display stuck
in the power off state

Change-Id: I903f6392cbe42031aab8ffdbfbe541463d6b5e01
2023-01-06 17:50:37 +00:00
Xiaowen Lei
ad829f2c1b Merge "Add feature flag for Smartspace date/weather decoupling." into tm-qpr-dev 2023-01-06 17:46:36 +00:00
Victor Chang
ede03c5e04 Remove libandroidicu usage
libandroidicu may be removed in the future.

Bug: 223366263
Bug: 263852499
Test: m droid
Change-Id: I1c2bf1e0c3da7975264d87c1855d964350bda46a
2023-01-06 17:06:03 +00:00
Ramya Manoharan
1c1f103cbd TP - Message reference for SMS SUBMIT type
Addition of the TP - Message reference in pdu for SMS-SUBMIT type
Test: Build
Bug: 228299168

Merged-In: I3a64b79478d16d730c921fbfdd050fc014eec7b5
Change-Id: I3a64b79478d16d730c921fbfdd050fc014eec7b5
2023-01-06 08:34:58 -08:00
Ling Ma
dc0f4bd401 Merge similar data profile - ignore gid difference
Fix: 240225494
Test: atest
Merged-In: Id203a3ba71adb3783edcf2c1e1f885c129e9328a
Change-Id: Id203a3ba71adb3783edcf2c1e1f885c129e9328a
2023-01-06 08:22:08 -08:00
Bhavuk Jain
a8e2cf42bb Adding a feature flag for Auto Pin Confirmation feature
This change aims at adding a feature flag for Auto Pin Confirmation
Feature in the auto_pin_confirmation namespace

Test: Tested by building and flashing on local
Bug: b/262928040
Change-Id: I31c46ef63dd5a9feb1aee91e5ce7bd67b7e7e19d
2023-01-06 15:56:27 +00:00
Bill Yi
2274b9a64e Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE
Merged-In: I6c001e8ab8ef233c4e764d7c6753429b472dac94
Merged-In: If3c3110031ae04df59ed4e488714d187638d801a

Change-Id: I200e0524debf868b3764affa35030a7831e7ecbe
2023-01-06 15:27:51 +00:00