PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use AfW user handle when setting auto_sync for work" into oc-dev

Browse Source 
am: 4967646661

Change-Id: I6548247f2eb2f4946fd51e109bccfb0ea3bfcfb9
This commit is contained in:
Fan Zhang
2017-04-19 19:38:30 +00:00
committed by android-build-merger
parent 8a3d606a60 4967646661
commit 3acabbdee9
3 changed files with 116 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/accounts/AutoSyncDataPreferenceController.java
View File

@@ -28,8 +28,8 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
@@ -41,9 +41,10 @@ public class AutoSyncDataPreferenceController extends PreferenceController {
private static final String TAG_CONFIRM_AUTO_SYNC_CHANGE = "confirmAutoSyncChange";
private static final String KEY_AUTO_SYNC_ACCOUNT = "auto_sync_account_data";
protected UserManager mUserManager;
private UserHandle mUserHandle;
private Fragment mParentFragment;
protected final UserManager mUserManager;
private final Fragment mParentFragment;
protected UserHandle mUserHandle;
public AutoSyncDataPreferenceController(Context context, Fragment parent) {
super(context);

4
src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.accounts;
import android.app.Fragment;
import android.content.Context;
import com.android.settings.Utils;
public class AutoSyncWorkDataPreferenceController extends AutoSyncPersonalDataPreferenceController {
private static final String TAG = "AutoSyncWorkData";
@@ -25,11 +27,11 @@ public class AutoSyncWorkDataPreferenceController extends AutoSyncPersonalDataPr
public AutoSyncWorkDataPreferenceController(Context context, Fragment parent) {
super(context, parent);
mUserHandle = Utils.getManagedProfile(mUserManager);
}
@Override
public String getPreferenceKey() {
return KEY_AUTO_SYNC_WORK_ACCOUNT;
}
}