Commit Graph

813479 Commits

Author SHA1 Message Date
Sarp Misoglu
2ed20d77d0 Merge "Add OWNERS file for core/j/c/a/server/backup" am: 1be316ae02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2386272

Change-Id: Ib00c55eec9bbfcd3b1b513bcf9638e9fb22bdfc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 12:00:51 +00:00
Betty Chang
a837beb173 Merge "[LE Audio] To fix the QR Code parse error" am: 114052e5a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2383977

Change-Id: I7d500998ca11bf182df9d198428d183be71f096e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 11:58:36 +00:00
Chris Li
5eb562f5e1 Merge "Avoid resursion for sleep check in embedding window" am: e5053160d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2383980

Change-Id: I544ac6b7f6d9bafedf6c439ec64e12ede1d09af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 11:56:38 +00:00
Sarp Misoglu
1be316ae02 Merge "Add OWNERS file for core/j/c/a/server/backup" 2023-01-13 11:52:22 +00:00
Betty Chang
114052e5a4 Merge "[LE Audio] To fix the QR Code parse error" 2023-01-13 10:34:12 +00:00
Chris Li
e5053160d8 Merge "Avoid resursion for sleep check in embedding window" 2023-01-13 10:26:19 +00:00
Sarp Misoglu
e8cf2ee0a6 Add OWNERS file for core/j/c/a/server/backup
Change-Id: I97025614c3212d204eed12a24f591f06e5aa0d76
2023-01-13 10:02:02 +00:00
Xin Li
69cd53b1da Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master 2023-01-13 07:33:01 +00:00
changbetty
429c14f305 [LE Audio] To fix the QR Code parse error
Bug: 242023882
Test: manual test
Change-Id: I4dcfb72a038289a480bff21f2ec4756edb441eb2
2023-01-13 07:22:10 +00:00
tanxiaoyan
98bf8975b2 Avoid resursion for sleep check in embedding window
Avoid recursion among check for sleep and complete pause during sleeping for embedding window.

Bug:265231982

Change-Id: Iad507c29390f68559508e393a97770842160e35e
Signed-off-by: tanxiaoyan <tanxiaoyan@xiaomi.com>
2023-01-13 15:13:22 +08:00
Chalard Jean
1063207d4c Implement an API to block non-enterprise networks
Test: New CTS in aosp/2384597
Change-Id: I0931cf120ea487c6c5fb2eead6608a94bd6183cc
2023-01-13 15:16:48 +09:00
Thomas Nguyen
40acd63f1b Merge "Add one new method is3gpp" am: 22d665d62d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2385999

Change-Id: I14a859b01a41a672f5579c48aa446a5f417bbc1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 01:03:59 +00:00
Thomas Nguyen
22d665d62d Merge "Add one new method is3gpp" 2023-01-13 00:22:35 +00:00
Trevor Black
449f4269e2 Revert "Revert "Move Matrix operations multiplyMM and MultiplMV ..."
Revert submission 2382753-revert-2208281-opengl-matrix-VRTQUTHPDK

Reason for revert: Revert-Revert-with-fix

Reverted changes: /q/submissionid:2382753-revert-2208281-opengl-matrix-VRTQUTHPDK

Change-Id: I8bde74db4e9fde278a6d53c1784d3a65530c5173
2023-01-13 00:02:48 +00:00
Thomas Nguyen
247cc83d54 Merge "Fix for GSM-8bit encoding error" am: d120002396
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2385997

Change-Id: Ia4da4977e01516b413c88e8aa4db84cb29151d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 22:41:17 +00:00
Thomas Nguyen
e01cc2e5df Add one new method is3gpp
Bug: 262735040
Test: atest android.telephony.cts.VisualVoicemailServiceTest
      Verified with live test that voice mail is received

Change-Id: Idae7ad9580f3c98e5f253e9e0627f68f5f87967b
2023-01-12 22:26:13 +00:00
Thomas Nguyen
d120002396 Merge "Fix for GSM-8bit encoding error" 2023-01-12 21:59:13 +00:00
Thomas Nguyen
ff3030932a Fix for GSM-8bit encoding error
Bug: 253538769
Test: atest android.telephony.cts.VisualVoicemailServiceTest

Change-Id: I63dca4369c7b4285abb99bfffffe8fd9edbf9443
Merged-In: I63dca4369c7b4285abb99bfffffe8fd9edbf9443
2023-01-12 20:10:55 +00:00
Yan Yan
ae1693117c Merge "Automatically add FEATURE_IPSEC_TUNNEL_MIGRATION for U/U+ devices." am: 3653fce54c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634882

Change-Id: Ifb2807c681e36222f456863b57ef233923ea5694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 18:51:05 +00:00
Sarp Misoglu
d9d3ff4145 Merge "Fix OWNERS file for IBackupAgent.aidl" am: 268ecb069d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2386312

