commit 8bcd0591bf3c06d03f3c3157ba4f22f5eb85804c
author Sanket Padawe <sanketpadawe@google.com> Fri May 20 16:47:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 20 16:47:08 2016 +0000
tree 7cfa6f3100a562fa27e9d684bc72a3bcfdd8d714
parent e011cd65682cd37251cc8b28fac64548ce43010d
parent 99ef1e3f6183db6d87e366e410e987ff5e2d1a95

Merge "Add new API to get snapshot of RIL command metrics" into nyc-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 781bd40..7570d26 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -691,7 +691,7 @@
             android:exported="true"
             android:permission="com.android.voicemail.permission.READ_VOICEMAIL">
             <intent-filter>
-                <action android:name="android.intent.action.SYNC_VOICEMAIL"/>
+                <action android:name="android.provider.action.SYNC_VOICEMAIL"/>
             </intent-filter>
         </receiver>
        <receiver

src/com/android/services/telephony/DisconnectCauseUtil.java

diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index d7db345..f8fd918 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -137,6 +137,9 @@
             case android.telephony.DisconnectCause.NOT_DISCONNECTED:
                 return DisconnectCause.UNKNOWN;
 
+            case android.telephony.DisconnectCause.CALL_PULLED:
+                return DisconnectCause.CALL_PULLED;
+
             default:
                 Log.w("DisconnectCauseUtil.toTelecomDisconnectCauseCode",
                         "Unrecognized Telephony DisconnectCause "
@@ -214,6 +217,9 @@
                 resourceId = R.string.callFailed_unobtainable_number;
                 break;
 
+            case android.telephony.DisconnectCause.CALL_PULLED:
+                resourceId = R.string.callEnded_pulled;
+
             default:
                 break;
         }
@@ -329,6 +335,10 @@
                 resourceId = R.string.callFailed_video_call_tty_enabled;
                 break;
 
+            case android.telephony.DisconnectCause.CALL_PULLED:
+                resourceId = R.string.callEnded_pulled;
+                break;
+
             case android.telephony.DisconnectCause.OUTGOING_CANCELED:
                 // We don't want to show any dialog for the canceled case since the call was
                 // either canceled by the user explicitly (end-call button pushed immediately)