Merge 01d52d5020942e9fd3f020f910d8d59c28cc5fbd on remote branch

Change-Id: I5a8963e42dea0a788f490b4f3a024408569c4822

1 files changed, 13 insertions, 0 deletions

diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index 75a7f42e0..35ddb0639 100644
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -193,6 +193,8 @@ public abstract class ServiceStateTracker extends Handler {
         "tg", // Togo
     };
 
+    private ArrayList<CellInfoResult> mCellInfoWaitList;
+
     private class CellInfoResult {
         List<CellInfo> list;
         Object lockObj = new Object();
@@ -206,6 +208,7 @@ public abstract class ServiceStateTracker extends Handler {
         mPhoneBase = phoneBase;
         mCellInfo = cellInfo;
         mCi = ci;
+        mCellInfoWaitList = new ArrayList<CellInfoResult>();
         mVoiceCapable = mPhoneBase.getContext().getResources().getBoolean(
                 com.android.internal.R.bool.config_voice_capable);
         mUiccController = UiccController.getInstance();
@@ -221,6 +224,13 @@ public abstract class ServiceStateTracker extends Handler {
         mCi.unSetOnSignalStrengthUpdate(this);
         mUiccController.unregisterForIccChanged(this);
         mCi.unregisterForCellInfoList(this);
+        for (CellInfoResult result : mCellInfoWaitList) {
+            synchronized(result.lockObj) {
+                result.list = null;
+                result.lockObj.notify();
+            }
+        }
+        mCellInfoWaitList.clear();
     }
 
     public boolean getDesiredPowerState() {
@@ -419,6 +429,7 @@ public abstract class ServiceStateTracker extends Handler {
                     mLastCellInfoListTime = SystemClock.elapsedRealtime();
                     mLastCellInfoList = result.list;
                     result.lockObj.notify();
+                    mCellInfoWaitList.remove(result);
                 }
                 break;
             }
@@ -739,10 +750,12 @@ public abstract class ServiceStateTracker extends Handler {
                     synchronized(result.lockObj) {
                         mCi.getCellInfoList(msg);
                         try {
+                            mCellInfoWaitList.add(result);
                             result.lockObj.wait();
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                             result.list = null;
+                            mCellInfoWaitList.remove(result);
                         }
                     }
                 } else {