skin: dereference after null check

Change-Id: I6cb2ed95c031ca6dadbd5404e0b31228e772b3f4
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
index e48d5679fc216e0cb3f32935c9e545f3dcf32ef1..6b49aad89fe5a04ee9f4fb254c03c7e5aa748d79 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
@@ -151,7 +151,7 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
                List<KeyMapType> keyMapList = SkinUtil.getHWKeyMapList(
                                skin.getEmulatorSkinState().getCurrentRotationId());
 
-               if (keyMapList.isEmpty() == false) {
+               if (keyMapList != null && keyMapList.isEmpty() == false) {
                        toggleButton = createToggleButton();
                        toggleButton.setBackground(backgroundColor);
                }

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
index 9c33bd2698ceee9c87e607df58b890f1649edbab..cbb9ee8e5380cd642ddf14e8fb5007e2d89fab87 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
@@ -252,10 +252,6 @@ public class PopupMenu {
                        }
 
                        if (screenshotItem != null || hostKbdItem != null || diagnosisItem != null) {
-                               advancedItem = new MenuItem(menu, SWT.CASCADE);
-                               advancedItem.setText(ADVANCED_MENUITEM_NAME);
-                               advancedItem.setImage(imageRegistry.getIcon(IconName.ADVANCED));
-
                                new MenuItem(advancedSubMenu, SWT.SEPARATOR);
                        }
 
@@ -270,8 +266,16 @@ public class PopupMenu {
                        /* Force close menu */
                        forceCloseItem = createForceCloseItem(
                                        advancedSubMenu, FORCECLOSE_MENUITEM_NAME);
+
+                       if (screenshotItem != null || hostKbdItem != null || diagnosisItem != null
+                                       || aboutItem != null || forceCloseItem != null) {
+                               advancedItem = new MenuItem(menu, SWT.CASCADE);
+                               advancedItem.setText(ADVANCED_MENUITEM_NAME);
+                               advancedItem.setImage(imageRegistry.getIcon(IconName.ADVANCED));
+
+                               advancedItem.setMenu(advancedSubMenu);
+                       }
                }
-               advancedItem.setMenu(advancedSubMenu);
 
                /* Shell menu */
                if (itemProperties == null ||