Merge "Fix the logic to get tv_pip_settings_class_name" am: d004710e0e (06cec22f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java

100644 → 100755

+6 −5

Original line number	Diff line number	Diff line
		@@ -258,12 +258,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);