commit 0dc7d4b5d2951ee2787b878bd924b385968c5f35
author Evan Charlton <evanc@google.com> Sat Jul 19 18:22:31 2014 -0700
committer Evan Charlton <evanc@google.com> Sun Jul 20 10:31:34 2014 -0700
tree 2f2c41a3319f2f0b9aae12efbbc9dbf40a10c72e
parent 1227b2a7a6d0ae8bfa4cf2065bed4d5f9e341e37

Rename PhoneAccount to PhoneAccountHandle

Change-Id: I2e97b348e6316a8b3ccc39fd81013e7f514a2889

src/com/android/contacts/common/CallUtil.java

diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index 1802db6..44b70fe 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -18,7 +18,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.telecomm.PhoneAccount;
+import android.telecomm.PhoneAccountHandle;
 import android.telecomm.TelecommManager;
 import android.telecomm.VideoCallProfile;
 
@@ -63,22 +63,23 @@
     /**
      * A variant of {@link #getCallIntent(String)} but also include {@code Account}.
      */
-    public static Intent getCallIntent(String number, PhoneAccount account) {
+    public static Intent getCallIntent(String number, PhoneAccountHandle account) {
         return getCallIntent(number, null, account);
     }
 
     /**
      * A variant of {@link #getCallIntent(android.net.Uri)} but also include {@code Account}.
      */
-    public static Intent getCallIntent(Uri uri, PhoneAccount account) {
-        return getCallIntent(uri, null, account);
+    public static Intent getCallIntent(Uri uri, PhoneAccountHandle accountHandle) {
+        return getCallIntent(uri, null, accountHandle);
     }
 
     /**
      * A variant of {@link #getCallIntent(String, String)} but also include {@code Account}.
      */
-    public static Intent getCallIntent(String number, String callOrigin, PhoneAccount account) {
-        return getCallIntent(getCallUri(number), callOrigin, account);
+    public static Intent getCallIntent(
+            String number, String callOrigin, PhoneAccountHandle accountHandle) {
+        return getCallIntent(getCallUri(number), callOrigin, accountHandle);
     }
 
     /**
@@ -86,8 +87,10 @@
      * origin and {@code Account}.
      * For more information about call origin, see comments in Phone package (PhoneApp).
      */
-    public static Intent getCallIntent(Uri uri, String callOrigin, PhoneAccount account) {
-        return getCallIntent(uri, callOrigin, account, VideoCallProfile.VIDEO_STATE_AUDIO_ONLY);
+    public static Intent getCallIntent(
+            Uri uri, String callOrigin, PhoneAccountHandle accountHandle) {
+        return getCallIntent(uri, callOrigin, accountHandle,
+                VideoCallProfile.VIDEO_STATE_AUDIO_ONLY);
     }
 
     /**
@@ -99,19 +102,21 @@
     }
 
     /**
-     * A variant of {@link #getCallIntent(String, String, PhoneAccount)} for starting a video call.
+     * A variant of {@link #getCallIntent(String, String, android.telecomm.PhoneAccountHandle)} for
+     * starting a video call.
      */
     public static Intent getVideoCallIntent(
-            String number, String callOrigin, PhoneAccount account) {
-        return getCallIntent(getCallUri(number), callOrigin, account,
+            String number, String callOrigin, PhoneAccountHandle accountHandle) {
+        return getCallIntent(getCallUri(number), callOrigin, accountHandle,
                 VideoCallProfile.VIDEO_STATE_BIDIRECTIONAL);
     }
 
     /**
-     * A variant of {@link #getCallIntent(String, String, PhoneAccount)} for starting a video call.
+     * A variant of {@link #getCallIntent(String, String, android.telecomm.PhoneAccountHandle)} for
+     * starting a video call.
      */
-    public static Intent getVideoCallIntent(String number, PhoneAccount account) {
-        return getVideoCallIntent(number, null, account);
+    public static Intent getVideoCallIntent(String number, PhoneAccountHandle accountHandle) {
+        return getVideoCallIntent(number, null, accountHandle);
     }
 
     /**
@@ -120,15 +125,15 @@
      * For more information about call origin, see comments in Phone package (PhoneApp).
      */
     public static Intent getCallIntent(
-            Uri uri, String callOrigin, PhoneAccount account, int videoState) {
+            Uri uri, String callOrigin, PhoneAccountHandle accountHandle, int videoState) {
         final Intent intent = new Intent(Intent.ACTION_CALL_PRIVILEGED, uri);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(TelecommManager.EXTRA_START_CALL_WITH_VIDEO_STATE, videoState);
         if (callOrigin != null) {
             intent.putExtra(PhoneConstants.EXTRA_CALL_ORIGIN, callOrigin);
         }
-        if (account != null) {
-            intent.putExtra(TelecommManager.EXTRA_PHONE_ACCOUNT, account);
+        if (accountHandle != null) {
+            intent.putExtra(TelecommManager.EXTRA_PHONE_ACCOUNT_HANDLE, accountHandle);
         }
 
         return intent;