YK Hung
22bcacefcf
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 4cc21e3de2 am: 56951b0e0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: I8487447cf0b9835369f9d3dfe02d008f1da1bb27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:52:27 +00:00
YK Hung
0d9f3e16bc
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 309dc7061b am: 45632ebbdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: Ic711408646256d7508db671f9c98185a71b52f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:52:13 +00:00
YK Hung
7b278f3ba6
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 4cc21e3de2 am: f10776f81d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: Ia9a781dbbd6f50d8f3cc79bbad117dd5410a8510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:51:59 +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
f10776f81d
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: Icce988bd852d1877f487539f5cf34cebb936a8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:30:26 +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
Automerger Merge Worker
034d0089f3
Merge "Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: dc4104be6d" into tm-d1-dev-plus-aosp am: 53ac7863a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: If63f2ac3a23e9eb7fd5bcd9e69f544d947657b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:07:16 +00:00
Arc Wang
af2ae4f3c3
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: 2557b02f08 am: 5986d27537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: I208513efe73105a8518b14f4ffb9b96f15cb1378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:07:07 +00:00
Arc Wang
dd1d516607
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: dc4104be6d am: da6cf3046a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: Ibb8badc7119cd5ab3e6a94a1ac12caa8bc940392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:06:51 +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
da6cf3046a
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: I21fb697c81015d8a6683283d75d10c2f7ae6d073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 01:40:19 +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
Automerger Merge Worker
7cf186abf6
Merge "Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: 4608fbc8a8" into tm-d1-dev-plus-aosp am: 81ec693d4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682
Change-Id: Ifa14acb0f18fcec863d20a971a3ffc9fcb3c4f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:52:00 +00:00
Bonian Chen
dd7a647189
Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: 89fae0817c am: b5e7404106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682
Change-Id: Ia00f5d2aacdbad0d485b875b8e0326f3e50af0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:51:51 +00:00
Bonian Chen
7479474c76
Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b am: 4608fbc8a8 am: 9a2663325e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682
Change-Id: I0c40d6353b3d151fade4f8f419a9d8ad18ab8b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:51:36 +00: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
9a2663325e
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: I63b89da5a640650d729899df25d67ab40f8d154f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:37:16 +00: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
4539e44321
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85 am: 7159cf23bc am: f3679b6a6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: I7af67405f6a866dbeab2f129a96ff25eb87dee11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 02:53:32 +00:00
Milton Wu
b727f27182
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85 am: bb7036142e am: f2567364d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: Ib60120fccdfa132061ff92c767690eb13cbf2a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 02:51:38 +00:00
Milton Wu
ec5a918d42
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85 am: bb7036142e am: 9f19581d9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: I037093b09723023af9b7b54afc4e3bb97bf9f5f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 02:50:59 +00: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
9f19581d9f
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: Ifde76f78c2f0e0617d51c2c630f3bc4bcaba8467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 02:26:19 +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
fb882feb4c
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: 80c326e316 am: 82c6b91c69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: I931ed52fc818b55013ce68d5e2e2e3ce10360b7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:04:54 +00:00
SongFerng Wang
9e6d96d4e4
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: a7af4d2965 am: 07ec013371
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: I2c0da225188bd4299fe737987f962f2f8ccecf4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:04:47 +00:00
Ayush Sharma
8a8804f2f5
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 2f5f7c96d1 am: cf3f2dd11f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ica2b35c11aa7f543c85a4a392d14a0f3b8ed2b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:04:41 +00:00
Ayush Sharma
a8e882ba52
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 938200e3a8 am: 1376048722
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: I2d2e387b5e824db4b45e0ad06dfaba324f3b3fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:04:34 +00:00
SongFerng Wang
6c278e5eef
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: 80c326e316 am: a9b22228bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: Ia505498a668d64e36f8d7a171f36cfb584be8197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:04:25 +00:00
Ayush Sharma
2c15977b5f
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 2f5f7c96d1 am: b0aa6420d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: I98f88bfdd069763359c58fe95e16434812a80c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:04:17 +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
SongFerng Wang
a9b22228bf
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: I87e5c30e2bb0d5bb3c22c4ce6e68759af8adbd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:38:22 +00:00