commit 0f48685588d59e08e8f1844b4735158e76146ca5
author Marcus Hagerott <mhagerott@google.com> Fri Oct 21 19:12:44 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 21 19:12:45 2016 +0000
tree c190e03cc06047e355f7576097c5f140da3a3943
parent 5202f1a35771eda5f7bec4321e4c9aba8afaf989
parent 596eb7e7cefd97fddc738c0600c24b08cbba827f

Merge "Add method to check if Google account exists." into ub-contactsdialer-h-dev

src/com/android/contacts/common/model/AccountTypeManager.java

diff --git a/src/com/android/contacts/common/model/AccountTypeManager.java b/src/com/android/contacts/common/model/AccountTypeManager.java
index d91e73b..4b0bcc1 100644
--- a/src/com/android/contacts/common/model/AccountTypeManager.java
+++ b/src/com/android/contacts/common/model/AccountTypeManager.java
@@ -275,6 +275,10 @@
         return false;
     }
 
+    public boolean hasGoogleAccount() {
+        return getDefaultGoogleAccount() != null;
+    }
+
     private static boolean hasRequiredPermissions(Context context) {
         final boolean canGetAccounts = ContextCompat.checkSelfPermission(context,
                 android.Manifest.permission.GET_ACCOUNTS) == PackageManager.PERMISSION_GRANTED;

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

diff --git a/src/com/android/contacts/util/SharedPreferenceUtil.java b/src/com/android/contacts/util/SharedPreferenceUtil.java
index 66a2f96..2f899e3 100644
--- a/src/com/android/contacts/util/SharedPreferenceUtil.java
+++ b/src/com/android/contacts/util/SharedPreferenceUtil.java
@@ -93,7 +93,7 @@
                 && !getHamburgerPromoDisplayedBefore(context);
     }
 
-    private static SharedPreferences getSharedPreferences(Context context) {
+    protected static SharedPreferences getSharedPreferences(Context context) {
         return context.getSharedPreferences(context.getPackageName(), Context.MODE_PRIVATE);
     }