Merge "Don't display the option menu when all option menu items invisible" into stage-aosp-master
diff --git a/src/com/android/stk/StkMenuActivity.java b/src/com/android/stk/StkMenuActivity.java
index 1e5634e..04e5ed0 100755
--- a/src/com/android/stk/StkMenuActivity.java
+++ b/src/com/android/stk/StkMenuActivity.java
@@ -293,7 +293,7 @@
public void onDestroy() {
getListView().setOnCreateContextMenuListener(null);
super.onDestroy();
- CatLog.d(LOG_TAG, "onDestroy" + "," + mState);
+ CatLog.d(LOG_TAG, "onDestroy" + ", " + mState);
if (appService == null || !SubscriptionManager.isValidSlotIndex(mSlotId)) {
return;
}
@@ -330,7 +330,7 @@
menu.findItem(StkApp.MENU_ID_END_SESSION).setVisible(mainVisible);
- return true;
+ return mainVisible;
}
@Override