Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
801,016 Commits 3 Branches 0 Tags
e4e27b7838358f026a22e180b4e59ba71bd5632a
Commit Graph

801016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
e4e27b7838 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4378f3ab30 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I807cb95e309839d0c6b92e2aa9cc713da01d8291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 04:23:31 +00:00
Bill Yi
b7dd576919 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f1a52d6748 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bdc94b3dd81d555b51a8b30e64d1f5dfb65b689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 04:23:24 +00:00
Bill Yi
f507703ae7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a1145e2c73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id722ddf178fa92f013582fc360874f96ff23707d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 04:23:17 +00:00
Bill Yi
2cf17f4baf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3f6a88102 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib38085b10fc7f69a9e6fcec9e35941d429ef0a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 04:22:44 +00:00
Bill Yi
4378f3ab30 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-23 03:53:14 +00:00
Bill Yi
a1145e2c73 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-23 03:53:14 +00:00
Hongwei Wang
0a7cff9fbb Merge "Propagate PiP param change on RemoteAction update" into tm-qpr-dev am: 82f8dc17f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20030204

Change-Id: Ie5c6872ae5d2b9adf2b59bb042a4a387bcfae7b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 03:08:28 +00:00
Rasheed Lewis
c0750d5571 Merge "Updated QS airplane mode icons again" into tm-qpr-dev am: 363318fd8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20025789

Change-Id: I341668282c67d46825a2d65863adb26506d00de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 03:07:02 +00:00
Hongwei Wang
82f8dc17f7 Merge "Propagate PiP param change on RemoteAction update" into tm-qpr-dev 2022-09-23 02:42:52 +00:00
Rasheed Lewis
363318fd8a Merge "Updated QS airplane mode icons again" into tm-qpr-dev 2022-09-23 02:41:12 +00:00
Cliff Wu
4121435dce Merge "Fixed camera streaming not being blocked when user taps camera on personal streaming apps" into tm-qpr-dev am: a4ae390f13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19911205

Change-Id: I7ff8ecb73a46442aaa93300da8c2a84aecf43eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 01:57:44 +00:00
Cliff Wu
a4ae390f13 Merge "Fixed camera streaming not being blocked when user taps camera on personal streaming apps" into tm-qpr-dev 2022-09-23 00:17:47 +00:00
Automerger Merge Worker
fe1cdfc21a Merge "Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da am: dec0c59a67" into tm-d1-dev-plus-aosp am: 2a7d9570b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I6d3f64767d6b87beda3441d21a3a8ec3a5c96bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 00:05:25 +00:00
Automerger Merge Worker
a2caef3de9 Merge "Merge "Fix view does not show fill dialog" into tm-qpr-dev am: 5bca0e0058" into tm-qpr-dev-plus-aosp 2022-09-23 00:04:25 +00:00
TYM Tsai
dcc45bdd20 Merge "Fix view does not show fill dialog" into tm-qpr-dev am: 5bca0e0058 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19710492

Change-Id: I24d669ae62f5e5d9a3a1f1c30a6beff57d745460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 00:03:58 +00:00
Julia Reynolds
98f040ff3e Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da am: cfa1d179db am: ccfbb46cc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I74922e253fac37aed2fbce345eb27aa6e182d1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 00:03:51 +00:00
TYM Tsai
a3a76dad4b Merge "Logging UI type within TYPE_AUTHENTICATION_SELECTED" into tm-qpr-dev am: 8185a70f48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19660673

Change-Id: I2c378afec8662bd88d1326a7b6dcdfd680b44e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 00:02:55 +00:00
Julia Reynolds
aeb3c1838c Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da am: dec0c59a67 am: ca8fb7fb02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I264f0c22b8215e3652d10091b082972d40c244ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-23 00:01:59 +00:00
TYM Tsai
5bca0e0058 Merge "Fix view does not show fill dialog" into tm-qpr-dev 2022-09-22 23:42:38 +00:00
TYM Tsai
8185a70f48 Merge "Logging UI type within TYPE_AUTHENTICATION_SELECTED" into tm-qpr-dev 2022-09-22 23:41:15 +00:00
Automerger Merge Worker
2a7d9570b1 Merge "Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da am: dec0c59a67" into tm-d1-dev-plus-aosp 2022-09-22 23:35:53 +00:00
Julia Reynolds
ccfbb46cc2 Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da am: cfa1d179db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: If0d74e3293e1c4315673ac0b53b86fde46b52ce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 23:35:27 +00:00
Julia Reynolds
13acb3e7fd Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da am: dec0c59a67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: If21469fa13fc2bdbe3aaa164cc0c1854c44d39b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 23:35:27 +00:00
Julia Reynolds
ca8fb7fb02 Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da am: dec0c59a67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I73506302464f0805f30ed10a9e70e332d6be68d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 23:35:21 +00:00
Julia Reynolds
dec0c59a67 Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I4d979efeae2715c2484425fc36ac79a36882a9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 23:07:05 +00:00
Julia Reynolds
cfa1d179db Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 am: be4bddc7da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I08182a9c1149313935fe600c3d824e75f9d75a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 23:04:04 +00:00
Hui Wu
9af4e0bd3d Merge "Remove impl of cloudsearch api" into tm-qpr-dev am: aa0ffaee0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20019599

