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

Merge "Fix the logic to get tv_pip_settings_class_name"

Browse Source 
am: d004710e0e

Change-Id: Ieecde6f75fd7788835fa34300f1fbec5eb963862
This commit is contained in:
Shuichi.Noguchi
2018-07-04 17:07:32 -07:00
committed by android-build-merger
parent 4a319c85bd d004710e0e
commit 08923b73f4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java Normal file → Executable file
View File

@@ -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);