From ed590eec31c5f96b0e41747e3608859bc0e1e5f0 Mon Sep 17 00:00:00 2001 From: Heemin Seog Date: Thu, 24 Oct 2019 09:36:34 -0700 Subject: [PATCH] Make the default user the current user (not 0) In #clearValuesAndCheck, values are placed in the value map based on a key that depends on the current user. When these values are checked in #call, it uses default user 0 (unless CALL_METHOD_USER_KEY is populated). Considering we don't even use getStringForUser when checking the values, it seems to make sense to check against the userId used to set the values in #clearValuesAndCheck. Test: atest TestableSettingsProviderTest Change-Id: I0ee9313b1394515d9405344482dc1779d15c0819 --- .../src/android/testing/TestableSettingsProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testables/src/android/testing/TestableSettingsProvider.java b/tests/testables/src/android/testing/TestableSettingsProvider.java index b158476bd438c..fd92c657cb2e8 100644 --- a/tests/testables/src/android/testing/TestableSettingsProvider.java +++ b/tests/testables/src/android/testing/TestableSettingsProvider.java @@ -14,6 +14,8 @@ package android.testing; +import static org.junit.Assert.assertEquals; + import android.content.ContentProviderClient; import android.content.Context; import android.os.Bundle; @@ -25,8 +27,6 @@ import android.util.Log; import java.util.HashMap; -import static org.junit.Assert.*; - /** * Allows calls to android.provider.Settings to be tested easier. * @@ -71,7 +71,7 @@ public class TestableSettingsProvider extends MockContentProvider { public Bundle call(String method, String arg, Bundle extras) { // Methods are "GET_system", "GET_global", "PUT_secure", etc. - final int userId = extras.getInt(Settings.CALL_METHOD_USER_KEY, 0); + final int userId = extras.getInt(Settings.CALL_METHOD_USER_KEY, UserHandle.myUserId()); final String[] commands = method.split("_", 2); final String op = commands[0]; final String table = commands[1];