commit a9a3d768ac98dfc7aeb712bed194ba217f8c5035
author Brian Attwell <brianattwell@google.com> Fri Dec 19 23:57:46 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 19 23:57:46 2014 +0000
tree 6f6994eca9752665012577e710f17ecee2d7416f
parent 47ff9c6190f68e0bd52937cc014061823878c1b8
parent 73a6764f6724f69496afcce602234621efe7fca0

Merge "Use getSystemService for services. Unbundling."

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 6d8d231..df9d176 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -20,6 +20,7 @@
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.net.Uri;
@@ -845,7 +846,7 @@
             //
             // Also check for ability to modify accounts.  In limited user mode, you can't modify
             // accounts so there is no point sending users to account setup activity.
-            final UserManager userManager = UserManager.get(this);
+            final UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
             final boolean disallowModifyAccounts = userManager.getUserRestrictions().getBoolean(
                     UserManager.DISALLOW_MODIFY_ACCOUNTS);
             if (!disallowModifyAccounts && !areContactWritableAccountsAvailable() &&

src/com/android/contacts/util/PhoneCapabilityTester.java

diff --git a/src/com/android/contacts/util/PhoneCapabilityTester.java b/src/com/android/contacts/util/PhoneCapabilityTester.java
index b2d10be..a510b76 100644
--- a/src/com/android/contacts/util/PhoneCapabilityTester.java
+++ b/src/com/android/contacts/util/PhoneCapabilityTester.java
@@ -28,7 +28,6 @@
 import android.telephony.TelephonyManager;
 
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.R;
 
 import java.util.List;
 
@@ -62,7 +61,8 @@
     }
 
     private static void initialize(Context context) {
-        final TelephonyManager telephonyManager = new TelephonyManager(context);
+        final TelephonyManager telephonyManager
+                = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
         sIsPhone = telephonyManager.isVoiceCapable();
         sIsSipPhone = sIsPhone && SipManager.isVoipSupported(context);
         sIsInitialized = true;