PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b8808e35a6

Change-Id: I78dbd6a84a758aed26221729717e67fb5c3c59a3
This commit is contained in:
Mill Chen
2019-04-05 17:50:29 -07:00
committed by android-build-merger
parent c513381245 b8808e35a6
commit 765b020c5a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/homepage/contextualcards/conditional/GrayscaleConditionController.java
View File

@@ -23,6 +23,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.hardware.display.ColorDisplayManager; import android.hardware.display.ColorDisplayManager;
import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import com.android.settings.R; import com.android.settings.R;
@@ -115,7 +116,8 @@ public class GrayscaleConditionController implements ConditionalCardController {
private void sendBroadcast() { private void sendBroadcast() {
final Intent intent = new Intent(ACTION_GRAYSCALE_CHANGED); final Intent intent = new Intent(ACTION_GRAYSCALE_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND); 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 { public class Receiver extends BroadcastReceiver {

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

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.hardware.display.ColorDisplayManager; import android.hardware.display.ColorDisplayManager;
import android.os.UserHandle;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -87,6 +88,7 @@ public class GrayscaleConditionControllerTest {
public void onActionClick_shouldSendBroadcast() { public void onActionClick_shouldSendBroadcast() {
mController.onActionClick(); mController.onActionClick();
verify(mContext).sendBroadcast(any(Intent.class), any(String.class)); verify(mContext).sendBroadcastAsUser(any(Intent.class), any(UserHandle.class),
any(String.class));
} }
} }