From 68539a664b6fc886ed467433cedd2fae291694de Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 20 Aug 2014 10:36:33 -0400 Subject: [PATCH] Remove logspam from GlobalActions. Bug:17128889 Change-Id: I7343820c1b6f174ec66c28ee7c94b6b9fb0ad1b1 --- .../internal/policy/impl/GlobalActions.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index da8ec2aee9b30..ae9465472e061 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -272,15 +272,19 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac mItems.add(new PowerAction()); } else if (GLOBAL_ACTION_KEY_AIRPLANE.equals(actionKey)) { mItems.add(mAirplaneModeOn); - } else if (GLOBAL_ACTION_KEY_BUGREPORT.equals(actionKey) - && (Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0 && isCurrentUserOwner())) { - mItems.add(getBugReportAction()); - } else if (GLOBAL_ACTION_KEY_SILENT.equals(actionKey) && mShowSilentToggle) { - mItems.add(mSilentModeAction); - } else if (GLOBAL_ACTION_KEY_USERS.equals(actionKey) - && SystemProperties.getBoolean("fw.power_user_switcher", false)) { - addUsersToMenu(mItems); + } else if (GLOBAL_ACTION_KEY_BUGREPORT.equals(actionKey)) { + if (Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0 && isCurrentUserOwner()) { + mItems.add(getBugReportAction()); + } + } else if (GLOBAL_ACTION_KEY_SILENT.equals(actionKey)) { + if (mShowSilentToggle) { + mItems.add(mSilentModeAction); + } + } else if (GLOBAL_ACTION_KEY_USERS.equals(actionKey)) { + if (SystemProperties.getBoolean("fw.power_user_switcher", false)) { + addUsersToMenu(mItems); + } } else if (GLOBAL_ACTION_KEY_SETTINGS.equals(actionKey)) { mItems.add(getSettingsAction()); } else if (GLOBAL_ACTION_KEY_LOCKDOWN.equals(actionKey)) {