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
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
SongFerng Wang
89418428f6
Merge "Add owner for job handover"
2022-09-01 10:58:19 +00:00
SongFerngWang
2d59130485
Add owner for job handover
...
Will CP it into AOSP later.
Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
2022-09-01 16:09:35 +08:00
Shen Lin
b25f123d9f
Add null check for mIntent in ZenRulePreference to avoid potential crash risk
...
Bug: 244120502
Test: manual test, ZenRuleScheduleHelperTest for unit test.
Change-Id: Ib7338253783bb09b84b629f2dd891292d82f28b2
2022-08-29 19:19:59 +08:00
Bill Yi
71d1cd4557
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238
Change-Id: I25f8935aea893bb712cb3e002719360bb496092a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-28 02:19:32 +00:00
Bill Yi
a947d0a622
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238
Change-Id: I2bb8103818802698946c8b9d952aabd03c43328f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-28 02:19:17 +00:00
Bill Yi
fae53cfbdf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235
Change-Id: I26ecd8d012598281f8842dfa4e7189eba1480feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-28 02:19:04 +00:00
Bill Yi
c10285fbdb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235
Change-Id: I5f98cf99712cfd8123b0456d09171a72bcda33ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-28 02:18:51 +00:00
Bill Yi
d60d670ccc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-28 01:55:00 +00:00
Bill Yi
548e038af7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-28 01:55:00 +00:00
TreeHugger Robot
29f4dd9a23
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4
-s ours am: 2810928518
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I751f3f087f95c4e51a4850958fea09fd65fb1edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:57:19 +00:00
Bill Yi
aacbd2e2ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f
-s ours am: c9ac950159
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I6d96dcd9e2da4c62d4a81aa2379dd52b6f03605e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:57:06 +00:00
Bill Yi
089e0c7606
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f
-s ours am: bfd43e8459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: I765f7749ff566563f7121463d3d3cad7790054aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:55 +00:00
TreeHugger Robot
2810928518
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I75db89938d39c6c1c576a31ecbd8d5bf7868991d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:47:08 +00:00
Bill Yi
c9ac950159
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I48e41e88032dfe727058fbce95de2efaf618757a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:46:49 +00:00
Bill Yi
bfd43e8459
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Ie0bbb18017f81853c962c6cb34ee6eabaf9e619a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:46:35 +00:00
TreeHugger Robot
ecbf9be9a4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-26 17:25:46 +00:00
Bill Yi
4e5669b82f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie7ff28b6cf65231bab7757ae9c5c9bf1bee9f475
2022-08-25 08:40:29 -07:00
Bill Yi
6ccb75281f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I222a6fa89b2ba5da975e473b52c7ebb70e5e607f
2022-08-25 08:36:52 -07:00
Bill Yi
f9bf84d822
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I022fac7bfc51decd6c42007534917453acf4b7cf
2022-08-24 20:54:14 -07:00
Bill Yi
1d3e63f1ab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I849b26dc45abefbb04f7b16a40b8f629805cdd78
2022-08-24 20:47:00 -07:00
Treehugger Robot
4c06c2426d
Merge "Fix always return first package for mock location app in developer options." am: d221269892
am: 280ad76afb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: If151337acb399e3ce8ab733eb44d2cc6a9ef0484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 13:59:51 +00:00
Treehugger Robot
280ad76afb
Merge "Fix always return first package for mock location app in developer options." am: d221269892
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170
Change-Id: I66bdf2036d3a3af348137b07a1b2b9edb29d1894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 13:38:27 +00:00
Treehugger Robot
d221269892
Merge "Fix always return first package for mock location app in developer options."
2022-08-23 13:15:51 +00:00
张倞诚
d8d0cb3532
Fix always return first package for mock location app in developer options.
...
The mock location app should be OP_MOCK_LOCATION allowed app, the packageOps.get(0).getPackageName()
is the first app that used the OP_MOCK_LOCATION in history, but maybe rejected.
Change-Id: I0158436dd7d2790f4e9640075bc9c8bd3422f467
2022-08-23 07:50:16 +00:00
TreeHugger Robot
aa3a5a8e5f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Iaeecd274c351d8e464dde1a2d47b97fe7dbc4768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 06:11:12 +00:00