Merge "Fix NullPointerException in SettingsHelperRestoreTest." into main (38e73123) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@ public class SettingsHelper {

		// Get datatype for B&R metrics logging.
		String datatype = "";
		if (Flags.enableMetricsSettingsBackupAgents()) {
		if (areAgentMetricsEnabled()) {
		datatype = SettingsBackupRestoreKeys.getKeyFromUri(destination);
		}

		@@ -299,7 +299,7 @@ public class SettingsHelper {
		contentValues.put(Settings.NameValueTable.NAME, name);
		contentValues.put(Settings.NameValueTable.VALUE, value);
		cr.insert(destination, contentValues);
		if (Flags.enableMetricsSettingsBackupAgents()) {
		if (areAgentMetricsEnabled()) {
		mBackupRestoreEventLogger.logItemsRestored(datatype, /* count= */ 1);
		}
		} catch (Exception e) {
		@@ -308,7 +308,7 @@ public class SettingsHelper {
		sendBroadcastSystemUI = false;
		sendBroadcastAccessibility = false;
		Log.e(TAG, "Failed to restore setting name: " + name + " + value: " + value, e);
		if (Flags.enableMetricsSettingsBackupAgents()) {
		if (areAgentMetricsEnabled()) {
		mBackupRestoreEventLogger.logItemsRestoreFailed(
		datatype, /* count= */ 1, ERROR_FAILED_TO_RESTORE_SETTING);
		}
		@@ -785,12 +785,12 @@ public class SettingsHelper {

		am.updatePersistentConfigurationWithAttribution(config, mContext.getOpPackageName(),
		mContext.getAttributionTag());
		if (Flags.enableMetricsSettingsBackupAgents() && mBackupRestoreEventLogger != null) {
		if (areAgentMetricsEnabled()) {
		mBackupRestoreEventLogger
		.logItemsRestored(SettingsBackupRestoreKeys.KEY_LOCALE, localeList.size());
		}
		} catch (RemoteException e) {
		if (Flags.enableMetricsSettingsBackupAgents() && mBackupRestoreEventLogger != null) {
		if (areAgentMetricsEnabled()) {
		mBackupRestoreEventLogger
		.logItemsRestoreFailed(
		SettingsBackupRestoreKeys.KEY_LOCALE,
		@@ -817,4 +817,8 @@ public class SettingsHelper {
		void setBackupRestoreEventLogger(BackupRestoreEventLogger backupRestoreEventLogger) {
		mBackupRestoreEventLogger = backupRestoreEventLogger;
		}

		private boolean areAgentMetricsEnabled() {
		return Flags.enableMetricsSettingsBackupAgents() && mBackupRestoreEventLogger != null;
		}
		}

packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat;

		import static junit.framework.Assert.assertEquals;

		import android.app.backup.BackupAnnotations.OperationType;
		import android.app.backup.BackupRestoreEventLogger;
		import android.content.ContentResolver;
		import android.content.ContentValues;
		import android.content.Context;
		@@ -60,11 +62,14 @@ public class SettingsHelperRestoreTest {
		private static final float FLOAT_TOLERANCE = 0.01f;
		private ContentResolver mContentResolver;
		private SettingsHelper mSettingsHelper;
		private BackupRestoreEventLogger mBackupRestoreEventLogger;

		@Before
		public void setUp() {
		mContentResolver = mInterceptingContext.getContentResolver();
		mSettingsHelper = new SettingsHelper(mInterceptingContext);
		mBackupRestoreEventLogger = new BackupRestoreEventLogger(OperationType.RESTORE);
		mSettingsHelper.setBackupRestoreEventLogger(mBackupRestoreEventLogger);
		}

		@After