Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Defeat @Nullable String[] with empty list." into oc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2017-05-07 17:40:27 +00:00
committed by Android (Google) Code Review
parent 4566cb5756 2abd66c4ff
commit 5a421ad0ef
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/util/ArrayUtils.java
View File

@@ -583,4 +583,8 @@ public class ArrayUtils {
} }
return size - leftIdx; return size - leftIdx;
} }
public static @NonNull String[] defeatNullable(@Nullable String[] val) {
return (val != null) ? val : EmptyArray.STRING;
}
} }

6
services/usage/java/com/android/server/usage/StorageStatsService.java
View File

@@ -16,6 +16,8 @@
package com.android.server.usage; package com.android.server.usage;
import static com.android.internal.util.ArrayUtils.defeatNullable;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.usage.ExternalStorageStats; import android.app.usage.ExternalStorageStats;
import android.app.usage.IStorageStatsManager; import android.app.usage.IStorageStatsManager;
@@ -237,7 +239,7 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
enforcePermission(Binder.getCallingUid(), callingPackage); enforcePermission(Binder.getCallingUid(), callingPackage);
} }
if (mPackage.getPackagesForUid(appInfo.uid).length == 1) { if (defeatNullable(mPackage.getPackagesForUid(appInfo.uid)).length == 1) {
// Only one package inside UID means we can fast-path // Only one package inside UID means we can fast-path
return queryStatsForUid(volumeUuid, appInfo.uid, callingPackage); return queryStatsForUid(volumeUuid, appInfo.uid, callingPackage);
} else { } else {
@@ -281,7 +283,7 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
enforcePermission(Binder.getCallingUid(), callingPackage); enforcePermission(Binder.getCallingUid(), callingPackage);
} }
final String[] packageNames = mPackage.getPackagesForUid(uid); final String[] packageNames = defeatNullable(mPackage.getPackagesForUid(uid));
final long[] ceDataInodes = new long[packageNames.length]; final long[] ceDataInodes = new long[packageNames.length];
String[] codePaths = new String[0]; String[] codePaths = new String[0];