Merge "Fix NPE in AutoSyncWorkDataPreferenceController" am: cdd628e6e4 am: 0bc6b461be

am: eb0ebc6b98 Change-Id: I12a16dd3ef5cfcda92efd166d3f2fccdd20527d1
2018-02-07 22:19:31 +00:00
parent 87ed226f37 eb0ebc6b98
commit 3d38ab00cb
2 changed files with 22 additions and 0 deletions
--- a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java
+++ b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java
@@ -17,6 +17,7 @@ package com.android.settings.users;

 import android.app.Fragment;
 import android.content.Context;
+import android.os.UserHandle;

 import com.android.settings.Utils;

@@ -34,4 +35,10 @@ public class AutoSyncWorkDataPreferenceController extends AutoSyncPersonalDataPr
    public String getPreferenceKey() {
        return KEY_AUTO_SYNC_WORK_ACCOUNT;
    }
+
+    @Override
+    public boolean isAvailable() {
+        return mUserHandle != null && !mUserManager.isManagedProfile() && !mUserManager.isLinkedUser()
+                && mUserManager.getProfiles(UserHandle.myUserId()).size() > 1;
+    }
 }