Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary catch statement

Browse Source 
The IllegalFormatConversionException catch statement was added when
there was a change in a string that required a new translation in all
languages (in P). All translations should be properly updated now, so we
shouldn't need this catch statement. [If we do see this exception, we
should check the locale and update the string's translation.]

Test: manual
Fixes: 174014345
Change-Id: I790870cb90ca8f6904ef73f481928a7cdd2faa05
This commit is contained in:
Beverly
2020-11-24 12:43:40 -05:00
parent 2388cd528c
commit 0cf1d3990f
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -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);
}
return mContext.getResources().getString(chargingId, chargingTimeFormatted,
percentage);
} else {
// Same as above
try {
return mContext.getResources().getString(chargingId, percentage);
} catch (IllegalFormatConversionException e) {
return mContext.getResources().getString(chargingId);
}
return mContext.getResources().getString(chargingId, percentage);
}
}