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

Merge "Avoid potential NPE" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-22 01:10:40 +00:00
committed by Android (Google) Code Review
parent 6fcb00896d 86f07870a4
commit 9856c29501
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -26011,7 +26011,11 @@ public class PackageManagerService extends IPackageManager.Stub
@Override @Override
public String[] getNamesForUids(int[] uids) throws RemoteException { public String[] getNamesForUids(int[] uids) throws RemoteException {
final String[] results = PackageManagerService.this.getNamesForUids(uids); if (uids == null || uids.length == 0) {
return null;
}
final String[] names = PackageManagerService.this.getNamesForUids(uids);
final String[] results = (names != null) ? names : new String[uids.length];
// massage results so they can be parsed by the native binder // massage results so they can be parsed by the native binder
for (int i = results.length - 1; i >= 0; --i) { for (int i = results.length - 1; i >= 0; --i) {
if (results[i] == null) { if (results[i] == null) {