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

Prevent sync state changes when user is a monkey

Browse Source 
Bug: 7385019

Change-Id: Icf305683e57b83b3260f2587ae0a3d1a6dc3c21d
This commit is contained in:
Guang Zhu
2012-10-19 17:55:05 -07:00
parent d983e1d1a5
commit 167ba2af93
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/DataUsageSummary.java
View File

@@ -553,7 +553,11 @@ public class DataUsageSummary extends Fragment {
return true; return true;
} }
case R.id.data_usage_menu_auto_sync: { case R.id.data_usage_menu_auto_sync: {
ConfirmAutoSyncChangeFragment.show(this, !item.isChecked()); if (ActivityManager.isUserAMonkey()) {
Log.d("SyncState", "ignoring monkey's attempt to flip global sync state");
} else {
ConfirmAutoSyncChangeFragment.show(this, !item.isChecked());
}
return true; return true;
} }
} }

7
src/com/android/settings/accounts/SyncSettings.java
View File

@@ -20,6 +20,7 @@ import android.accounts.Account;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.accounts.OnAccountsUpdateListener; import android.accounts.OnAccountsUpdateListener;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
@@ -56,7 +57,11 @@ public class SyncSettings extends AccountPreferenceBase
mAutoSyncPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { mAutoSyncPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
ContentResolver.setMasterSyncAutomatically((Boolean) newValue); if (ActivityManager.isUserAMonkey()) {
Log.d("SyncSettings", "ignoring monkey's attempt to flip sync state");
} else {
ContentResolver.setMasterSyncAutomatically((Boolean) newValue);
}
return true; return true;
} }
}); });

8
src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
View File

@@ -17,9 +17,11 @@
package com.android.settings.accounts; package com.android.settings.accounts;
import android.accounts.Account; import android.accounts.Account;
import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
@@ -131,7 +133,11 @@ public class SyncStateCheckBoxPreference extends CheckBoxPreference {
// When we're in one-time sync mode, we don't want a click to change the // When we're in one-time sync mode, we don't want a click to change the
// checkbox state // checkbox state
if (!mOneTimeSyncMode) { if (!mOneTimeSyncMode) {
super.onClick(); if (ActivityManager.isUserAMonkey()) {
Log.d("SyncState", "ignoring monkey's attempt to flip sync state");
} else {
super.onClick();
}
} }
} }