Merge "Don't print error log if phone account icon is missing" into lmp-mr1-dev (5eecef46) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/PhoneAccount.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -380,12 +380,17 @@ public class PhoneAccount implements Parcelable {
	}		}

	private Drawable getIcon(Context context, int resId) {		private Drawable getIcon(Context context, int resId) {
			if (resId == 0) {
			return null;
			}

	Context packageContext;		Context packageContext;
	try {		try {
	packageContext = context.createPackageContext(		packageContext = context.createPackageContext(
	mAccountHandle.getComponentName().getPackageName(), 0);		mAccountHandle.getComponentName().getPackageName(), 0);
	} catch (PackageManager.NameNotFoundException e) {		} catch (PackageManager.NameNotFoundException e) {
	Log.w(this, "Cannot find package %s", mAccountHandle.getComponentName().getPackageName());		Log.w(this, "Cannot find package %s",
			mAccountHandle.getComponentName().getPackageName());
	return null;		return null;
	}		}
	try {		try {