diff options
| author | John Spurlock <jspurlock@google.com> | 2014-06-12 22:31:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 22:31:22 +0000 |
| commit | 6cf5f8026eedacabf45f0df3597e47a4a57835c5 (patch) | |
| tree | a3481ad5d329c8e9eb561efa12e03fad193a0c5c /packages | |
| parent | d2d05f5b9ebb8f2f4794f50321d3b209433f6caa (diff) | |
| parent | 8e2c4da2c1cfbbb5b5845974a9e2cd8cfcd391d7 (diff) | |
| download | frameworks_base-6cf5f8026eedacabf45f0df3597e47a4a57835c5.zip frameworks_base-6cf5f8026eedacabf45f0df3597e47a4a57835c5.tar.gz frameworks_base-6cf5f8026eedacabf45f0df3597e47a4a57835c5.tar.bz2 | |
am 85231047: Merge "PowerUI: Remove obsolete workaround." into lmp-preview-dev
* commit '85231047078a79a0ed465ce15bd7e34740d8eb73':
PowerUI: Remove obsolete workaround.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index 3fa8b99..1bb7109 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -126,25 +126,16 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { updateNotification(); } - private void cancelOther(int showing) { - if (mShowing != SHOWING_NOTHING && mShowing != showing) { - mNoMan.cancel(TAG_NOTIFICATION, ID_NOTIFICATION); // workaround no HUN on updates - } - } - private void updateNotification() { Slog.d(TAG, "updateNotification mWarning=" + mWarning + " mSaver=" + mSaver + " mInvalidCharger=" + mInvalidCharger); if (mInvalidCharger) { - cancelOther(SHOWING_INVALID_CHARGER); showInvalidChargerNotification(); mShowing = SHOWING_INVALID_CHARGER; } else if (mWarning) { - cancelOther(SHOWING_WARNING); showWarningNotification(); mShowing = SHOWING_WARNING; } else if (mSaver) { - cancelOther(SHOWING_SAVER); showSaverNotification(); mShowing = SHOWING_SAVER; } else { |