From d2067824c4627d991287ca211cb1048be8a1d5d6 Mon Sep 17 00:00:00 2001
From: "Shuichi.Noguchi" <Shuichi.Noguchi@jp.sony.com>
Date: Sat, 13 Jan 2018 21:47:04 +0900
Subject: [PATCH] Fix the logic to get tv_pip_settings_class_name

Currently, Only the class which is started from "." can be
registered in PipManager. But some activities are not
following this and as the result, Pip is not displayed
in settings bounds even the name is registered in xml.

PipManager checks the class name not only it's started from ".",
but also any class name, then PipManager gets correct class name
even if it's not started from "."

Test: Launch PiP, the activity which is not started from ".".
      Then, open settings.

Change-Id: Iee29596aa8c1955d83338f6dd7a8dcdfccafc906
---
 .../src/com/android/systemui/pip/tv/PipManager.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java

diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
old mode 100644
new mode 100755
index 2d2869d8817ba..5a6a1c26caf54
--- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
@@ -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);