Bonian Chen
423785169e
Merge "[Settings] Ignore failure test cases - NetworkProviderSimListControllerTest" into tm-dev am: c4033b6d3e am: 669bb956af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214699
Change-Id: I175d8935105df910c6dba43f3ac25a21627dc1d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:41:13 +00:00
Bonian Chen
157610d4a8
Merge "[Settings] Ignore failure test cases - ProviderModelSliceHelperTest" into tm-dev am: a89902e9c9 am: 4052e26785
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214700
Change-Id: I45fa23999a1b309b1df711ac53b14978a7273037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:41:06 +00:00
Bonian Chen
706ccad6b7
Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev am: 52a1fdf310 am: 285312ef1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214701
Change-Id: I8d5f590a57144217e03dda4ae6b8c4b90b19ac82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:40:58 +00:00
YK Hung
0998667e4b
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 4cc21e3de2 am: 56951b0e0c am: 22bcacefcf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: I8872ba929af93cd9a078e86366d30a9595a8632c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:17:27 +00:00
YK Hung
13cf96197b
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 309dc7061b am: 45632ebbdc am: 0d9f3e16bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: Ie8c131961cd8c1f6e8e6d1c2544076891855d1aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:17:20 +00:00
YK Hung
5389f3b2d6
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 4cc21e3de2 am: f10776f81d am: 7b278f3ba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: Ib35bfbbca0031ce633249a40ec464c87fc788212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:17:03 +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
669bb956af
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: Ic1ae3358b1ea39ecfa548e59ea103007585cb58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:09:16 +00:00
Bonian Chen
4052e26785
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: Ic31f45eb60fb7ebc72231dad2efbd517f450578c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:09:07 +00:00
Bonian Chen
285312ef1b
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: I4065e39aa67f20c19580d30764de105ca9a5d73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 03:08:59 +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
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
Bonian Chen
52a1fdf310
Merge "[Settings] Ignore failure test cases - SubscriptionUtilTest" into tm-dev
2022-05-09 02:52:24 +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
b251a6f9fc
Merge "Use system package name for SYSTEM_UID in the BatteryEntry" into tm-dev am: 9d0da1b613 am: 8c8b569e4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18214694
Change-Id: I68d693cca8994762f03281f7b794f8fbca48cb0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:29:52 +00:00
Automerger Merge Worker
fed3bdb468
Merge "Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: dc4104be6d" into tm-d1-dev-plus-aosp am: 53ac7863a9 am: 034d0089f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: I5c1a08c1a09a5a3f7c1430e3c5ce648dd3ef4398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:22:23 +00:00
Arc Wang
a6bd4e2517
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: 2557b02f08 am: 5986d27537 am: af2ae4f3c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: I67521788737b774f17ea8f211271542a4a0a7402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:22:14 +00:00
Arc Wang
60f310aabb
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: dc4104be6d am: da6cf3046a am: dd1d516607
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: I5251edda1cab2db33e59409aba8ff5eed02a4e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:22:06 +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
8c8b569e4e
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: If5f56ddec0325992bb5f1b4c66e1ff8d4b1da026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 02:14:37 +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
Arc Wang
becd92c1b0
[automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5
...
Blank merge reason: Change-Id I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Bug: 221041256
Change-Id: Ib291441dea3c6f87dfbb54ad0eae9f6dac24c292
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
2022-05-09 02:07:26 +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
930822bc13
[automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Bug: 221041256
Change-Id: I8970b251440e9f3f86b715ca225c545463a56164
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
2022-05-09 02:07:14 +00:00
Arc Wang
7fb8fc09b5
[automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Bug: 221041256
Change-Id: I9a3655b8852fd79dcce276f00de7f969d9219b58
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
2022-05-09 02:07:13 +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
f288d3a31b
Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9 )
2022-05-09 02:07:00 +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
Arc Wang
babe83e217
Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9 )
2022-05-09 02:06:08 +00:00
Arc Wang
1b7fa6f8fc
Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9 )
2022-05-09 02:05:20 +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
16f21bb14c
Merge "Verify ringtone from ringtone picker is audio" into tm-dev am: 94a2138316 am: f6093ba54c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197506
Change-Id: I53299c2a955b03c945583e03682bb8eabfea9222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 01:39:53 +00:00
hoffc
0304a0e88b
Settings: Optimize the selected WFD route preference summary
...
RouteInfo has several status values, such as unavailable status. But according to current logic, unavailable status will be displayed as connnected. it is not reasonable.
Update and optimize the route preference summary with the real WFD status value.
Change-Id: Iacd10e0133d06ef0b86da38cf763fe7def6ed7de
Buganizer: 231656030
2022-05-09 09:22:57 +08: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
f6093ba54c
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: Ib2d93752f81a7ec1be68d173922771cb774425d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 01:21:27 +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