PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,284 Commits 1 Branch 0 Tags
6a8f459e6cc3b926ca056de7481f85888bb87c7c
Commit Graph

108284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chiu
ce0287057e [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours am: 0a32801a7f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552

Change-Id: Ife9e3c0b25ddb40db2ba57158d871b8a911e771b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:37:49 +00:00
Automerger Merge Worker
073aae829d Merge "[automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 2da3d922d5 -s ours" into tm-qpr-dev-plus-aosp 2022-06-30 05:37:29 +00:00
TreeHugger Robot
cef8cb554b [automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 2da3d922d5 -s ours 
am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 5df14831b8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: Ib68a586c09551f159d15779e502fd7767a26f2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:37:26 +00:00
Jason Chiu
efb5229128 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours am: 60328e4308 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552

Change-Id: Id9f344a9b1270b14943c12fc17be4a2e9ead7449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:37:22 +00:00
TreeHugger Robot
060508e0ee Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 0e4e512d7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I50b4faf9421c34826c1870d3ecb84c0c9fcbe4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:37:16 +00:00
Jason Chiu
bbd4ba6097 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: fd87b73bce -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552

Change-Id: I3876504245474d277f00335301cbbd3d8c98b11a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:21:51 +00:00
TreeHugger Robot
d7d9010c66 Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 95dd3a91fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I5d747db63465740453e8f970006cfb70c605b2e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:21:45 +00:00
Jason Chiu
0a32801a7f [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552

Change-Id: Id618e4458a951d98ef0b76384aba09012f402cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:21:40 +00:00
Jason Chiu
60328e4308 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552

Change-Id: I785501cc24716f24a3fbb0c23483f3cb1fe234ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:21:36 +00:00
TreeHugger Robot
2da3d922d5 Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I656847a34246a43506198d2d5a8c9cd6cbb34af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:21:33 +00:00
TreeHugger Robot
0e4e512d7b Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I02ffa271a2896f481148b56558390c1b8f4fee88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:21:31 +00:00
Jason Chiu
919a67d253 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552

Change-Id: Ib8a0de0fd82916e3177ed6c5e7f58d44bead60aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:03:18 +00:00
TreeHugger Robot
10c3e3e56f Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I36354f1a7511077a3499ff95e17992bdffb1f8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:03:13 +00:00
Jason Chiu
fd87b73bce [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552

Change-Id: I3efcde0abdece1f1591e14df6ccc11a54f39803d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:01:53 +00:00
TreeHugger Robot
95dd3a91fc Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: Ib52f8a818aa6601d6e5c0b7e0b0a64e98c85feea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:01:47 +00:00
Jason Chiu
08a312eeed [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19059552

Change-Id: Ia464c9fba5ca19ef3af0c5b66546b955bfdc5f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 05:01:26 +00:00
TreeHugger Robot
526b870f59 Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev 2022-06-30 04:39:49 +00:00
Bill Yi
37a1fad359 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icf0a5a0e0f5c879e0dd77bd297cb0292ba19ef6e
 2022-06-29 18:25:02 -07:00
Bill Yi
2cb8997657 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I47b4ad5429196a3a40323c5515b64b0889e60c67
 2022-06-29 18:21:36 -07:00
Xin Li
d02caacd56 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355 -s ours am: 5c022ddef7 -s ours am: 75f92deb34 -s ours 
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093059

Change-Id: I7332141f16b200c4bd36baac52b46c04065f7568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 00:02:31 +00:00
Xin Li
75f92deb34 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355 -s ours am: 5c022ddef7 -s ours 
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093059

Change-Id: I2e9dc310e15431b643c709b99507f6f8b045aae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:56:48 +00:00
Xin Li
5c022ddef7 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355 -s ours 
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093059

Change-Id: I9e74383c3f36d139ef3a2838d937532fa55cd6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:13:18 +00:00
Cole Faust
ad66ad55ca Fix ExtraText lint errors 
Android lint is being updated, and now
checks for extra text in android manifest
and resource xml files.

Bug: 236431222
Test: Presubmits
Change-Id: Ia74638562af2ba068546cb3c994e1f7f784cf663
 2022-06-29 12:20:39 -07:00
Joshua McCloskey
69cc573b76 Add field to control margin in FaceEnrollIntro 
Problem -> The require scroll mixin seems to scroll an entire device
length when a button click occurs. If you have page content
of 2x device_length + 10 pixels, a user will have to press the more
button twice to scroll this length. With the illustration_margin_bottom
field, devices can tune this parameter to allow the user to press
the more button once.

Fixes: 237474002
Test: Manual.
Change-Id: I9de2d74608260fe835870211a07b96249a8598f8
 2022-06-29 19:07:44 +00:00
Joshua Mccloskey
cbb99980b3 Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: 70a6062446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: Iab2bb36460d7ba8b284fb0050a62e0918954e368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:37:57 +00:00
Joshua Mccloskey
54b7ac755a Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: e30a71787e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I80312c96248ff2231386c154ebe0f9bf54ae4f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:37:37 +00:00
Joshua Mccloskey
70a6062446 Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: If3bf0ca501d6a5bb460fa0ab05ae39239f34720e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:12:08 +00:00
Joshua Mccloskey
e30a71787e Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I4574d7014cfb6ca9050428e451654b9e8002995b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:12:05 +00:00
Joshua Mccloskey
431542dddc Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev 2022-06-29 16:48:53 +00:00
Xin Li
b8d6e73355 Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
Change-Id: I9d69bcbc6916176beece2616f152ebd3d74fc0f8
 2022-06-28 21:23:28 +00:00
Joshua McCloskey
cdb654f9be Fixed unicorn multi-enrollment flow. 
Test: Verified that Unicorn SUW flows can now
enroll a face.
Test: Verified normal SUW flow works as expected.

Fixes: 237088482
Fixes: 234663447
Change-Id: I9c4100f61b5e7d40fc9ed67c6918ec7bf31fc30a
 2022-06-28 17:08:40 +00:00
SongFerng Wang
84c0900c8a [automerger skipped] Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b am: f0973dfa33 -s ours am: 96aca02753 -s ours 
am skip reason: Merged-In Idb746e42480f99846efb5d1e4d4a411a5a9ca296 with SHA-1 cefad1e4b7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: I3d6d8cfe7f6412b84a98f6edb3b3f7a2fdec7f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:24:51 +00:00
SongFerngWang
85bda3b09f [automerger skipped] The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 am: 7c173b36f8 -s ours am: 9f1ce23550 -s ours 
am skip reason: Merged-In Iac661206def4d43bc40ab9bb1938f084926899c2 with SHA-1 6426382e90 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I87493c9cd5c65b40d1cddf6da98ab0c946b0d7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:24:47 +00:00
SongFerng Wang
96aca02753 [automerger skipped] Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b am: f0973dfa33 -s ours 
am skip reason: Merged-In Idb746e42480f99846efb5d1e4d4a411a5a9ca296 with SHA-1 cefad1e4b7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: I7fe8794b536147a489e9689fb174d9435695703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:08:51 +00:00
SongFerngWang
9f1ce23550 [automerger skipped] The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 am: 7c173b36f8 -s ours 
am skip reason: Merged-In Iac661206def4d43bc40ab9bb1938f084926899c2 with SHA-1 6426382e90 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I59e3dc774cd97748239407b1f89374dfd09e9827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:08:47 +00:00
SongFerng Wang
f0973dfa33 Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: Iecbe5647bbe469a0239b594692f66c0226e16df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:09 +00:00
SongFerngWang
7c173b36f8 The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I6e57db85b4d10586d111e39dcd7ee77e67fd9d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:05 +00:00
Amy Hsu
c013013dfc Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 am: 414d2bf243 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I6301ed46ad49e77164eada14ff50cb4916c9eb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:24:39 +00:00
Amy Hsu
2ecdab0154 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 am: 6de8a405d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I6c0d60693e62bf0fbed8f58ee5571dcf2702638f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:24:19 +00:00
SongFerng Wang
2225b7058b Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: I45a7c8fd77798a873db7ea10683b861ee83b8622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 10:10:23 +00:00
SongFerngWang
787a0e0249 The UI only shows the active LE device am: 7f6fcce1d5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I19dc6c505e7ec9824cf520824ea1ed2d9dcfc196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 10:10:22 +00:00
Amy Hsu
414d2bf243 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I7adc73353a1674fd950ef211cedc857da1d235c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 09:35:42 +00:00
Amy Hsu
6de8a405d7 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: Ia2572f07b47813095947d15d4665a378c1756f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 09:35:41 +00:00
SongFerng Wang
e27d1790f8 Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" 
* changes:
  Fix the testcase error
  The UI only shows the active LE device
 2022-06-28 09:27:02 +00:00
Amy Hsu
d5279ceae3 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev 2022-06-28 09:09:23 +00:00
SongFerngWang
30a312975c Fix the testcase error 
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.

Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
Merged-In: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
 2022-06-28 15:18:39 +08:00
SongFerngWang
7f6fcce1d5 The UI only shows the active LE device 
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
Merged-In: Iac661206def4d43bc40ab9bb1938f084926899c2
 2022-06-28 15:03:07 +08:00
SongFerng Wang
87b049196b Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: 2bcd1f3897 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: If8ec1bb3d52f4254a46d9d21e31ec1a9372978a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:36:09 +00:00
SongFerng Wang
8a00f325f4 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: c150fe528d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: Icfcdf386740d4ad79d45923a9a0fce5c4306a5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:35:52 +00:00
SongFerng Wang
2bcd1f3897 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: Ic44ab60d81ed96478ace362f50df8919fcfa52cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:20:38 +00:00