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
c0a990abd0
Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b
am: b04c73a448
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214682
Change-Id: I4417b1be695dea67a712782fff0594ddbabdf2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:36:51 +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
b04c73a448
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: Ie071eea1abb1c3d0fdc8ebafbbfd187197933d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-08 23:18:59 +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
The Android Open Source Project
9d7b601216
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I840e347b6317533e255f1c63611860d6e124eed8
2022-05-08 07:54:24 +00:00
The Android Open Source Project
dfa4b95f4e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I23dffc3fed57dd046f2d3063ce003ce7a46cb92b
2022-05-08 07:47:45 +00:00
Bill Yi
21ad396435
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I58a80d07058602ce960838a535ba18c4c8e34493
2022-05-08 06:17:29 +00:00
Bill Yi
ee8de09b57
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2926a2446f485a7ee7d60de63f5399d781a3934c
2022-05-08 06:08:35 +00:00
Bill Yi
5a66b1e22e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7a3309c992a899606c4e21ae4c8fb3738ae74179
2022-05-08 06:03:12 +00:00
Bill Yi
95203f8d20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie4413453edaa0a535727d140f3cd7697afbf1191
2022-05-08 05:55:55 +00:00
Bill Yi
2a0680f979
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id92b90caa9e4670549b96877c5dd1085d6443b64
2022-05-08 05:54:21 +00:00
Milton Wu
7cc1a2d3a7
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
am: 7159cf23bc
am: f3679b6a6e
am: 4539e44321
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: Idbe627b98138709d74c637f3140b380776ee2bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 03:25:23 +00:00
Milton Wu
dc21db870a
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
am: bb7036142e
am: f2567364d6
am: b727f27182
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: If272d3196caf831b82ee6bbb7cdaf008437812a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 03:24:46 +00:00
Milton Wu
26cb6798a3
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
am: bb7036142e
am: 9f19581d9f
am: ec5a918d42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: I8b2597012f9e3731a47430c2ee4c490abb424201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 03:16:33 +00: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
496b1c8127
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
am: 3b284a0bbe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: I65b8ef913caa39c22b59251326a6c1cbb5ba98bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 02:25:58 +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
3b284a0bbe
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: Ib9eea2521aeb0ee3c83641b8294eba71dce0e2a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 01:57:22 +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
f46ca20fb2
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
am: 80c326e316
am: 82c6b91c69
am: fb882feb4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: I769b82ebe0bf2894cb26a17ebc69f46fce45195a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:21:14 +00:00
SongFerng Wang
8fef6be2fb
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
am: a7af4d2965
am: 07ec013371
am: 9e6d96d4e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: I6acad86aaeeb2537b084d672617b2d251811407f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:21:07 +00:00
Ayush Sharma
2b57e281a4
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
am: 2f5f7c96d1
am: cf3f2dd11f
am: 8a8804f2f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: I9613673a74eb7ed72fc527178f76d94778cd6f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:20:59 +00:00
Ayush Sharma
7a1e6ed385
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
am: 938200e3a8
am: 1376048722
am: a8e882ba52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: I40b95575258dedf8ed05c6480f329b9f6fba10e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:20:51 +00:00
SongFerng Wang
b2ab0265c8
Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
am: 80c326e316
am: a9b22228bf
am: 6c278e5eef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646
Change-Id: I2d98845e26be6771ab52a5f030a438a41176135f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:20:44 +00:00
Ayush Sharma
e9c242880c
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
am: 2f5f7c96d1
am: b0aa6420d9
am: 2c15977b5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: I8f7a20d521c2611470947c5b2c6a865304f9fc3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 12:20:32 +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
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