Merge "Remove unnecessary catch statement" (0248d46d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+3 −16

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ import com.android.systemui.util.wakelock.WakeLock;
		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.text.NumberFormat;
		import java.util.IllegalFormatConversionException;

		import javax.inject.Inject;

		@@ -575,24 +574,12 @@ public class KeyguardIndicationController implements StateListener,
		String percentage = NumberFormat.getPercentInstance()
		.format(mBatteryLevel / 100f);
		if (hasChargingTime) {
		// We now have battery percentage in these strings and it's expected that all
		// locales will also have it in the future. For now, we still have to support the old
		// format until all languages get the new translations.
		String chargingTimeFormatted = Formatter.formatShortElapsedTimeRoundingUpToMinutes(
		mContext, mChargingTimeRemaining);
		try {
		return mContext.getResources().getString(chargingId, chargingTimeFormatted,
		percentage);
		} catch (IllegalFormatConversionException e) {
		return mContext.getResources().getString(chargingId, chargingTimeFormatted);
		}
		} else {
		// Same as above
		try {
		return mContext.getResources().getString(chargingId, percentage);
		} catch (IllegalFormatConversionException e) {
		return mContext.getResources().getString(chargingId);
		}
		}
		}