Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
794,500 Commits 3 Branches 0 Tags
ba5540ee252bef312b5cca60446fe4c9ea160057
Commit Graph

794500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Li
ba5540ee25 Merge "Apply TaskFragmentOrganizer changes in one WCT (2/2)" into tm-qpr-dev am: f215542792 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19492304

Change-Id: I629d0ed9d01c8f0c89304ea6cd5e96e0c71c6f89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-21 02:29:36 +00:00
Chris Li
f215542792 Merge "Apply TaskFragmentOrganizer changes in one WCT (2/2)" into tm-qpr-dev 2022-08-21 02:07:04 +00:00
Chris Li
660101fdc7 Apply TaskFragmentOrganizer changes in one WCT (2/2) 
Before, when receive TaskFragment transaction, we apply changes in
multiple WindowContainerTransactions. Now, update to apply all changes
in one WCT for the whole TaskFragment transaction.

Bug: 240519866
Test: pass existing
Change-Id: I943d6232ff226ed6f67367fa9b7f73e1f861de64
Merged-In: I943d6232ff226ed6f67367fa9b7f73e1f861de64
 2022-08-20 20:19:57 +08:00
Daniel Kim
fe8eba1bfd Merge changes from topic "hotword_qpr" into tm-qpr-dev am: 7811c2b731 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19619190

Change-Id: I28658cfe6c943c8d06c86d5f335411d714280fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 01:55:36 +00:00
Daniel Kim
1c307b4ee5 Revert^2 "Add proximity state to the HotwordDetectedResult" am: aa972f2c88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19619189

Change-Id: Ia20d28254c35ede309ac0887d5747aad13371c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 01:55:19 +00:00
Treehugger Robot
754487307e [automerger skipped] Merge "BLE audio: support assigning volume at BLE device connection" am: f986b19767 am: afb1ed66af am: 4bb8c56695 am: d099943a66 -s ours 
am skip reason: Merged-In Ib54267727bc4d47e6999f2b84eab805f23c4955a with SHA-1 ff46cdd950 is already in history

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

Change-Id: Ib15be20137eee7fdcd200e4217a000f0c884c229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 01:35:54 +00:00
Daniel Kim
7811c2b731 Merge changes from topic "hotword_qpr" into tm-qpr-dev 
* changes:
  Revert "Revert "Refactor ProximityUpdateCallbackInternal to inte..."
  Revert^2 "Add proximity state to the HotwordDetectedResult"
 2022-08-20 01:30:46 +00:00
Treehugger Robot
d099943a66 Merge "BLE audio: support assigning volume at BLE device connection" am: f986b19767 am: afb1ed66af am: 4bb8c56695 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191195

Change-Id: Id113e24c15e61d1211376a5d89ecae09f1ba78ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 01:10:16 +00:00
Atneya Nair
e00eb8aac4 Merge "Prevent modifying mAudioPolicies during iteration" into tm-qpr-dev am: 7926ae7f37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19487769

Change-Id: I0d8d8e86c65d331fb2e19f3083c881732b87b7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 01:01:07 +00:00
Ats Jenk
04898b6956 Merge changes from topic "desktop-windowing-hide" into tm-qpr-dev am: 4c8cb70261 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19660529

Change-Id: I808b3f24cd467f271cb9b34dacfd048025e79e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:59:28 +00:00
Treehugger Robot
4bb8c56695 Merge "BLE audio: support assigning volume at BLE device connection" am: f986b19767 am: afb1ed66af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191195

Change-Id: Ic52f0edfce28e0eeab9244275378a16c6703f6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:51:23 +00:00
Atneya Nair
7926ae7f37 Merge "Prevent modifying mAudioPolicies during iteration" into tm-qpr-dev 2022-08-20 00:48:57 +00:00
Ats Jenk
4c8cb70261 Merge changes from topic "desktop-windowing-hide" into tm-qpr-dev 
* changes:
  Hide some options when desktop mode is available
  Handle desktop mode setting change
 2022-08-20 00:37:53 +00:00
Treehugger Robot
afb1ed66af Merge "BLE audio: support assigning volume at BLE device connection" am: f986b19767 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2191195

