diff options
| author | Sarah Chin <sarahchin@google.com> | 2021-09-08 16:12:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-09-08 16:12:28 +0000 |
| commit | 52912f3b09723ca8c180d5660c6b0623ea5b9921 (patch) | |
| tree | 5ad9d00819ff20bf31d6880a5a50d18fbb4383c4 | |
| parent | 939036c946cd7896570062b44f0c90965f56a419 (diff) | |
| parent | df4171d1eb58b103082cc20b55d393d55d54965f (diff) | |
| download | platform_packages_services_Telephony-android-s-beta-5.tar.gz platform_packages_services_Telephony-android-s-beta-5.tar.bz2 platform_packages_services_Telephony-android-s-beta-5.zip | |
Merge "Separate results and exceptions for modem activity"android-s-beta-5android-s-beta-5
| -rwxr-xr-x | src/com/android/phone/PhoneInterfaceManager.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java index 5cd629764..278d64869 100755 --- a/src/com/android/phone/PhoneInterfaceManager.java +++ b/src/com/android/phone/PhoneInterfaceManager.java @@ -1226,13 +1226,13 @@ public class PhoneInterfaceManager extends ITelephony.Stub { } break; - case EVENT_GET_MODEM_ACTIVITY_INFO_DONE: + case EVENT_GET_MODEM_ACTIVITY_INFO_DONE: { ar = (AsyncResult) msg.obj; request = (MainThreadRequest) ar.userObj; ResultReceiver result = (ResultReceiver) request.argument; - ModemActivityInfo ret = new ModemActivityInfo(0, 0, 0, - new int[ModemActivityInfo.getNumTxPowerLevels()], 0); + ModemActivityInfo ret = null; + int error = 0; if (ar.exception == null && ar.result != null) { // Update the last modem activity info and the result of the request. ModemActivityInfo info = (ModemActivityInfo) ar.result; @@ -1262,18 +1262,29 @@ public class PhoneInterfaceManager extends ITelephony.Stub { } else { if (ar.result == null) { loge("queryModemActivityInfo: Empty response"); + error = TelephonyManager.ModemActivityInfoException + .ERROR_INVALID_INFO_RECEIVED; } else if (ar.exception instanceof CommandException) { loge("queryModemActivityInfo: CommandException: " + ar.exception); + error = TelephonyManager.ModemActivityInfoException + .ERROR_MODEM_RESPONSE_ERROR; } else { loge("queryModemActivityInfo: Unknown exception"); + error = TelephonyManager.ModemActivityInfoException + .ERROR_UNKNOWN; } } Bundle bundle = new Bundle(); - bundle.putParcelable(TelephonyManager.MODEM_ACTIVITY_RESULT_KEY, ret); + if (ret != null) { + bundle.putParcelable(TelephonyManager.MODEM_ACTIVITY_RESULT_KEY, ret); + } else { + bundle.putInt(TelephonyManager.EXCEPTION_RESULT_KEY, error); + } result.send(0, bundle); notifyRequester(request); break; + } case CMD_SET_ALLOWED_CARRIERS: request = (MainThreadRequest) msg.obj; |