Change-Id: Ie4aff3624d8600c8bf3cbaef0f8ddc060ca9389e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 18:48:40 +00:00
Yan Yan
3653fce54c Merge "Automatically add FEATURE_IPSEC_TUNNEL_MIGRATION for U/U+ devices." 2023-01-12 18:39:30 +00:00
Sarp Misoglu
268ecb069d Merge "Fix OWNERS file for IBackupAgent.aidl" 2023-01-12 18:03:24 +00:00
Sarp Misoglu
0b05cf3d00 Fix OWNERS file for IBackupAgent.aidl
Change-Id: I6247c769bf404d667ee3e76f2dfd7ca80aff1dce
2023-01-12 15:44:41 +00:00
Miguel Aranda
d74c5ab44f Merge "Only use concscrypt certs if directory is nonempty" am: cefc5a13e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2384453

Change-Id: I1c79641e46b256371691b4d4f55052fd7680ec25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 10:49:27 +00:00
Miguel Aranda
cefc5a13e9 Merge "Only use concscrypt certs if directory is nonempty" 2023-01-12 10:16:03 +00:00
Treehugger Robot
ea87ce19b3 Merge "usb: Implement the AIDL in framework" am: 1a0ad60b54
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2361484

Change-Id: I08010bbef31b7ef8daa67605fb9bde2d6facfdf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 06:58:40 +00:00
Xin Li
655560a776 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: Idae7ad9580f3c98e5f253e9e0627f68f5f87967b
Change-Id: I31038175caac1de60cbbe53b3862ddeef7c14269
2023-01-11 22:47:07 -08:00
Treehugger Robot
1a0ad60b54 Merge "usb: Implement the AIDL in framework" 2023-01-12 05:37:42 +00:00
Allen Su
52bfbd80bf Merge "Add a OWNER file for App locale test" am: f7d7609677
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2367329

Change-Id: I5e986177de8fbdad84d5b8cfaed2cdcd8d544dca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 03:57:58 +00:00
Allen Su
f7d7609677 Merge "Add a OWNER file for App locale test" 2023-01-12 03:20:17 +00:00
Motomu Utsumi
fdc89e9d80 [automerger skipped] Merge "Revert "Enable tethering namespace accessible in Android native level."" am: 5a38134dbc -s ours
am skip reason: Merged-In If840c79001134d2003cb6f0e03d38b4b4055fb54 with SHA-1 2c9d35b5b3 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873955

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

Change-Id: I82445e797513298f22c363f0f10d2838edabf6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 02:27:04 +00:00
Motomu Utsumi
439d34a491 [automerger skipped] Revert "Enable tethering namespace accessible in Android native level." am: 78ef4714f5 -s ours
am skip reason: Merged-In If840c79001134d2003cb6f0e03d38b4b4055fb54 with SHA-1 2c9d35b5b3 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1873955

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

Change-Id: Ia065ac5640b50175c55afb55695d8e102c645aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 02:27:02 +00:00
Treehugger Robot
b03acdec6c Merge "MediaCodec: check for exceptions when creating crypto info" am: 2f222457a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2281605

Change-Id: I50ec1c70d43ab765dff82ff5e64f3f6cb9136e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 02:25:01 +00:00
Motomu Utsumi
5a38134dbc Merge "Revert "Enable tethering namespace accessible in Android native level."" 2023-01-12 02:23:45 +00:00
Treehugger Robot
2f222457a2 Merge "MediaCodec: check for exceptions when creating crypto info" 2023-01-12 01:45:26 +00:00
Cole Faust
989592b7c2 Merge "Re-enable SystemUILintCheckerTest" am: 891a1cc9fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2383856

Change-Id: Id2b253b3d1bfe956aa2e738459a7a1e2ebe6ece5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 22:34:57 +00:00
Jihoon Kang
abc2e450e1 Merge "java_api_contribution public, module lib module definition for framework base" am: a7916faa4c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2359959

