PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check before PackageManager operations" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-07-22 14:46:47 +00:00
committed by Android (Google) Code Review
parent 1c5a04317e 64e01615cb
commit 3177febb4f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/AppStorageSettings.java
View File

@@ -324,9 +324,11 @@ public class AppStorageSettings extends AppInfoWithHeader
private void initMoveDialog() {
final Context context = getActivity();
final StorageManager storage = context.getSystemService(StorageManager.class);
final List<VolumeInfo> candidates = context.getPackageManager()
.getPackageCandidateVolumes(mAppEntry.info);
final PackageManager pm = context.getPackageManager();
final List<VolumeInfo> candidates =
mAppEntry != null && pm != null
? pm.getPackageCandidateVolumes(mAppEntry.info)
: Collections.emptyList();
if (candidates.size() > 1) {
Collections.sort(candidates, VolumeInfo.getDescriptionComparator());