Bill Yi
f4380c00f1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b083926666 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23126190
Change-Id: Ica496b180635b433382225ed474ccca256414843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:39 +00:00
Treehugger Robot
d8e8583c71
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I1723c2ace801c978f758dd6695e82b4a8b38a98a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:32 +00:00
Treehugger Robot
81edb3054a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 514fef7723 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23126186
Change-Id: I3177fd031fa790c603b0255c27feb15f8c948971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:32 +00:00
Bill Yi
33dd95eda1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I656fa19574d6b26b0bc6a0e222ffddd3bc88df3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:30 +00:00
Treehugger Robot
6ace5ad965
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I1137ad757c184c85d469fac6a122f5ed64a93fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:26 +00:00
Bill Yi
296ee710fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 54d9caa29c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23126186
Change-Id: I890347e1d12749a22b32500659c65e5df615cfef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:08 +00:00
Bill Yi
6cc5e5c226
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: Ibc0f5f91d03bc40177cfede61315be094e93c5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:18:06 +00:00
Treehugger Robot
d1193910d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2c7395d101 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124845
Change-Id: I59bae5f54f34aecbe839256972fe98732685d1de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:17:48 +00:00
Treehugger Robot
76d0d8c12b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Ideac433a7a33a20cf5346649e0f479c379117ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:17:45 +00:00
Bill Yi
f1f41abd8b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a52301e2f5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124845
Change-Id: I6a92141a59ace34dcf388842d3d4cc7d54cdf4df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:17:31 +00:00
Bill Yi
e578c1477f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I3299fc21dc12c5983f47f184ddbd5c078c8dafcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:17:30 +00:00
Treehugger Robot
217f6f75a7
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8 am: 636204bacd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: I27d46888475ea751b34024f706820db7ce82da8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:16:45 +00:00
Treehugger Robot
07a4951e7a
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6 am: 4dac429af9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: I6c24489c28987b49b8f9037fe6dfeaedfd18ce0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:12:41 +00:00
Treehugger Robot
11f279fcfb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I919f2310ab5e8730dcd758ae4d3618738e523403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:12:23 +00:00
Bill Yi
265171b600
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I3069039fccacdd189c574cbdeaee9bd2f3b305a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:12:16 +00:00
Treehugger Robot
2dc66817ed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I4591453dad181671ce2c19dec0694c25ad9cc307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:12:10 +00:00
Bill Yi
aff5a4b154
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: Ib829e7893c636a21fb485fb76b6f4198bd1f2cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:11:49 +00:00
Treehugger Robot
27ef5fc280
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I2e2dd23dd893174d0bc7faa870301e290931d2e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:11:29 +00:00
Treehugger Robot
804b4d6eb6
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8 am: 50244c4f86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: I0f99f2703b5411f6fe4405b517cc43c20562753a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:11:23 +00:00
Bill Yi
0781830995
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I15b87685a23088d5b1664b18a29109b0f834f7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:11:10 +00:00
Treehugger Robot
e2a9d31903
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: b2b823f18e am: 5a44e6de08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: I8595a7e930670b851a241ffab99008ed3887011d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:10:24 +00:00
Treehugger Robot
8a2c0e7eb5
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 84adeeac02 am: 22ecaf7c85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: If6a9ebd115b4f5c897799dcc58b74b02cf0e1826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:08:41 +00:00
Treehugger Robot
d5a20542ba
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6 am: 02aba89873
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: Idf293ca7270452e0906f92f9fd0e8f5b044c83bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:07:57 +00:00
Treehugger Robot
7670083b52
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-10 21:57:56 +00:00
Treehugger Robot
8eb849c4b2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-10 21:57:56 +00:00
Treehugger Robot
52978dea76
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-10 21:57:56 +00:00
Treehugger Robot
767a923ecd
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-10 21:55:15 +00:00
Treehugger Robot
d28f600d0e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-10 21:55:15 +00:00
Treehugger Robot
3b7b23acb8
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-10 21:55:15 +00:00
Treehugger Robot
57efff9e30
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-10 21:52:58 +00:00
Treehugger Robot
514fef7723
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-10 21:52:58 +00:00
Treehugger Robot
2c7395d101
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-10 21:52:58 +00:00
Treehugger Robot
50244c4f86
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: I1eb1f15352b7181d33acb68465a42a6d41d466dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 21:28:23 +00:00
Treehugger Robot
636204bacd
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: 14ffc962b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: I0b3c0cce50152004dcb452bdef680a74b2c8c2dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 21:28:20 +00:00
Treehugger Robot
5a44e6de08
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de am: b2b823f18e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: I6f4d03e69c29e883067157063e9413ce54da1643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 21:27:28 +00:00
Treehugger Robot
22ecaf7c85
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 84adeeac02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: I3cf08e1ca01a551c1a0b849b05e898f1ee5fb780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 21:27:12 +00:00
Treehugger Robot
4dac429af9
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: I256ccfd42a0e2cb6520d94bc9c0505bc57f808d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 21:26:48 +00:00
Treehugger Robot
02aba89873
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a am: 4c6f37b1d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: I811dc8fbc6aa17f7d208add12b1fcbf81d5a6668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 21:24:19 +00:00
Treehugger Robot
14ffc962b8
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: Iea1841e0a8b214e6783403f511e4d3a08519a703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:45:19 +00:00
Treehugger Robot
4c6f37b1d6
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: Idbc8f808ca0031d19af3d47e6c824aa35ea29daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:44:19 +00:00
Treehugger Robot
b2b823f18e
Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657
Change-Id: I138b9018ed269a740362090f00e0ac525405e1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:40:21 +00:00
Treehugger Robot
84adeeac02
Merge "Fix change not picking up work profile" into udc-dev am: 3061bcf10a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23138330
Change-Id: If32911653717d59046829ac9f4207669a847b244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:40:07 +00:00
Treehugger Robot
f6eab0c9de
Merge changes I4c4d257e,I4cc4cc22 into udc-dev
...
* changes:
Warn earlier about 5 provider limit
Fix credman provider not showing
2023-05-10 20:00:29 +00:00
Treehugger Robot
3061bcf10a
Merge "Fix change not picking up work profile" into udc-dev
2023-05-10 19:57:22 +00:00
Treehugger Robot
132f4d3966
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 28f09b6c46 am: 4f174a46a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I7da2873931378be30dbc6baebceea3641498f80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:49:50 +00:00
Bill Yi
3b873d5add
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: 7e9b0a8bc7 -s ours am: c9ce34190e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I96f9a5297c726b89fc7b6947d0f91a02621dd30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:49:39 +00:00
Treehugger Robot
570fa06b45
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 4fde620b4f am: b73b014d14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: Ie24b4c309f87d0c74edc599bf6295aa152af4c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:04:30 +00:00
Bill Yi
906fb93516
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63af1d8683 am: 74737aa45e -s ours am: cd402bd739 -s ours am: ac2dc0940e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I071236eb08354e302bafcdc1773dee5338306bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:04:27 +00:00
tom hsu
0617631408
[Settings] Avoid NPE if BT device is changed by framework.
...
- Do not register only one BT device for primary to avoid primary
BT devcie change to another.
- Register and unregister all BT devices
Bug: 280236099
Test: atest passed
Change-Id: I610144c7f8f649e40d99cf1dc7f50d1f3b80f109
2023-05-11 02:53:19 +08:00
Treehugger Robot
4f174a46a7
Merge changes from topic "tc_change_2305100725_22" into udc-dev am: b8e02ef73f am: 28f09b6c46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121122
Change-Id: I3db3187d7d78f63ad96dd97304fee2c642d07bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 18:27:49 +00:00