PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,997 Commits 1 Branch 0 Tags
24ac97a0bf629e09ffb258f4f3317f44c766092a
Commit Graph

103997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gil Cukierman
24ac97a0bf Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737

Change-Id: Ib46bd4f287a80582afb67f7ef052a3ff25862b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-22 14:30:53 +00:00
Gil Cukierman
594002e21a Merge "Use AAPT2 For SettingsUnitTests" 2022-09-22 13:40:19 +00:00
Gil Cukierman
4429054bb1 Use AAPT2 For SettingsUnitTests 
Forces tradefed to use aapt2 for SettingsUnitTests to get around
the issue of Settings.apk not being parseable by aapt.

Bug: 247779071
Test: atest SettingsUnitTests
Change-Id: I8af260f8d2c438512d3e61f0028accf7b40c8a00
 2022-09-21 17:48:20 +00:00
Treehugger Robot
325b033f85 Merge "Mark DataUsageState as nullable to avoid potential NPE risk" am: 0960af0bf3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2217422

Change-Id: I459cae5f473576dd3d9c4f8ee6fa9e7f5581ad75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-15 12:16:23 +00:00
Treehugger Robot
0960af0bf3 Merge "Mark DataUsageState as nullable to avoid potential NPE risk" 2022-09-15 11:56:51 +00:00
Shen Lin
eb627be0b4 Mark DataUsageState as nullable to avoid potential NPE risk 
mDataUsageState is nullable in UnrestrictedDataAccessPreference.java, so we'd better
add a annotation to getDataUsageState(), and add a null-check before calling it.

Bug: 246828843

Test: manual and Robotest.
Change-Id: If7fea53ec7efd004391a09becdba5709ae686f40
 2022-09-15 14:23:38 +08:00
Treehugger Robot
ca3213bf88 Merge "Fix compile warnings due to non-varargs call of varargs method" am: 8b0e08ecee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2207309

Change-Id: I87f90878ea379a8f27bd57c13dc777803ec248a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-14 04:28:52 +00:00
Treehugger Robot
227b8f0272 Merge "Fix the IllegalArgumentException from RecyclerView" am: 8f793f5e4f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2216421

Change-Id: Iad4eab5a28611ea7e8473f34ebb8af9b00158a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-14 04:28:19 +00:00
Treehugger Robot
8b0e08ecee Merge "Fix compile warnings due to non-varargs call of varargs method" 2022-09-14 04:16:30 +00:00
Treehugger Robot
8f793f5e4f Merge "Fix the IllegalArgumentException from RecyclerView" 2022-09-14 03:55:49 +00:00
Shen Lin
c463aee2b8 Fix the IllegalArgumentException from RecyclerView 
Attempt to remove the animator as early as possible to avoid a RecyclerView crash.

Bug: 246411107
Related bug: 184214085

Test: manual.
Change-Id: I8fcb06836217f4de200a53bb88a1a0b5e42bbe21
 2022-09-13 08:46:30 +00:00
Bill Yi
3464e33135 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: I20ddfee04e6de1e681b647a97296fcf29d97ce66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:56:26 +00:00
Bill Yi
49efcf7816 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399

Change-Id: I3e2c668af16aec333680c1ac7fad768b1db94c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:56:14 +00:00
Bill Yi
677cd61616 Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" 2022-09-12 17:59:03 +00:00
Treehugger Robot
1f9c4c483a Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am: 4378ee11ad 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2210776

Change-Id: Ib115186ff66f8246082bc274624cb116a63c790c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-09 14:49:24 +00:00
Treehugger Robot
4378ee11ad Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" 2022-09-09 14:20:05 +00:00
Shen Lin
78fc8a21a4 Fix potential NPE crash in ConversationHeaderPreferenceController 
mChannel is nullable and we have to do a null-check before calling its method.

Bug: 245506600

Test: manual and atest
Change-Id: Ib739f0f66f1a2aee1b2741263e7c206341782892
 2022-09-09 10:16:29 +08:00
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
042554a0e4 Merge TP1A.220905.004 to aosp-master - DO NOT MERGE 
Merged-In: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Merged-In: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Change-Id: I186ff56c007d17ad650b64facfbd4862cc06bf9a
 2022-09-08 14:23:20 -07:00
Shen Lin
e960694a15 Fix compile warnings due to non-varargs call of varargs method 
Bug: 245384099

Test: manual
Change-Id: Ie25c53b20cad318097ff17b7df0b4dd9ffeb4a32
Merged-In: Ib225d185b6f15463f4fae809e0cdaa25920d52af
 2022-09-08 07:02:52 +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