Bill Yi
28d6d5a7c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a
-s ours am: 5f1549cee7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916
Change-Id: Id56eae08a39ddea4e76a27b0bd0887c06d2ef392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:06:15 +00:00
Bill Yi
21d705a708
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3
-s ours am: 2fabfd31d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916
Change-Id: I03897f87ff0fd32328f2de1d6c7f044ca58ab1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:05:54 +00:00
Bill Yi
5f1549cee7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916
Change-Id: I90137c2b7dcdabd0e11ec09548224f59e42b2a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 21:57:38 +00:00
Bill Yi
2fabfd31d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916
Change-Id: Id5d7147bdcfb6ed4c19544f572416b3cb9278454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 21:57:17 +00:00
Bill Yi
09b685534a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-08 21:31:01 +00:00
Bill Yi
62d1c9a527
[automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f
-s ours
...
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:14:23 +00:00
Bill Yi
d8e775a59d
[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9
-s ours
...
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: I8dfba5cb143b8a3e85d5cd486e259b620b133cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:14:10 +00:00
Bill Yi
e7e935454f
Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master
2022-09-08 02:32:31 +00:00
Treehugger Robot
1b69e6b87c
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864
am: 451ced2f5a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: I16683a4e78350d713ab8a0f756d69581aa97526d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 01:46:51 +00:00
Treehugger Robot
451ced2f5a
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 01:02:07 +00:00
Treehugger Robot
6672e37864
Merge "Fix NPE crash in TextToSpeechSettings"
2022-09-08 00:34:03 +00:00
Oli Lan
3c8578c22f
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours am: 52f5f2ee31
-s ours am: 11484d510a
-s ours am: ff1de3711e
-s ours am: 9b9d0b2275
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Iadbd31b60e5744a5b2532dc0cd64d21858efcda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 22:31:30 +00:00
Oli Lan
9b9d0b2275
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours am: 52f5f2ee31
-s ours am: 11484d510a
-s ours am: ff1de3711e
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Ib8379f1b92400f4bd1b2b76a6c418216a44fce6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 22:18:29 +00:00
Oli Lan
56abc7ad1a
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours am: 52f5f2ee31
-s ours am: 54f0522027
-s ours am: 7e67690072
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: I7aa5c978f0be7269e3a3211284d2d0ba6cf0b1e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 22:18:00 +00:00
Oli Lan
ff1de3711e
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours am: 52f5f2ee31
-s ours am: 11484d510a
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Ie0f4cc27e8ad3987f120a8c13ca033cc17972e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 21:54:20 +00:00
Oli Lan
7e67690072
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours am: 52f5f2ee31
-s ours am: 54f0522027
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: I98a5f814012718e1a31fb7a1935715e9d7756151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 21:51:18 +00:00
Oli Lan
54f0522027
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours am: 52f5f2ee31
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: I1d62ca22214c2cb04c15545764864d65231d9230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 21:26:35 +00:00
Oli Lan
11484d510a
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours am: 52f5f2ee31
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Ifa1eb07ec9264ea159064776d27c2fa2d2aeb1c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 21:24:56 +00:00
Oli Lan
52f5f2ee31
[automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
am: cbf1699cd7
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Ic7660e922a883a8147447dad898d407c4f3d387e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 20:54:43 +00:00
Oli Lan
cbf1699cd7
Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
am: ff5b6611cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: Id74cd5fe28cec05a3fd87fc5434d28fad639e1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 20:24:55 +00:00
Oli Lan
ff5b6611cf
Prevent exfiltration of system files via avatar picker. am: f70e351d1a
am: 05ea36ddc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: I8cc4562420648436abb478b686adb96c28d8163b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 19:39:55 +00:00
Oli Lan
05ea36ddc5
Prevent exfiltration of system files via avatar picker. am: f70e351d1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745058
Change-Id: If9321bf1035c0492396adf4ce3b6579dfe31c66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 19:01:32 +00:00
Bill Yi
e935326ab9
Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Change-Id: I60bd05c8418800fe8f9f432e11d4ca97d03e57a2
2022-09-06 22:34:26 -07:00
Shen Lin
fa6a8e9767
Fix NPE crash in TextToSpeechSettings
...
Recyclerview's getItemAnimator() is nullable so we need a null check.
Bug: 245383855
Test: Manual
Change-Id: Iebad430e81a32b7fa8ebe0543abf3f122befb7e5
2022-09-07 10:26:39 +08:00
Treehugger Robot
d24f4a3f54
Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f
am: a9c6040eb8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258
Change-Id: I3048482c0e9c74bc4488fb76e7166b4e94bf1e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 00:41:43 +00:00
Treehugger Robot
a9c6040eb8
Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page" am: b2a466d92f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2206258
Change-Id: I57cb6db3271266734f2fe383de0d4575dad57cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-07 00:14:44 +00:00
Treehugger Robot
b2a466d92f
Merge "Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page"
2022-09-06 23:54:40 +00:00
Treehugger Robot
a4915b26f4
Merge "Crash in PreferredSimDialogFragment" am: a512817aba
am: 42cc405781
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096
Change-Id: If9f57b125c3e336cd6f10325e8e066f918000e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 13:05:24 +00:00
Treehugger Robot
42cc405781
Merge "Crash in PreferredSimDialogFragment" am: a512817aba
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207096
Change-Id: I0add210f4a071fb61b9647ba9a81518d050ff64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-06 12:37:01 +00:00
Treehugger Robot
a512817aba
Merge "Crash in PreferredSimDialogFragment"
2022-09-06 10:28:38 +00:00
Shen Lin
0b9a6304aa
Fix NPE crash in UwbPreferenceController and optimize the lifecycle observer adding condition in page
...
This patch contains two fixes:
- Make sure mUwbManager is non-null by calling isUwbSupportedOnDevice to avoid a NPE.
- Modify AdvancedConnectedDeviceDashboardFragment, add lifecycle observer only if device supports UWB.
Bug: 244871579
Test: manual test and Robotest.
Change-Id: I78f97794a66f3fb487f067c4570899e21c254acf
2022-09-06 14:55:08 +08:00
Pingzhi Wang
77ce80d6cb
Crash in PreferredSimDialogFragment
...
NullPointerException when removing physical SIM card
Bug: 244622300
Test: Manual
Change-Id: Ie32c4d07e4c77a0460265a47501e332ae62e17e4
2022-09-05 11:29:42 +02:00
TreeHugger Robot
2d0b98ca99
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 63a4a1196b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19837908
Change-Id: I0f5886c6d99255c8773a92e4316326d334528cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:20:41 +00:00
Bill Yi
7f7bf6920a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8835e20681
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19837908
Change-Id: Iec75130b912ea7a26f43249781f3af765e20f3a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:20:19 +00:00
Bill Yi
838fce70df
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75445048e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19837907
Change-Id: I45b0bac90cdab9431eca070b86e597eab58fd14d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:20:07 +00:00
TreeHugger Robot
bb55f01a53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 98f921cf42
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843173
Change-Id: I15798ed1404457304ad54dde3523bab9e79079a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:04:53 +00:00
Bill Yi
f84668d5ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c798596fd5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843173
Change-Id: I989f5f155ba1c4d57bcd7aa50225c3f19eae381a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:04:37 +00:00
Bill Yi
fb32967d7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de9688841c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19843170
Change-Id: Id78e2a064f36ef718a3228c58507c47bbdb32005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-04 21:04:25 +00:00
TreeHugger Robot
63a4a1196b
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-09-04 20:40:49 +00:00
TreeHugger Robot
98f921cf42
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-04 20:35:48 +00:00
Bill Yi
c798596fd5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If62421d8025fe9fc59a8805da0a21d889e56323e
2022-09-03 19:51:44 -07:00
Bill Yi
de9688841c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ice6605bdce55661c00d1190f954dc90461b9874b
2022-09-03 19:44:44 -07:00
Bill Yi
d3348813e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id00352e3ad044c3ee0e9baeb2c0f0259e46356a3
2022-09-02 23:58:39 -07:00
Bill Yi
8835e20681
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iedfe8b57119e96d10ab4db4d7f071440a662a3f4
2022-09-02 23:38:36 -07:00
Bill Yi
75445048e8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I413af1183c1e88a017c1708883f0ee863fa80f4e
2022-09-02 23:34:35 -07:00
Treehugger Robot
02a5b5e487
Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6
am: 3799ecc58a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576
Change-Id: I59984a70a4a691ba4967238ec2eb5b2dbaf0ff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 04:34:07 +00:00
Treehugger Robot
3799ecc58a
Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk" am: 36a80cd8e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200576
Change-Id: I5a77b5153c4357f09e6f5d10dce9f7f31b3d1d26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-02 03:59:57 +00:00
Treehugger Robot
36a80cd8e6
Merge "Add null check for mIntent in ZenRulePreference to avoid potential crash risk"
2022-09-02 03:36:40 +00:00
SongFerng Wang
545db0361f
Merge "Add owner for job handover" am: 89418428f6
am: 55f71f5496
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280
Change-Id: Ibeb10dbb48e3b2332f9056674a0a237ff28d5f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 12:37:38 +00:00
SongFerng Wang
55f71f5496
Merge "Add owner for job handover" am: 89418428f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280
Change-Id: Ic94463eedc59971e8c5c162f2dfdad203c917508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-01 11:37:56 +00:00