Merge "Avoid potential NPE" into sc-dev am: 9856c29501

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14266744

Change-Id: Icfbaf60f670c4892178025de71cd6306d1f09cc1
This commit is contained in:
TreeHugger Robot
2021-04-22 01:33:04 +00:00
committed by Automerger Merge Worker

View File

@@ -26052,7 +26052,11 @@ public class PackageManagerService extends IPackageManager.Stub
@Override
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
for (int i = results.length - 1; i >= 0; --i) {
if (results[i] == null) {