summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-01-07 16:14:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-07 16:14:09 +0000
commit6746cf096b1a2f342ce81fce77a77dff01981e80 (patch)
tree9f7eb4d0ca317dc649852188f39dd26f543fd25b
parent40a0709a56277e26e63654a58d285e6a471d33c0 (diff)
parent5b13e9227155e74310710bda4be1731aef43d1c2 (diff)
downloadframeworks_base-6746cf096b1a2f342ce81fce77a77dff01981e80.zip
frameworks_base-6746cf096b1a2f342ce81fce77a77dff01981e80.tar.gz
frameworks_base-6746cf096b1a2f342ce81fce77a77dff01981e80.tar.bz2
Merge "Remove detestable tab characters."
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java2
-rw-r--r--services/core/java/com/android/server/notification/NotificationUsageStats.java2
3 files changed, 3 insertions, 3 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);
}
diff --git a/services/core/java/com/android/server/notification/NotificationUsageStats.java b/services/core/java/com/android/server/notification/NotificationUsageStats.java
index 3d13d21..e029c58 100644
--- a/services/core/java/com/android/server/notification/NotificationUsageStats.java
+++ b/services/core/java/com/android/server/notification/NotificationUsageStats.java
@@ -222,7 +222,7 @@ public class NotificationUsageStats {
public void collect(SingleNotificationStats singleNotificationStats) {
posttimeMs.addSample(
- SystemClock.elapsedRealtime() - singleNotificationStats.posttimeElapsedMs);
+ SystemClock.elapsedRealtime() - singleNotificationStats.posttimeElapsedMs);
if (singleNotificationStats.posttimeToDismissMs >= 0) {
posttimeToDismissMs.addSample(singleNotificationStats.posttimeToDismissMs);
}