Merge "Fix NPE in AutoSyncWorkDataPreferenceController"

am: cdd628e6e4 Change-Id: Ic10709693acbf3f04704ed76a7474291af509cf5
2018-02-07 22:13:14 +00:00
parent 6d55e0633e cdd628e6e4
commit 0bc6b461be
2 changed files with 22 additions and 0 deletions
--- a/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
+++ b/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
@@ -17,6 +17,7 @@ package com.android.settings.accounts;

 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;
+    }
 }