commit 5e2097c42ef169eb6892a229495d56878ed0092b
author Amit Mahajan <amitmahajan@google.com> Thu Jan 28 23:56:15 2016 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Thu Jan 28 23:56:15 2016 +0000
tree d1ee2a89bd7880816c5dd8aa5f03711ae09d6563
parent 7d0a33a018b194304f666370c708ffe2a4568008
parent d476622ffe8a5371f7ae19a6eb3c0a0a665c3e7d

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

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6f828db..32dbfde 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -739,6 +739,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();
                     }