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

Remove obsolete try catch

Browse Source 
am: ebdcc80ac2

* commit 'ebdcc80ac26ae51ba27d9469a501a6242256aa50':
  Remove obsolete try catch
This commit is contained in:
Deepanshu Gupta
2016-02-01 22:52:50 +00:00
committed by android-build-merger
parent cc90965d8f ebdcc80ac2
commit 29e8071d2e
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
View File

@@ -382,23 +382,17 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso
config.orientation = Configuration.ORIENTATION_UNDEFINED;
}
try {
ScreenRound roundness = hardwareConfig.getScreenRoundness();
if (roundness != null) {
switch (roundness) {
case ROUND:
config.screenLayout |= Configuration.SCREENLAYOUT_ROUND_YES;
break;
case NOTROUND:
config.screenLayout |= Configuration.SCREENLAYOUT_ROUND_NO;
}
} else {
config.screenLayout |= Configuration.SCREENLAYOUT_ROUND_UNDEFINED;
ScreenRound roundness = hardwareConfig.getScreenRoundness();
if (roundness != null) {
switch (roundness) {
case ROUND:
config.screenLayout |= Configuration.SCREENLAYOUT_ROUND_YES;
break;
case NOTROUND:
config.screenLayout |= Configuration.SCREENLAYOUT_ROUND_NO;
}
} catch (NoSuchMethodError ignored) {
// getScreenRoundness was added in later stages of API 15. So, it's not present on some
// preview releases of API 15.
// TODO: Remove the try catch around Oct 2015.
} else {
config.screenLayout |= Configuration.SCREENLAYOUT_ROUND_UNDEFINED;
}
String locale = getParams().getLocale();
if (locale != null && !locale.isEmpty()) config.locale = new Locale(locale);