Fix monkey crash on selecting account sync prefernece.

When running monkey, the authority in the preference might not have been
properly set. Add a check for valid authority before trying to update
the sync automatically setting.

Change-Id: I59f910565fc9f128e86bd92337135fe46fed12e1
Fixes: 80551551
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2018-06-05 17:31:22 -07:00
parent 44931d1e96
commit 366418dab7
3 changed files with 72 additions and 3 deletions

View File

@@ -247,10 +247,13 @@ public class AccountSyncSettings extends AccountPreferenceBase {
}
if (preference instanceof SyncStateSwitchPreference) {
SyncStateSwitchPreference syncPref = (SyncStateSwitchPreference) preference;
String authority = syncPref.getAuthority();
Account account = syncPref.getAccount();
final String authority = syncPref.getAuthority();
if (TextUtils.isEmpty(authority)) {
return false;
}
final Account account = syncPref.getAccount();
final int userId = mUserHandle.getIdentifier();
String packageName = syncPref.getPackageName();
final String packageName = syncPref.getPackageName();
boolean syncAutomatically = ContentResolver.getSyncAutomaticallyAsUser(account,
authority, userId);

View File

@@ -0,0 +1,57 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.accounts;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.accounts.Account;
import android.app.Activity;
import android.content.Context;
import android.os.UserHandle;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowContentResolver;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowContentResolver.class})
public class AccountSyncSettingsTest {
@After
public void tearDown() {
ShadowContentResolver.reset();
}
@Test
public void onPreferenceTreeClick_nullAuthority_shouldNotCrash() {
final Context context = RuntimeEnvironment.application;
final AccountSyncSettings settings = spy(new AccountSyncSettings());
when(settings.getActivity()).thenReturn(mock(Activity.class));
final SyncStateSwitchPreference preference = new SyncStateSwitchPreference(context,
new Account("acct1", "type1"), "" /* authority */, "testPackage", 1 /* uid */);
preference.setOneTimeSyncMode(false);
ReflectionHelpers.setField(settings, "mUserHandle", UserHandle.CURRENT);
settings.onPreferenceTreeClick(preference);
// no crash
}
}

View File

@@ -24,6 +24,7 @@ import android.database.Cursor;
import android.database.MatrixCursor;
import android.net.Uri;
import android.provider.SearchIndexablesContract;
import android.text.TextUtils;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter;
@@ -66,6 +67,14 @@ public class ShadowContentResolver {
return sSyncAutomatically.containsKey(authority) ? sSyncAutomatically.get(authority) : true;
}
@Implementation
public static void setSyncAutomaticallyAsUser(Account account, String authority, boolean sync,
int userId) {
if (TextUtils.isEmpty(authority)) {
throw new IllegalArgumentException("Authority must be non-empty");
}
}
@Implementation
public static boolean getMasterSyncAutomaticallyAsUser(int userId) {
return sMasterSyncAutomatically.containsKey(userId)