Automerger Merge Worker
c071d20568
Merge "Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e
am: 8a847f4d99" into tm-d1-dev-plus-aosp
2022-05-09 03:41:42 +00:00
Bonian Chen
79c575a98e
Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e
am: 8a847f4d99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699
Change-Id: I8dc99e1a7d8bb6a49cbceeb644932ebb43bbd582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:41:40 +00:00
Bonian Chen
88ce933530
Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e
am: 876f30fd37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699
Change-Id: Ie181bb3db1407e8388d167584ad281bad027ce53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:41:39 +00:00
Automerger Merge Worker
97060cbb88
Merge "Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9
am: 2298027711" into tm-d1-dev-plus-aosp
2022-05-09 03:41:36 +00:00
Bonian Chen
6cb2af7ba1
Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9
am: 2298027711
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214700
Change-Id: Ibcfc2afaa58be58c77b202a1fcc580935d0565da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:41:33 +00:00
Bonian Chen
1b401e85db
Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9
am: abef1274ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214700
Change-Id: I488f351fdb39ca73e4a8ca10e2a92a8953d0bbf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:41:32 +00:00
Automerger Merge Worker
ec486bfe6c
Merge "Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310
am: 1c9ce13822" into tm-d1-dev-plus-aosp
2022-05-09 03:41:29 +00:00
Bonian Chen
c1454d8fbe
Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310
am: 1c9ce13822
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214701
Change-Id: I362ffec1454911c4cd5254b95be494f977afdac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:41:26 +00:00
Bonian Chen
ff3882576f
Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310
am: 5924a2fc7b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214701
Change-Id: Ibb22f148b3019c5573387951fb15dd6d38e5f10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:41:25 +00:00
Bonian Chen
876f30fd37
Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699
Change-Id: I588ade8586c01b7c5631c3524759c12b308cc9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:10:08 +00:00
Bonian Chen
abef1274ac
Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214700
Change-Id: I4aa2a89aab616016f5885019dd31e072c637bc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:10:01 +00:00
Bonian Chen
5924a2fc7b
Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214701
Change-Id: Ib07f0176f098e287b91ee2b2598b900f4c3b535c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:09:53 +00:00
Bonian Chen
8a847f4d99
Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699
Change-Id: Iac00062831079b367612adedf60f0492589ab008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:08:55 +00:00
Bonian Chen
2298027711
Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214700
Change-Id: I119377b9953c8c43fb9e4f3c00891cf867611d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:08:46 +00:00
Bonian Chen
1c9ce13822
Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214701
Change-Id: Id6207e1bdd2a9fed8ad69df3c819f72c0594f000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:08:38 +00:00
Bonian Chen
c4033b6d3e
Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev
2022-05-09 02:58:00 +00:00
Bonian Chen
a89902e9c9
Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev
2022-05-09 02:56:35 +00:00
Bonian Chen
52a1fdf310
Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev
2022-05-09 02:52:24 +00:00
YK Hung
56951b0e0c
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613
am: 4cc21e3de2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: Ic22cfd4dad06421063992a450101a07f3feebac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:30:29 +00:00
YK Hung
45632ebbdc
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613
am: 309dc7061b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: I9ea2657a618f679747d8fa761929e7dd1014cabb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:30:20 +00:00
YK Hung
4cc21e3de2
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: Icfca7b00f180b52e730f6e2a681bcdeac6db4749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:15:28 +00:00
YK Hung
309dc7061b
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: I3151f9ba90193a05972fdc771b6bd82969bfc4ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:14:16 +00:00
YK Hung
9d0da1b613
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev
2022-05-09 01:52:13 +00:00
Automerger Merge Worker
53ac7863a9
Merge "Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316
am: dc4104be6d" into tm-d1-dev-plus-aosp
2022-05-09 01:40:25 +00:00
Arc Wang
5986d27537
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316
am: 2557b02f08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: I01f7e4fb46dd6beff1c7c653b17eace6d1f9fcd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 01:40:22 +00:00
Arc Wang
29531a6ad6
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316
am: dc4104be6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: If2d57381d8e28dc864989efc78f9fbba278d84d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 01:40:22 +00:00
Arc Wang
dc4104be6d
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: I135776f8901d34602991f389d6c34fa35fd35825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 01:22:22 +00:00
Arc Wang
2557b02f08
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: I8ad8b5e2fff8532b291be0939ac1ed463e44e083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 01:21:08 +00:00
Arc Wang
94a2138316
Merge "Verify ringtone from ringtone picker is audio" into tm-dev
2022-05-09 01:06:46 +00:00
Bonian Chen
830d8e0fec
[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest
...
This is a change regarding ignoring the failure of test cases within
NetworkProviderSimListControllerTest in order to keep build green.
Bug: 231883966
Test: presubmit
Change-Id: I11bf23c1cab0e97619688ce1ed2c0f539f42a3be
2022-05-09 08:02:28 +08:00
Automerger Merge Worker
81ec693d4b
Merge "Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b
am: 4608fbc8a8" into tm-d1-dev-plus-aosp
2022-05-08 23:37:21 +00:00
Bonian Chen
b5e7404106
Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b
am: 89fae0817c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682
Change-Id: I628da106298af183c6be6cdcdef06d7458f83442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:37:17 +00:00
Bonian Chen
5f2171dc35
Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b
am: 4608fbc8a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682
Change-Id: Ia0584f9f384b13ca35e732bb4beb9c51669e58db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:37:17 +00:00
Bonian Chen
651a548e84
[Settings] Ignore failure test cases - SubscriptionUtilTest
...
This is a change regarding ignoring the failure of test cases within
SubscriptionUtilTest in order to keep build green.
Bug: 231886555
Test: presubmit
Change-Id: I0f5c13511968740e439a69be936a75d9f34e4c30
2022-05-09 07:32:13 +08:00
Bonian Chen
a34f5053df
[Settings] Ignore failure test cases - ProviderModelSliceHelperTest
...
This is a change regarding ignoring the failure of test cases within
ProviderModelSliceHelperTest in order to keep build green.
Bug: 231886711
Test: presubmit
Change-Id: I0138c9eefad1541a6302393c035b641fc3f4bfac
2022-05-09 07:23:28 +08:00
Bonian Chen
4608fbc8a8
Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682
Change-Id: I58426083b5da04cdea4c18305ba6fdfbe4a1c037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:19:47 +00:00
Bonian Chen
89fae0817c
Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682
Change-Id: I2bd50d6197f57135932c45c4b4536a57026065cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:18:36 +00:00
Bonian Chen
361fea8f6b
Merge "[Settings] Remove the subscription name verification." into tm-dev
2022-05-08 23:01:44 +00:00
ykhung
c880114dba
Use system package name for SYSTEM_UID in the BatteryEntry
...
Force use the system package for the SYSTEM_UID, since the SYSTEM_UID is
used for multiple packages. The getPackageWithHighestDrain() method may
get different packages to represent it, since it will use the highest
battery drain to represent the SYSTEM_UID if there are multiple packages
use the same UID value to make users confuse about the usage data.
_
$ adb shell pm list packages --uid 1000
package:android uid:1000
package:com.android.dynsystem uid:1000
package:com.android.frameworks.core.batterystatsviewer uid:1000
package:com.android.inputdevices uid:1000
package:com.android.keychain uid:1000
package:com.android.localtransport uid:1000
package:com.android.location.fused uid:1000
package:com.android.providers.settings uid:1000
package:com.android.server.telecom uid:1000
package:com.android.settings uid:1000
package:com.android.wallpaperbackup uid:1000
Bug: 202682426
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I447bfa1b32037763a2194c0639abcc334c7d8b78
2022-05-08 23:42:38 +08:00
Bonian Chen
649ad42457
[Settings] Remove the subscription name verification.
...
Subscription name may override by other design (for instance, unique
name display).
A verification of subscription name within this test case could be
inappropirate.
Bug: 231660194
Test: unit test
Change-Id: I4182d1de3c0d210bdc1ac699a4f8f862dcf55266
2022-05-08 19:52:14 +08:00
Milton Wu
f3679b6a6e
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
am: 7159cf23bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: I7f97a33a987f9c62a8b674cf2215637c81931b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 02:28:13 +00:00
Milton Wu
f2567364d6
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
am: bb7036142e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: I9a25ce05ddd2093d9ab9740ffc9507bacacb5004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 02:25:45 +00:00
Milton Wu
bb7036142e
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: I606d68143b628b445fcc6377717a1035b1a57a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 01:58:21 +00:00
Milton Wu
7159cf23bc
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: Id6b8a36f17b7b9f6067d68d146774149e1a2275f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 01:56:58 +00:00
Milton Wu
887d590e85
Merge "Update SUW biometric string product" into tm-dev
2022-05-07 01:27:27 +00:00
SongFerng Wang
82c6b91c69
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
am: 80c326e316
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: Ib6f574502419d5d288776e279029f3586ec5e124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:39:07 +00:00
SongFerng Wang
07ec013371
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
am: a7af4d2965
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: I914b401164b1d99098d209a76d773a9c39133529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:38:46 +00:00
Ayush Sharma
cf3f2dd11f
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
am: 2f5f7c96d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ib8fb1d9225de8c07dc8d36535805aa1461975985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:38:41 +00:00
Ayush Sharma
1376048722
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
am: 938200e3a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ic92fb8bfd1fcb7a3cf9252b0036989b834b09af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:38:16 +00:00
SongFerng Wang
80c326e316
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: If732e278300370c10c61b52e347f79c8d9656a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:10:29 +00:00