commit 0e1dc5a99042dd05b94b16a41461a3632a3fe5ee
author Sailesh Nepal <sail@google.com> Wed Jul 30 11:08:54 2014 -0700
committer Sailesh Nepal <sail@google.com> Wed Jul 30 18:33:32 2014 +0000
tree 9168a0deb10e8d88ad3c01fd93377260c44c69fe
parent 483c1ab6805f4c079dcd28a4fd9f21b42770d59e

Remove work arounds for Hangouts

Change-Id: I599a856d2c5a54a4f5c42dde43a9cfbc1c091cf8

src/com/android/telecomm/PhoneAccountRegistrar.java

diff --git a/src/com/android/telecomm/PhoneAccountRegistrar.java b/src/com/android/telecomm/PhoneAccountRegistrar.java
index 56fe975..09ff547 100644
--- a/src/com/android/telecomm/PhoneAccountRegistrar.java
+++ b/src/com/android/telecomm/PhoneAccountRegistrar.java
@@ -16,25 +16,19 @@
 
 package com.android.telecomm;
 
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.util.FastXmlSerializer;
-import com.android.internal.util.XmlUtils;
-
 import android.telecomm.PhoneAccount;
 import android.telecomm.PhoneAccountHandle;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlSerializer;
-
 import android.content.ComponentName;
 import android.content.Context;
-
 import android.net.Uri;
 import android.telecomm.TelecommManager;
 import android.util.AtomicFile;
 import android.util.Xml;
 
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.util.FastXmlSerializer;
+import com.android.internal.util.XmlUtils;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -47,6 +41,10 @@
 import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlSerializer;
+
 /**
  * Handles writing and reading PhoneAccountHandle registration entries. This is a simple verbatim
  * delegate for all the account handling methods on {@link TelecommManager} as implemented in
@@ -197,7 +195,6 @@
     // TODO: Should we implement an artificial limit for # of accounts associated with a single
     // ComponentName?
     public void registerPhoneAccount(PhoneAccount account) {
-        account = hackFixBabelAccount(account);
         mState.accounts.add(account);
         // Search for duplicates and remove any that are found.
         for (int i = 0; i < mState.accounts.size() - 1; i++) {
@@ -213,21 +210,6 @@
         fireAccountsChanged();
     }
 
-    // STOPSHIP: Hack to edit the account registered by Babel so it shows up properly
-    private PhoneAccount hackFixBabelAccount(PhoneAccount account) {
-        String pkg = account.getAccountHandle().getComponentName().getPackageName();
-        return "com.google.android.talk".equals(pkg)
-                ? new PhoneAccount(
-                        account.getAccountHandle(),
-                        account.getHandle(),
-                        account.getSubscriptionNumber(),
-                        PhoneAccount.CAPABILITY_CONNECTION_MANAGER,
-                        account.getIconResId(),
-                        account.getLabel(),
-                        account.getShortDescription())
-                : account;
-    }
-
     public void unregisterPhoneAccount(PhoneAccountHandle accountHandle) {
         for (int i = 0; i < mState.accounts.size(); i++) {
             if (Objects.equals(accountHandle, mState.accounts.get(i).getAccountHandle())) {