Change-Id: I8f5af8c2d3dcaebd77172c7c11531a09f4d1342e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:24:06 +00:00
Automerger Merge Worker
825ef613c6 Merge changes from topic "am-a5bf379bbb554d03a6f985b9e40d85ee" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Use message ID from proto for BT APM notification Bug: 239983569 Test: atest ServiceBluetoothTests" into tm-qpr-dev am: aa19ed3581 -s ours
  [automerger skipped] Use message ID from proto for BT APM notification am: 6a6bfaeb04 -s ours
 2022-08-20 00:17:54 +00:00
Stephanie Bak
cfde4ecd9b [automerger skipped] Merge "Use message ID from proto for BT APM notification Bug: 239983569 Test: atest ServiceBluetoothTests" into tm-qpr-dev am: aa19ed3581 -s ours 
am skip reason: Merged-In I109ea5b7703dbffd01b22ed1c8867a8c96b7c002 with SHA-1 8d48b7db19 is already in history

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

Change-Id: I6bfb1a0c6eb769c01fbbacb10a19bc7ad220cd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:17:29 +00:00
Stephanie Bak
46d44c7e70 [automerger skipped] Use message ID from proto for BT APM notification am: 6a6bfaeb04 -s ours 
am skip reason: Merged-In I109ea5b7703dbffd01b22ed1c8867a8c96b7c002 with SHA-1 8d48b7db19 is already in history

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

Change-Id: I580902be79a9cc22bfd66c77e92b718276549d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:17:14 +00:00
Daniel Norman
666e31ad53 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e am: 7518f9e0ab am: d816a1e89e am: 3b83bc7b4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: Ib622e8e885e113a71a57ab4a55451c8f6cab808e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:16:34 +00:00
Automerger Merge Worker
dedff55cae Merge "Merge "Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc am: 6e81c5b231" into tm-d1-dev-plus-aosp am: 9139182154" into tm-qpr-dev-plus-aosp 2022-08-20 00:16:26 +00:00
Automerger Merge Worker
5b4ae25666 Merge "Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e am: 7518f9e0ab am: d816a1e89e am: 670b1bda27" into tm-qpr-dev-plus-aosp 2022-08-20 00:16:07 +00:00
Automerger Merge Worker
5c1b30177b Merge "Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc am: 6e81c5b231" into tm-d1-dev-plus-aosp am: 9139182154 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I73c60bec8e096957366b5383d5f19c6d0b736748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:16:00 +00:00
Stephanie Bak
aa19ed3581 Merge "Use message ID from proto for BT APM notification Bug: 239983569 Test: atest ServiceBluetoothTests" into tm-qpr-dev 2022-08-20 00:15:42 +00:00
Daniel Norman
a5fa239a03 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e am: 7518f9e0ab am: d45d17b64b am: 99eee12d8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I81361807659720fbea93aa34a39f842c06502ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:15:39 +00:00
Daniel Norman
998ab156b8 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e am: 7518f9e0ab am: d816a1e89e am: 670b1bda27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I359cd101707eb3268e73838b9fe0d403564cd0ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:15:06 +00:00
Daniel Norman
c93de54fcf Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc am: a4d4875f40 am: be7dabd8e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I7ab9c8ab30d69c751439c3a2c33a7f4e26ed9236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:14:55 +00:00
Daniel Norman
500de78a59 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc am: 6e81c5b231 am: 929a589a90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: Ifa3953442260be4c582c48a713e9d7e0f6836eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-20 00:14:16 +00:00
Daniel Norman
3b83bc7b4e Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e am: 7518f9e0ab am: d816a1e89e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I9782d8249defca510238ef9f2316f6a2811d2ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:57:56 +00:00
Automerger Merge Worker
9139182154 Merge "Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc am: 6e81c5b231" into tm-d1-dev-plus-aosp 2022-08-19 23:57:47 +00:00
Treehugger Robot
f986b19767 Merge "BLE audio: support assigning volume at BLE device connection" 2022-08-19 23:57:37 +00:00
Daniel Norman
670b1bda27 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e am: 7518f9e0ab am: d816a1e89e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I0cc2ce48899068e0cb5b2af61ae2162a711eb1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:57:29 +00:00
Daniel Norman
99eee12d8a Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e am: 7518f9e0ab am: d45d17b64b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: Ic434f3fd5a127139426e26ee0b7f85c734616260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:57:29 +00:00
Daniel Norman
be7dabd8e5 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc am: a4d4875f40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I68a2d029226960146728d175a571e8bea234f891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:57:15 +00:00
Daniel Norman
4719b5ec6e Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc am: 6e81c5b231 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: Icb31ba140bda6872c4cd118f48999bcea6b2101f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:57:13 +00:00
Daniel Norman
929a589a90 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc am: 6e81c5b231 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I93640e826a316cf71d5e0d47cb5fbc99926e7154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:57:11 +00:00
Daniel Norman
d45d17b64b Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e am: 7518f9e0ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I630560ec945caef09c1b291877e038d4666943ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:47:32 +00:00
Daniel Norman
d816a1e89e Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e am: 7518f9e0ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: Ifa999369c3b70a9963692219b54c921f26718758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:40:21 +00:00
Daniel Norman
6e81c5b231 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I4f0e1ae9360983b4e89f041ffb578cc10000df58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:40:14 +00:00
Daniel Norman
a4d4875f40 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d am: 6eb48ea8cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I326539b4b3a838de8cd78b5e97cf3cbbaed9d55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:38:05 +00:00
Daniel Norman
7518f9e0ab Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 am: b6e37f6f9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I2a575f976521b2a9d1b193d36040d6b5fae8e1b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:38:05 +00:00
Daniel Norman
b6e37f6f9e Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 3e2e588385 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I6216a188d70536b0ab79ffc0e046d29768048211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:12:10 +00:00
Daniel Norman
6eb48ea8cc Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 am: 9a8703766d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I294fb9cb727bd2a1d2d18f5a53cc4b588e2ef70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:12:06 +00:00
Yan Yan
6817cb01ac Merge "Revert "Add three new IKE options in IkeSessionParamsUtils"" am: c271a2da6a am: 9c20b1ede6 am: 92ac8f2ac9 am: 3f7609bf0c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2190278

