Merge "Fix the logic to get tv_pip_settings_class_name"

This commit is contained in:
Treehugger Robot
2018-07-04 22:45:16 +00:00
committed by Gerrit Code Review

View File

@@ -251,12 +251,13 @@ public class PipManager implements BasePipManager {
entry = Pair.<String, String>create(packageAndClassName[0], null);
break;
case 2:
if (packageAndClassName[1] != null
&& packageAndClassName[1].startsWith(".")) {
entry = Pair.<String, String>create(
packageAndClassName[0],
packageAndClassName[0] + packageAndClassName[1]);
if (packageAndClassName[1] != null) {
entry = Pair.<String, String>create(packageAndClassName[0],
packageAndClassName[1].startsWith(".")
? packageAndClassName[0] + packageAndClassName[1]
: packageAndClassName[1]);
}
break;
}
if (entry != null) {
sSettingsPackageAndClassNamePairList.add(entry);