commit b3a84e78242694140e6c1f0133b1767918dce048
author Amit Mahajan <amitmahajan@google.com> Fri Jan 29 00:00:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 29 00:00:46 2016 +0000
tree 36a490b2e52fe81983411eba3db2d7950f38c0ce
parent 96c2cde0afe396dd28ef1e902c2b0dce5d418482
parent 5e2097c42ef169eb6892a229495d56878ed0092b

Merge "Return empty ModemActivityInfo in error case instead of null." into mm-wireless-dev
am: 5e2097c42e

* commit '5e2097c42ef169eb6892a229495d56878ed0092b':
  Return empty ModemActivityInfo in error case instead of null.

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 4b22e57..63256b6 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -740,6 +740,10 @@
                             loge("queryModemActivityInfo: Unknown exception");
                         }
                     }
+                    // Result cannot be null. Return ModemActivityInfo with all fields set to 0.
+                    if (request.result == null) {
+                        request.result = new ModemActivityInfo(0, 0, 0, null, 0, 0);
+                    }
                     synchronized (request) {
                         request.notifyAll();
                     }