Change-Id: I8475cd36abd09908238d7e996dcc9f5dbf14b784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 22:50:42 +00:00
Hongwei Wang
12415a30ea Propagate PiP param change on RemoteAction update 
We used to only check title/contentDescription/actionIntent of
RemoteAction for uniqueness and ignore the isEnable/shouldShowIcon.

Bug: 234679022
Test: Verify the isEnabled change updates PiP menu
Change-Id: I769507253594b016802b71368ac4a9036f2ad21f
 2022-09-22 15:49:16 -07:00
Hui Wu
aa0ffaee0d Merge "Remove impl of cloudsearch api" into tm-qpr-dev 2022-09-22 22:40:13 +00:00
Sanjana Sunil
0e69c416c2 Merge "Use uid to query list of implicitly queryable packages" into tm-qpr-dev am: 9c0d01990e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20007184

Change-Id: I418aaee1880d65cd5b92ec9cbc9f2bffa1f35652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 22:36:36 +00:00
Julia Reynolds
be4bddc7da Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 am: 182bff9419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: If39b76adfa639ea145118e15e5d9e683f3636392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 22:35:50 +00:00
Jorim Jaggi
1f09cd1808 Merge "Revert "Re-land "Enable LOCAL_LAYOUT""" into tm-qpr-dev am: 52c3498acf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20025004

Change-Id: I1256637878491e8f936ecc19b3617a3a0fbad972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 22:35:38 +00:00
Sanjana Sunil
9c0d01990e Merge "Use uid to query list of implicitly queryable packages" into tm-qpr-dev 2022-09-22 22:30:26 +00:00
Julia Reynolds
182bff9419 Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I980a91fcbd89d6cf280f553a411496d8859054e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 22:10:59 +00:00
Hui Wu
1a25dca0bc Remove impl of cloudsearch api 
Bug: 246376638
Test: Manually Tested
Change-Id: I1740d5e1a0fb25a0fedea0a92e8a901684e35635
 2022-09-22 15:08:56 -07:00
Yuri Lin
b7c57ffd04 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into qt-dev am: da63d3e028 am: 32dfdfc4b7 -s ours am: 8b8e224019 -s ours am: a11ecd6e0f -s ours am: 347cd30b49 -s ours am: 3a115083a2 -s ours am: 0e9b5961c3 -s ours am: dddcfbfc7d -s ours am: 46d6df4c30 -s ours am: 8b951203c9 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 80c0fcf06d is already in history

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

