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

Merge "Use correct flags on ACTION_TIME_CHANGED broadcast"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-18 23:10:12 +00:00
committed by Android (Google) Code Review
parent 5bc864e7f7 020ff8a390
commit 5604f9bb4f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/datetime/TimeFormatPreferenceController.java
View File

@@ -103,6 +103,7 @@ public class TimeFormatPreferenceController extends AbstractPreferenceController
static void timeUpdated(Context context, Boolean is24Hour) { static void timeUpdated(Context context, Boolean is24Hour) {
Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED); Intent timeChanged = new Intent(Intent.ACTION_TIME_CHANGED);
timeChanged.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
int timeFormatPreference; int timeFormatPreference;
if (is24Hour == null) { if (is24Hour == null) {
timeFormatPreference = Intent.EXTRA_TIME_PREF_VALUE_USE_LOCALE_DEFAULT; timeFormatPreference = Intent.EXTRA_TIME_PREF_VALUE_USE_LOCALE_DEFAULT;

6
tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
View File

@@ -66,7 +66,8 @@ public class TimeChangeListenerMixinTest {
public void onResume_shouldRegisterIntentFilter() { public void onResume_shouldRegisterIntentFilter() {
mMixin.onResume(); mMixin.onResume();
mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK)); mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK));
mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)); mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)
.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND));
mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED)); mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));
verify(mCallback, times(3)).updateTimeAndDateDisplay(mContext); verify(mCallback, times(3)).updateTimeAndDateDisplay(mContext);
@@ -77,7 +78,8 @@ public class TimeChangeListenerMixinTest {
mMixin.onResume(); mMixin.onResume();
mMixin.onPause(); mMixin.onPause();
mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK)); mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_TICK));
mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)); mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)
.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND));
mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED)); mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));
verify(mCallback, never()).updateTimeAndDateDisplay(mContext); verify(mCallback, never()).updateTimeAndDateDisplay(mContext);