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

Merge "Adds user broadcasts to UserManagerHelper." into pi-dev

Browse Source
This commit is contained in:
Jovana Knezevic
2018-04-11 22:20:33 +00:00
committed by Android (Google) Code Review
parent 01cdfc4996 5e523fa378
commit ccb8eb3858
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/users/UserManagerHelper.java
View File

@@ -422,6 +422,9 @@ public final class UserManagerHelper {
filter.addAction(Intent.ACTION_USER_REMOVED); filter.addAction(Intent.ACTION_USER_REMOVED);
filter.addAction(Intent.ACTION_USER_ADDED); filter.addAction(Intent.ACTION_USER_ADDED);
filter.addAction(Intent.ACTION_USER_INFO_CHANGED); filter.addAction(Intent.ACTION_USER_INFO_CHANGED);
filter.addAction(Intent.ACTION_USER_SWITCHED);
filter.addAction(Intent.ACTION_USER_STOPPED);
filter.addAction(Intent.ACTION_USER_UNLOCKED);
mContext.registerReceiverAsUser(mUserChangeReceiver, UserHandle.ALL, filter, null, null); mContext.registerReceiverAsUser(mUserChangeReceiver, UserHandle.ALL, filter, null, null);
} }

6
packages/SettingsLib/tests/integ/src/com/android/settingslib/users/UserManagerHelperTest.java
View File

@@ -302,10 +302,14 @@ public class UserManagerHelperTest {
// Verify the presence of each intent in the filter. // Verify the presence of each intent in the filter.
// Verify the exact number of filters. Every time a new intent is added, this test should // Verify the exact number of filters. Every time a new intent is added, this test should
// get updated. // get updated.
assertThat(filterCaptor.getValue().countActions()).isEqualTo(3); assertThat(filterCaptor.getValue().countActions()).isEqualTo(6);
assertThat(filterCaptor.getValue().hasAction(Intent.ACTION_USER_REMOVED)).isTrue(); assertThat(filterCaptor.getValue().hasAction(Intent.ACTION_USER_REMOVED)).isTrue();
assertThat(filterCaptor.getValue().hasAction(Intent.ACTION_USER_ADDED)).isTrue(); assertThat(filterCaptor.getValue().hasAction(Intent.ACTION_USER_ADDED)).isTrue();
assertThat(filterCaptor.getValue().hasAction(Intent.ACTION_USER_INFO_CHANGED)).isTrue(); assertThat(filterCaptor.getValue().hasAction(Intent.ACTION_USER_INFO_CHANGED)).isTrue();
assertThat(filterCaptor.getValue().hasAction(Intent.ACTION_USER_SWITCHED)).isTrue();
assertThat(filterCaptor.getValue().hasAction(Intent.ACTION_USER_STOPPED)).isTrue();
assertThat(filterCaptor.getValue().hasAction(Intent.ACTION_USER_UNLOCKED)).isTrue();
// Verify that calling the receiver calls the listener. // Verify that calling the receiver calls the listener.
receiverCaptor.getValue().onReceive(mContext, new Intent()); receiverCaptor.getValue().onReceive(mContext, new Intent());