Change-Id: I1d98d1b737a4aa392d82500e970860f41a219c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:49:32 +00:00
Yuri Lin
cb551e2a0b [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into qt-dev am: da63d3e028 am: 32dfdfc4b7 -s ours am: 8b8e224019 -s ours am: a11ecd6e0f -s ours am: 347cd30b49 -s ours am: 3a115083a2 -s ours am: 0e9b5961c3 -s ours am: dddcfbfc7d -s ours am: 105990d1fa -s ours am: c4935e803a -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 80c0fcf06d is already in history

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

Change-Id: Icf3a67f0a5a49f66f008a5de3b863658e83faf5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:49:01 +00:00
Jorim Jaggi
52c3498acf Merge "Revert "Re-land "Enable LOCAL_LAYOUT""" into tm-qpr-dev 2022-09-22 21:48:43 +00:00
Julia Reynolds
3d98470197 Merge "Fix NPE" into rvc-dev am: e26a608623 am: 37d0062f31 am: d39103545d am: f0e5a2896b am: b17a96d0e7 am: 9fe674cccb am: 453f94525a am: 646090fee4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886858

Change-Id: I6da58653220356cd7d5f5488275e0528070aea6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:48:29 +00:00
Automerger Merge Worker
cfb3682a34 Merge "Merge "Fix NPE" into rvc-dev am: e26a608623 am: 37d0062f31 am: d39103545d am: f0e5a2896b am: b17a96d0e7 am: 9fe674cccb am: d731d2a4e8" into tm-d1-dev-plus-aosp am: 143bab0bc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886858

Change-Id: I38a898080ee5692b61d889fbfad59ca8571f1963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:47:54 +00:00
Automerger Merge Worker
116b241517 Merge "Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab99b am: 9cb37b0f37 am: eff219ab6e am: 882e5d7f74 am: fd86694c4d am: 1451b1b4c6" into tm-d1-dev-plus-aosp am: 9ecd5b6834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886857

Change-Id: I1813c4d7b82b52506f9a48f970d660e136c61b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:46:21 +00:00
Julia Reynolds
60201624cf Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab99b am: 9cb37b0f37 am: eff219ab6e am: 882e5d7f74 am: fd86694c4d am: 3053fafe8c am: d2ece79000 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886857

Change-Id: Id78e45ec4b7f98636ec00395e55b92a0ca363123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:44:38 +00:00
TreeHugger Robot
370313e3c4 [automerger skipped] Merge "Fix NPE" into sc-dev am: 5e23d1e783 -s ours am: 96b9bbc9af -s ours am: fcf4bd3a73 -s ours am: 511e243954 -s ours am: c828f3e50b -s ours am: 381d5affd5 -s ours 
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 e51c402650 is already in history

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

Change-Id: Ide728c2a7c18c85c7c4bd38a2a52081c638a372e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:43:40 +00:00
Julia Reynolds
3bab94ce54 Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: I0cf8982d6e0613b714098f147f17653b1d3dd875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:42:37 +00:00
TreeHugger Robot
5cb60192aa [automerger skipped] Merge "Fix NPE" into sc-dev am: 5e23d1e783 -s ours am: 96b9bbc9af -s ours am: fcf4bd3a73 -s ours am: 511e243954 -s ours am: 1633fc66ab -s ours am: 988f6334d9 -s ours 
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 e51c402650 is already in history

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

Change-Id: I499da6559f4ddf9cf7b96f3bafe000a7afd731c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:41:24 +00:00
Yuri Lin
83fd56b729 [automerger skipped] Merge "Limit lengths of fields in Condition to a max length." into qt-dev am: da63d3e028 am: 32dfdfc4b7 -s ours am: 8b8e224019 -s ours am: a11ecd6e0f -s ours am: 347cd30b49 -s ours am: 3a115083a2 -s ours am: 0e9b5961c3 -s ours am: dddcfbfc7d -s ours am: 105990d1fa -s ours am: 2c42836657 -s ours 
am skip reason: Merged-In Ic2fa8f06cc7a4c1f262115764fbd1be2a226b4b9 with SHA-1 80c0fcf06d is already in history

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

Change-Id: Ie0753be3763f8c6b91cf490d4508c1b195f24d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:27:26 +00:00
Julia Reynolds
d1b137a8dd Merge "Fix NPE" into rvc-dev am: e26a608623 am: 37d0062f31 am: d39103545d am: f0e5a2896b am: b17a96d0e7 am: 9fe674cccb am: 453f94525a am: c5f78698e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886858

Change-Id: I7f459ad3b810a6d4365b0e7e407afcfc67172a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:27:02 +00:00
Julia Reynolds
94a46bc6bb Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab99b am: 9cb37b0f37 am: eff219ab6e am: 882e5d7f74 am: fd86694c4d am: 1451b1b4c6 am: 271b476edc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886857

Change-Id: Icc2fe8e01ea0dc1a72f36f8135720855c2dc2a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:26:17 +00:00
TreeHugger Robot
5b8f6d5a2d [automerger skipped] Merge "Fix NPE" into sc-dev am: 5e23d1e783 -s ours am: 96b9bbc9af -s ours am: fcf4bd3a73 -s ours am: 511e243954 -s ours am: c828f3e50b -s ours am: b7f6efd3eb -s ours 
am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 e51c402650 is already in history

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

Change-Id: I135459861822c82b29d5e8199564f56c06a4dbc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:25:42 +00:00
Julia Reynolds
ddaa966ca6 Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859

Change-Id: If307580a9cb955579f74ef80ed8b04b9815e9d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 21:12:41 +00:00