Bill Yi
158bf69a42
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917
Change-Id: I77337c147a9468ff174fd851e58cb968723b3203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 21:58:13 +00:00
Bill Yi
19de182abb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917
Change-Id: I0357173f1cbe8056bdd872376aeb226a8cddc995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 21:58:01 +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
976f702727
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-08 21:31:01 +00:00
Bill Yi
09b685534a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-08 21:31:01 +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
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
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
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
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
63a4a1196b
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-09-04 20:40:49 +00:00
Bill Yi
66c2b80023
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a8e2fad0c914172e124cc90dec365513cba6435
2022-09-03 00:02:33 -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
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
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
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
a89e7aea3b
Merge "Fix array-related errorprone warnings" am: a93e78f781
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972
Change-Id: I644d5974c31a216b360a2dc1d1b1c156f6288f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 19:25:27 +00:00
Treehugger Robot
a93e78f781
Merge "Fix array-related errorprone warnings"
2022-08-17 18:37:46 +00:00
Xin Li
c27f705eb7
Merge "DO NOT MERGE - Merge Android 13"
2022-08-16 19:11:14 +00:00
Xin Li
48b65ca561
DO NOT MERGE - Merge Android 13
...
Bug: 242648940
Merged-In: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Change-Id: I7d823fd36c6d9395a86ec0757f55daf644193a01
2022-08-15 22:04:37 -07:00
Treehugger Robot
d3a358910b
Merge "Remove luyota from OWNERS." am: dcd3081158
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476
Change-Id: Ibc32c7ab34a3006acca4f0edbb38645d2c6ecf9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 02:31:16 +00:00
Treehugger Robot
dcd3081158
Merge "Remove luyota from OWNERS."
2022-08-16 01:53:34 +00:00
Cole Faust
a21ac03acb
Fix array-related errorprone warnings
...
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.
Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ida6513002f8fd845a385924be290b720f06c4748
2022-08-15 18:52:37 -07:00
Bob Badour
2e005f4cec
Remove luyota from OWNERS.
...
Test: n/a
Change-Id: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Merged-in: I6a8139e569a31ea3983df0db970a36b841e646d4
2022-08-12 19:57:37 +00:00
Treehugger Robot
e194aa42eb
Merge "Fix permissions for internal links." am: 24f45fbd63
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2182455
Change-Id: I633c22a73b0d160c0fbf662768a92e4f0dfac85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-12 03:03:53 +00:00
Treehugger Robot
24f45fbd63
Merge "Fix permissions for internal links."
2022-08-12 02:44:31 +00:00
Bob Badour
11411e187b
Fix permissions for internal links.
...
Test: m droid dist
Change-Id: If872d5e91a78d8f407e618a2c655c8cf4ac7d7fc
2022-08-10 14:21:47 -07:00
Treehugger Robot
4967e754eb
Merge "Fix SIM name in Network Details to show the selected SIM." am: 3bd3f983bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181975
Change-Id: Ie48078a7c33f40939b9d49140875ec7a02582ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 17:41:35 +00:00
Treehugger Robot
3bd3f983bf
Merge "Fix SIM name in Network Details to show the selected SIM."
2022-08-10 16:46:49 +00:00
Bruno Kremp
b204960ea4
Fix SIM name in Network Details to show the selected SIM.
...
When dual SIM cards with same Carrier Id inserted, authentication of
SIM base network is via default data SIM. However, SIM name shown in
Network Details is always the one inserted first.
Hence, make SIM name of default data SIM shown in Network Details
preferred to keep consistent with the one used for authentication.
Co-authored-by: Yibo Wang <yibo.x.wang@sony.com >
Test: manual test
Bug: 240732444
Change-Id: Ibd64189d6c25b5a64881a0ad9d40854df93481f4
2022-08-10 15:09:49 +02:00
Jeff Sharkey
04cdd54030
Merge "Migrate stringslint.py to AyeAye." am: f37834c09f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2173867
Change-Id: Ice243d4b3231199f16d9b59a208867c0986b0d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-09 17:48:33 +00:00
Jeff Sharkey
f37834c09f
Merge "Migrate stringslint.py to AyeAye."
2022-08-09 17:29:23 +00:00
Jeff Sharkey
5991f46a52
Migrate stringslint.py to AyeAye.
...
This script has been deprecated and replaced by AyeAye checks
directly in Gerrit.
Bug: 164530987
Test: none
Change-Id: Ia1baf761e5ca6a1cef7de231d0f320cfaa7e071a
2022-08-03 13:52:10 -06:00
Arc Wang
6945e70c02
Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940
Change-Id: I70b0ae924d8a4410cc29e7f494e85a9b8a7d3abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 03:26:39 +00:00
Arc Wang
671fa153e8
Merge "Crash happens if back button is pressed during "Format as Portable""
2022-08-02 03:11:13 +00:00