Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make the default user the current user (not 0)" into qt-qpr1-dev

Browse Source 
am: a7bdb8ba0b

Change-Id: Iea445966a2da3fa8d03e252f0a78290ecaf68199
This commit is contained in:
Heemin Seog
2019-10-30 11:13:52 -07:00
committed by android-build-merger
parent cd084d5ce8 a7bdb8ba0b
commit 2675ea8f8a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/testables/src/android/testing/TestableSettingsProvider.java
View File

@@ -14,6 +14,8 @@
package android.testing; package android.testing;
import static org.junit.Assert.assertEquals;
import android.content.ContentProviderClient; import android.content.ContentProviderClient;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@@ -25,8 +27,6 @@ import android.util.Log;
import java.util.HashMap; import java.util.HashMap;
import static org.junit.Assert.*;
/** /**
* Allows calls to android.provider.Settings to be tested easier. * 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) { public Bundle call(String method, String arg, Bundle extras) {
// Methods are "GET_system", "GET_global", "PUT_secure", etc. // 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[] commands = method.split("_", 2);
final String op = commands[0]; final String op = commands[0];
final String table = commands[1]; final String table = commands[1];