commit fa8d6050fea869b35d8f895814512621cc928185
author Brian Carlstrom <bdc@google.com> Mon Sep 08 23:39:56 2014 -0700
committer Brian Carlstrom <bdc@google.com> Tue Sep 09 00:04:28 2014 -0700
tree 546cac6ae2782637299d0577bfc4e84114c3f899
parent e45b4a5fba6c94e181f47e44a1c27696af4c42ef

Tracking PhoneAccount API

Bug: 17390175
Bug: 17329632
Change-Id: Ib7900465154c3c4b88483e255c939e59bc6c03d5

apps/CtsVerifier/src/com/android/cts/verifier/telecomm/CancelCallTestActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/telecomm/CancelCallTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/telecomm/CancelCallTestActivity.java
index cbc7b08..088cf49 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/telecomm/CancelCallTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/telecomm/CancelCallTestActivity.java
@@ -57,10 +57,9 @@
                                 CancellingConnectionService.class),
                         getClass().getSimpleName()
                 );
-                PhoneAccount account = new PhoneAccount.Builder()
-                        .withAccountHandle(mPhoneAccountHandle)
-                        .withCapabilities(PhoneAccount.CAPABILITY_CONNECTION_MANAGER)
-                        .withLabel("Call Cancel Manager")
+                PhoneAccount account = new PhoneAccount.Builder(mPhoneAccountHandle,
+                                                                "Call Cancel Manager")
+                        .setCapabilities(PhoneAccount.CAPABILITY_CONNECTION_MANAGER)
                         .build();
 
                 getTelecommManager().registerPhoneAccount(account);

tests/tests/telecomm/src/android/telecomm/cts/TelecommManagerTest.java

diff --git a/tests/tests/telecomm/src/android/telecomm/cts/TelecommManagerTest.java b/tests/tests/telecomm/src/android/telecomm/cts/TelecommManagerTest.java
index e6d880e..3c218e0 100644
--- a/tests/tests/telecomm/src/android/telecomm/cts/TelecommManagerTest.java
+++ b/tests/tests/telecomm/src/android/telecomm/cts/TelecommManagerTest.java
@@ -28,15 +28,15 @@
 
 public class TelecommManagerTest extends AndroidTestCase {
     public void testRegisterAccountsBlocked() {
-        PhoneAccount phoneAccount = PhoneAccount.builder()
-                .setAccountHandle(new PhoneAccountHandle(
-                                new ComponentName(getContext(), TelecommManagerTest.class),
-                                "testRegisterAccountsBlocked"))
-                .setHandle(Uri.parse("tel:6502637643"))
+        PhoneAccount phoneAccount = new PhoneAccount.Builder(
+                new PhoneAccountHandle(
+                        new ComponentName(getContext(), TelecommManagerTest.class),
+                        "testRegisterAccountsBlocked"),
+                "Mock PhoneAccount")
+                .setAddress(Uri.parse("tel:6502637643"))
                 .setSubscriptionAddress(Uri.parse("tel:650-263-7643"))
                 .setCapabilities(PhoneCapabilities.ALL)
                 .setIconResId(0)
-                .setLabel("Mock PhoneAccount")
                 .setShortDescription("PhoneAccount used in TelecommManagerTest")
                 .build();