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

Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alexandra Gherghina
2014-11-18 10:02:36 +00:00
committed by Android (Google) Code Review
parent d85aa17894 2a3d649766
commit 3a84d40133
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -24,6 +24,7 @@ import android.accounts.AccountManagerCallback;
import android.accounts.AccountManagerFuture; import android.accounts.AccountManagerFuture;
import android.accounts.AuthenticatorException; import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException; import android.accounts.OperationCanceledException;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -313,12 +314,18 @@ public class AccountSyncSettings extends AccountPreferenceBase {
private void startSyncForEnabledProviders() { private void startSyncForEnabledProviders() {
requestOrCancelSyncForEnabledProviders(true /* start them */); requestOrCancelSyncForEnabledProviders(true /* start them */);
getActivity().invalidateOptionsMenu(); final Activity activity = getActivity();
if (activity != null) {
activity.invalidateOptionsMenu();
}
} }
private void cancelSyncForEnabledProviders() { private void cancelSyncForEnabledProviders() {
requestOrCancelSyncForEnabledProviders(false /* cancel them */); requestOrCancelSyncForEnabledProviders(false /* cancel them */);
getActivity().invalidateOptionsMenu(); final Activity activity = getActivity();
if (activity != null) {
activity.invalidateOptionsMenu();
}
} }
private void requestOrCancelSyncForEnabledProviders(boolean startSync) { private void requestOrCancelSyncForEnabledProviders(boolean startSync) {
@@ -367,7 +374,10 @@ public class AccountSyncSettings extends AccountPreferenceBase {
protected void onSyncStateUpdated() { protected void onSyncStateUpdated() {
if (!isResumed()) return; if (!isResumed()) return;
setFeedsState(); setFeedsState();
getActivity().invalidateOptionsMenu(); final Activity activity = getActivity();
if (activity != null) {
activity.invalidateOptionsMenu();
}
} }
private void setFeedsState() { private void setFeedsState() {
@@ -440,7 +450,6 @@ public class AccountSyncSettings extends AccountPreferenceBase {
syncPref.setChecked(oneTimeSyncMode || syncEnabled); syncPref.setChecked(oneTimeSyncMode || syncEnabled);
} }
mErrorInfoView.setVisibility(syncIsFailing ? View.VISIBLE : View.GONE); mErrorInfoView.setVisibility(syncIsFailing ? View.VISIBLE : View.GONE);
getActivity().invalidateOptionsMenu();
} }
@Override @Override

6
src/com/android/settings/accounts/ManageAccountsSettings.java
View File

@@ -231,7 +231,11 @@ public class ManageAccountsSettings extends AccountPreferenceBase
@Override @Override
protected void onSyncStateUpdated() { protected void onSyncStateUpdated() {
showSyncState(); showSyncState();
getActivity().invalidateOptionsMenu(); // Catch any delayed delivery of update messages
final Activity activity = getActivity();
if (activity != null) {
activity.invalidateOptionsMenu();
}
} }
/** /**