diff options
| author | John Spurlock <jspurlock@google.com> | 2015-01-07 16:14:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-07 16:14:09 +0000 |
| commit | 6746cf096b1a2f342ce81fce77a77dff01981e80 (patch) | |
| tree | 9f7eb4d0ca317dc649852188f39dd26f543fd25b /packages | |
| parent | 40a0709a56277e26e63654a58d285e6a471d33c0 (diff) | |
| parent | 5b13e9227155e74310710bda4be1731aef43d1c2 (diff) | |
| download | frameworks_base-6746cf096b1a2f342ce81fce77a77dff01981e80.zip frameworks_base-6746cf096b1a2f342ce81fce77a77dff01981e80.tar.gz frameworks_base-6746cf096b1a2f342ce81fce77a77dff01981e80.tar.bz2 | |
Merge "Remove detestable tab characters."
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index c8cfe31b..ef1fb5e 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1251,7 +1251,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } catch(IllegalArgumentException ex) { Log.w(TAG, "Unknown sim state: " + simState); state = State.UNKNOWN; - } + } mSimDatas.put(subId, new SimData(state, slotId, subId)); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index 5c254a26..422378b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -172,7 +172,7 @@ public class PhoneStatusBarPolicy { private void updateAlarm() { AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE); - boolean alarmSet = alarmManager.getNextAlarmClock(UserHandle.USER_CURRENT) != null; + boolean alarmSet = alarmManager.getNextAlarmClock(UserHandle.USER_CURRENT) != null; mService.setIconVisibility(SLOT_ALARM_CLOCK, alarmSet); } |