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

Commit b8808e35 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix sending broadcast with a qualified user in Settings" into qt-dev

parents e323b40f 6b2bced1

src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.hardware.display.ColorDisplayManager;

import android.os.UserHandle;

import android.util.Log;



import com.android.settings.R;
@@ -115,7 +116,8 @@ public class GrayscaleConditionController implements ConditionalCardController { 
    private void sendBroadcast() {

        final Intent intent = new Intent(ACTION_GRAYSCALE_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        mAppContext.sendBroadcast(intent, Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS);

        mAppContext.sendBroadcastAsUser(intent, UserHandle.CURRENT,

                Manifest.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS);

    }



    public class Receiver extends BroadcastReceiver {

tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionControllerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify; 
import android.content.Context;

import android.content.Intent;

import android.hardware.display.ColorDisplayManager;

import android.os.UserHandle;



import org.junit.Before;

import org.junit.Test;
@@ -87,6 +88,7 @@ public class GrayscaleConditionControllerTest { 
    public void onActionClick_shouldSendBroadcast() {

        mController.onActionClick();



        verify(mContext).sendBroadcast(any(Intent.class), any(String.class));

        verify(mContext).sendBroadcastAsUser(any(Intent.class), any(UserHandle.class),

                any(String.class));

    }

}