diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2011-06-30 20:28:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-30 20:28:58 -0700 |
| commit | 1d65fcdc00d774b14dc9d023f938fab00b0aa50d (patch) | |
| tree | f4abc65c0755ee876ddcacbc872847ae17aa1932 | |
| parent | eefc90892101f5ab1caa1a8765c6b8f433a99619 (diff) | |
| parent | a6cec8feed5c135bb5f4d6193012d13258a067c4 (diff) | |
| download | frameworks_base-1d65fcdc00d774b14dc9d023f938fab00b0aa50d.zip frameworks_base-1d65fcdc00d774b14dc9d023f938fab00b0aa50d.tar.gz frameworks_base-1d65fcdc00d774b14dc9d023f938fab00b0aa50d.tar.bz2 | |
Merge "Synchronize SipWakeupTimer.onReceive()"
| -rw-r--r-- | voip/java/com/android/server/sip/SipWakeupTimer.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/voip/java/com/android/server/sip/SipWakeupTimer.java b/voip/java/com/android/server/sip/SipWakeupTimer.java index 76780c0..00d47ac 100644 --- a/voip/java/com/android/server/sip/SipWakeupTimer.java +++ b/voip/java/com/android/server/sip/SipWakeupTimer.java @@ -83,7 +83,7 @@ class SipWakeupTimer extends BroadcastReceiver { mEventQueue = null; } - private synchronized boolean stopped() { + private boolean stopped() { if (mEventQueue == null) { Log.w(TAG, "Timer stopped"); return true; @@ -233,7 +233,7 @@ class SipWakeupTimer extends BroadcastReceiver { } @Override - public void onReceive(Context context, Intent intent) { + public synchronized void onReceive(Context context, Intent intent) { // This callback is already protected by AlarmManager's wake lock. String action = intent.getAction(); if (getAction().equals(action) @@ -261,7 +261,7 @@ class SipWakeupTimer extends BroadcastReceiver { } } - private synchronized void execute(long triggerTime) { + private void execute(long triggerTime) { if (DEBUG_TIMER) Log.d(TAG, "time's up, triggerTime = " + showTime(triggerTime) + ": " + mEventQueue.size()); if (stopped() || mEventQueue.isEmpty()) return; |