Merge "Fix the dumpsys using deprecated API for getting calling package names" (64992eb9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/HardwarePropertiesManagerService.java

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -98,12 +98,17 @@ public class HardwarePropertiesManagerService extends IHardwarePropertiesManager
	}		}

	private String getCallingPackageName() {		private String getCallingPackageName() {
	final String[] packages = mContext.getPackageManager().getPackagesForUid(		final PackageManager pm = mContext.getPackageManager();
	Binder.getCallingUid());		final int uid = Binder.getCallingUid();
			final String[] packages = pm.getPackagesForUid(uid);
	if (packages != null && packages.length > 0) {		if (packages != null && packages.length > 0) {
	return packages[0];		return packages[0];
	}		}
	return "unknown";		final String name = pm.getNameForUid(uid);
			if (name != null) {
			return name;
			}
			return String.valueOf(uid);
	}		}

	private void dumpTempValues(String pkg, PrintWriter pw, int type,		private void dumpTempValues(String pkg, PrintWriter pw, int type,