Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ddd339d authored by Heemin Seog's avatar Heemin Seog
Browse files

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.

Bug: 143529292
Bug: 143480221
Test: atest VolumeDialogControllerImplTest before and after the patch
Merged-In: I0ee9313b1394515d9405344482dc1779d15c0819
Change-Id: I0ee9313b1394515d9405344482dc1779d15c0819
parent 90572cb3

tests/testables/src/android/testing/TestableSettingsProvider.java

+3 −3
Original line number Diff line number Diff line
@@ -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];