am 6866ecb9: am 1d62c773: Fix the build

Merge commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea'

* commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea':
  Fix the build

1 files changed, 41 insertions, 41 deletions

diff --git a/services/java/com/android/server/sip/SipService.java b/services/java/com/android/server/sip/SipService.java
index e905089..1142136 100644
--- a/services/java/com/android/server/sip/SipService.java
+++ b/services/java/com/android/server/sip/SipService.java
@@ -1038,54 +1038,54 @@ public final class SipService extends ISipService.Stub {
             return toString();
         }
 
-        private static class MyEvent {
-            int mPeriod;
-            int mMaxPeriod;
-            long mTriggerTime;
-            long mLastTriggerTime;
-            Runnable mCallback;
-
-            MyEvent(int period, Runnable callback, long now) {
-                mPeriod = mMaxPeriod = period;
-                mCallback = callback;
-                mLastTriggerTime = now;
-            }
+        private String showTime(long time) {
+            int ms = (int) (time % 1000);
+            int s = (int) (time / 1000);
+            int m = s / 60;
+            s %= 60;
+            return String.format("%d.%d.%d", m, s, ms);
+        }
+    }
 
-            @Override
-            public String toString() {
-                String s = super.toString();
-                s = s.substring(s.indexOf("@"));
-                return s + ":" + (mPeriod / 1000) + ":" + (mMaxPeriod / 1000) + ":"
-                        + toString(mCallback);
-            }
+    private static class MyEvent {
+        int mPeriod;
+        int mMaxPeriod;
+        long mTriggerTime;
+        long mLastTriggerTime;
+        Runnable mCallback;
 
-            private String toString(Object o) {
-                String s = o.toString();
-                int index = s.indexOf("$");
-                if (index > 0) s = s.substring(index + 1);
-                return s;
-            }
+        MyEvent(int period, Runnable callback, long now) {
+            mPeriod = mMaxPeriod = period;
+            mCallback = callback;
+            mLastTriggerTime = now;
         }
 
-        private static class MyEventComparator implements Comparator<MyEvent> {
-            public int compare(MyEvent e1, MyEvent e2) {
-                if (e1 == e2) return 0;
-                int diff = e1.mMaxPeriod - e2.mMaxPeriod;
-                if (diff == 0) diff = -1;
-                return diff;
-            }
+        @Override
+        public String toString() {
+            String s = super.toString();
+            s = s.substring(s.indexOf("@"));
+            return s + ":" + (mPeriod / 1000) + ":" + (mMaxPeriod / 1000) + ":"
+                    + toString(mCallback);
+        }
 
-            public boolean equals(Object that) {
-                return (this == that);
-            }
+        private String toString(Object o) {
+            String s = o.toString();
+            int index = s.indexOf("$");
+            if (index > 0) s = s.substring(index + 1);
+            return s;
         }
+    }
 
-        private static String showTime(long time) {
-            int ms = (int) (time % 1000);
-            int s = (int) (time / 1000);
-            int m = s / 60;
-            s %= 60;
-            return String.format("%d.%d.%d", m, s, ms);
+    private static class MyEventComparator implements Comparator<MyEvent> {
+        public int compare(MyEvent e1, MyEvent e2) {
+            if (e1 == e2) return 0;
+            int diff = e1.mMaxPeriod - e2.mMaxPeriod;
+            if (diff == 0) diff = -1;
+            return diff;
+        }
+
+        public boolean equals(Object that) {
+            return (this == that);
         }
     }
 }