Merge "Add debugging to diagnose failure" into sc-dev (d8fe801f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+21 −10

Original line number	Diff line number	Diff line
		@@ -26033,11 +26033,14 @@ public class PackageManagerService extends IPackageManager.Stub

		@Override
		public String[] getNamesForUids(int[] uids) throws RemoteException {
		String[] names = null;
		String[] results = null;
		try {
		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];
		names = PackageManagerService.this.getNamesForUids(uids);
		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) {
		@@ -26045,6 +26048,14 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}
		return results;
		} catch (Throwable t) {
		// STOPSHIP(186558987): revert addition of try/catch/log
		Slog.e(TAG, "uids: " + Arrays.toString(uids));
		Slog.e(TAG, "names: " + Arrays.toString(names));
		Slog.e(TAG, "results: " + Arrays.toString(results));
		Slog.e(TAG, "throwing exception", t);
		throw t;
		}
		}

		// NB: this differentiates between preloads and sideloads