Merge "[Settings] Add package name in UidDetail for Settings app" into udc-dev (a36a9fcf) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/net/UidDetail.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,4 +24,5 @@ public class UidDetail {
		public CharSequence[] detailLabels;
		public CharSequence[] detailContentDescriptions;
		public Drawable icon;
		public CharSequence packageName;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -150,6 +150,7 @@ public class UidDetailProvider {
		// otherwise fall back to using packagemanager labels
		final String[] packageNames = pm.getPackagesForUid(uid);
		final int length = packageNames != null ? packageNames.length : 0;
		String packageName = "";
		try {
		final int userId = UserHandle.getUserId(uid);
		UserHandle userHandle = new UserHandle(userId);
		@@ -161,12 +162,13 @@ public class UidDetailProvider {
		detail.label = info.loadLabel(pm).toString();
		detail.icon = um.getBadgedIconForUser(info.loadIcon(pm),
		new UserHandle(userId));
		packageName = packageNames[0];
		}
		} else if (length > 1) {
		detail.detailLabels = new CharSequence[length];
		detail.detailContentDescriptions = new CharSequence[length];
		for (int i = 0; i < length; i++) {
		final String packageName = packageNames[i];
		packageName = packageNames[i];
		final PackageInfo packageInfo = pm.getPackageInfo(packageName, 0);
		final ApplicationInfo appInfo = ipm.getApplicationInfo(packageName,
		0 /* no flags */, userId);
		@@ -183,6 +185,7 @@ public class UidDetailProvider {
		}
		}
		}
		detail.packageName = packageName;
		detail.contentDescription = um.getBadgedLabelForUser(detail.label, userHandle);
		} catch (NameNotFoundException e) {
		Log.w(TAG, "Error while building UI detail for uid "+uid, e);