Change-Id: Ifc7a00919f48babdfe40fe2b17d172c6507d1eb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 22:34:22 +00:00
Mateus Azis
b2c884668b Add missing nullness annotations to Notification.Action and its Builder.
It is documented that Notification.Action.actionIntent can be null and
what that results
(https://developer.android.com/reference/android/app/Notification.Action#actionIntent), but annotations and equivalent documentations are
missing from the builder and the Action's constructor.

Test: N/A, no functional API change.

Change-Id: Ie6593057e17cb485bdc69988ce2eba10fc3fcfd8
2023-01-11 14:21:40 -08:00
Cole Faust
891a1cc9fa Merge "Re-enable SystemUILintCheckerTest" 2023-01-11 21:52:04 +00:00
Jihoon Kang
a7916faa4c Merge "java_api_contribution public, module lib module definition for framework base" 2023-01-11 21:41:33 +00:00
Android Build Coastguard Worker
e7a5f0bf67 Merge cherrypicks of ['ag/20911782', 'ag/20911787', 'ag/20928109', 'ag/20931541', 'ag/20946106'] into tm-qpr2-release.
Change-Id: I3b539e4fe213b68109336c1ff1f69640e1dbd30e
2023-01-11 20:52:05 +00:00
Winson Chung
2a7b7d08c2 Revert "Ensure that only SysUI can override pending intent launch flags"
This reverts commit c4d3106e34.

Reason for revert: b/264884187, b/264885689 

Change-Id: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba
(cherry picked from commit 7bb933f48ff15d8f08d2185005b7b3e212915276)
Merged-In: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba
2023-01-11 20:51:36 +00:00
Lyn Han
72f7918b1b Revert "Add dumpsys logs to debug lockscreen stack height"
This reverts commit a331639790.

Reason for revert: minimize logging for qpr2

Bug: 265067133

Change-Id: Ife9918c947ff521c7b6fb808a4c8d3ce27a02d67
(cherry picked from commit 8e50c40b0563b9dda8bf6a5d66fa2922526feb16)
Merged-In: Ife9918c947ff521c7b6fb808a4c8d3ce27a02d67
2023-01-11 20:51:30 +00:00
Fabian Kozynski
835d37a84b Make the header INVISIBLE when alpha is 0
That way, clicks are not relayed to children.

Also, make the Reset menu item surface as action if it fits, for better
discoverability.

Test: manual
Test: atest LargeScreenShadeHeaderControllerTest
Fixes: 255708561
Change-Id: I853736f48ea97560f4b9ff438832d1372e0c59cc
(cherry picked from commit 6d4e7a8162)
(cherry picked from commit 1070f0f01184653a9247e3ba401aa5672c11ad84)
Merged-In: I853736f48ea97560f4b9ff438832d1372e0c59cc
2023-01-11 20:51:22 +00:00
omarmt
d23ffc2bb9 NotificationChildrenContainer apply the roundness on NotificationHeaderViewWrapper too
Test: atest NotificationChildrenContainerTest
Test: Checking the roundness behavior by disabling the parent (ExpandableNotificationRow) clipping: I override childNeedsClipping() and if (child == mChildrenContainer) return false
Bug: 263822538
Change-Id: I6b08703c4fcf86ca0e939e8adf640053a297f9ca
(cherry picked from commit f3895a1d3a)
Merged-In: I6b08703c4fcf86ca0e939e8adf640053a297f9ca
2023-01-11 20:51:17 +00:00
Nicolo' Mazzucato
3c90e2ea39 Fix DisplayManager race condition when state is unknown
The race was happening when:

1. STATE_UNKNOWN arrives to PhotonicModulator#setState.
2. Inside PhotonicModulator#setState, mStateChangeInprogress is set to true, and the setState method finishes.
3. in the run loop, in one iteration, we reach mLock.wait() (with mStateChangeInprogress still set to true, as the state changed from something to unknown). Now, setState can be executed again as the lock is not held anymore.
4. A new PhotonicModulator#setState arrives. however, mStateChangeInProgress is true, so mLock.notifyAll() is not called anymore.

It was previously fixed by I903f6392cbe42031aab8ffdbfbe541463d6b5e01 making the display not going to UNKNOWN state anymore, but this cl fixes the general case and revert the changes to set the display to off in `onDisplayChanged`.

Bug: 262294651
Test: Running foldable test suite for 20 times with abtd: before the fix it had high flakiness, after it had 0% flakiness. There are no tests for DisplayPowerState currently.
Change-Id: I165b260d60e03c8e4707c7704847c77a225fd43d
(cherry picked from commit e4fccc2d9f)
Merged-In: I165b260d60e03c8e4707c7704847c77a225fd43d
2023-01-11 20:51:12 +00:00
Miguel
81f532c9a0 Only use concscrypt certs if directory is nonempty
Test: atest TrustedCertificateStoreTest
Bug: 264540110
Change-Id: I5ac47315d3e9cfacb53d27080046a3fd8cfb7878
2023-01-11 20:46:50 +00:00
Matt Gilbride
680c176d84 Merge "Remove stack trace from Binder#getCallingUidOrWtf" am: 6d04006046
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2380512

Change-Id: I597f172672b8ffecb4fc88c6046c4a4abd74fe4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 20:06:08 +00:00
Matt Gilbride
6d04006046 Merge "Remove stack trace from Binder#getCallingUidOrWtf" 2023-01-11 19:17:56 +00:00
Yan Yan
3804613f60 Automatically add FEATURE_IPSEC_TUNNEL_MIGRATION for U/U+ devices.
This change automatically enables the IPSEC_TUNNEL_MIGRATION
feature if the VSR API level is greater than T

This is for OEM convenience to ensure that they do not have to add the
feature for each device that they ship.

Bug: 169169973
Test: Removed feature from device, CTS tested on sunfish that
      the feature does not exist
Change-Id: I4ddaa8803be6e9738a2bd0af6793720571b67ff2
2023-01-11 18:57:36 +00:00