Change-Id: If7deb604569351e2ed4f054f259642f181e346cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 23:03:21 +00:00
Daniel Norman
3e2e588385 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: Ic15bc81b0e896c20fd23ac98ed91e6d8a459e3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 22:54:53 +00:00
Daniel Norman
9a8703766d Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec am: 47f7686223 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I5de28adadf09a2f750e099c59ae907f2fb6256e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 22:53:51 +00:00
Yan Yan
3f7609bf0c Merge "Revert "Add three new IKE options in IkeSessionParamsUtils"" am: c271a2da6a am: 9c20b1ede6 am: 92ac8f2ac9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2190278

Change-Id: I157265a47ddbc5bab843326414d3374d2d492d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 22:46:11 +00:00
Hongwei Wang
664672f40f Merge "Deprecate SyncRtSurfaceTransactionApplier in PiP" into tm-qpr-dev am: d6f9be6441 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19645616

Change-Id: I8cf1fcb68f0681b48c0c5abc09ec41bf2e699da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 22:28:46 +00:00
Hongwei Wang
e38914405d Merge "[Re-land] Remove getSfInstance usage from ViewRootImpl" into tm-qpr-dev am: 5238c74d09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19600075

Change-Id: Ic93af6c2551e85c439765e3e47592a25d51fac5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 22:28:26 +00:00
Cole Faust
93e7ddd44e Merge "Mark SystemUI-tests as test code for lint" am: 0b33d054b3 am: f214872067 am: 5954744b9c am: d4e5c17068 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2184008

Change-Id: Iecb83dcb0c2051141b8c1a7a173433da97918784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 22:28:04 +00:00
Daniel Norman
47f7686223 Merge "Do not send AccessibilityEvent if notification is for different user." into rvc-dev am: f914ec1768 am: d000f2dbec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19608552

Change-Id: I49cb01f9461d831ecb7ecc1b1dd32c1273164bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 22:27:22 +00:00
Yan Yan
92ac8f2ac9 Merge "Revert "Add three new IKE options in IkeSessionParamsUtils"" am: c271a2da6a am: 9c20b1ede6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2190278

Change-Id: I7ce2e933dba9a113d5696dbe4564a7a4816a3680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 22:19:40 +00:00