commit 94d01629010a61f6112713f22330d5fd4baae851
author Evan Charlton <evanc@google.com> Sun Jul 20 12:32:05 2014 -0700
committer Evan Charlton <evanc@google.com> Sun Jul 20 14:40:52 2014 -0700
tree 0c13f788a145d046c4a39ff66a6ef91071e0b8b4
parent 89176375c8d97db25588f720952a4fadbce2f9a3

Rename PhoneAccountMetadata to PhoneAccount

Change-Id: I4597b14110c1cee7f637ec125b839852ef0f34c4

src/com/android/telecomm/TelecommApp.java

diff --git a/src/com/android/telecomm/TelecommApp.java b/src/com/android/telecomm/TelecommApp.java
index 3884d08..cf7b8df 100644
--- a/src/com/android/telecomm/TelecommApp.java
+++ b/src/com/android/telecomm/TelecommApp.java
@@ -20,8 +20,8 @@
 import android.content.ComponentName;
 import android.net.Uri;
 import android.os.UserHandle;
+import android.telecomm.PhoneAccount;
 import android.telecomm.PhoneAccountHandle;
-import android.telecomm.PhoneAccountMetadata;
 
 /**
  * Top-level Application class for Telecomm.
@@ -76,7 +76,7 @@
         // TODO: STOPSHIP. We are adding a hacked PhoneAccountHandle to ensure that Wi-Fi calling in
         // Hangouts continues to work. This needs to be replaced with proper Wi-Fi calling wiring
         // to the appropriate Connection Services.
-        PhoneAccountMetadata hangouts = new PhoneAccountMetadata(
+        PhoneAccount hangouts = new PhoneAccount(
                 new PhoneAccountHandle(
                         new ComponentName(
                                 "com.google.android.talk",
@@ -84,13 +84,13 @@
                         "null_id"),
                 Uri.fromParts("tel", "null_uri", null),
                 "650-253-0000",
-                PhoneAccountMetadata.CAPABILITY_CALL_PROVIDER,
+                PhoneAccount.CAPABILITY_CALL_PROVIDER,
                 R.drawable.stat_sys_phone_call,
                 "Wi-Fi calling",
                 "Wi-Fi calling by Google Hangouts",
                 false);
         mPhoneAccountRegistrar.clearAccounts(
-                hangouts.getAccount().getComponentName().getPackageName());
+                hangouts.getAccountHandle().getComponentName().getPackageName());
         mPhoneAccountRegistrar.registerPhoneAccount(hangouts);
     }
 }