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

Listen on new broadcasts for profile changes.

Browse Source 
The change is due to API review comments on the platform side.

Bug: 27532254
Change-Id: Iacb87f97148ceead6bf1f1cc7a0671711698b061
This commit is contained in:
Rubin Xu
2016-04-04 17:23:46 +01:00
parent 9069181c84
commit 819f78e91b
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -185,7 +185,8 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
final String action = intent.getAction(); final String action = intent.getAction();
if (Intent.ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED.equals(action) || if (Intent.ACTION_MANAGED_PROFILE_AVAILABLE.equals(action) ||
Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE.equals(action) ||
Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)) { Intent.ACTION_MANAGED_PROFILE_UNLOCKED.equals(action)) {
// Reload all alias // Reload all alias
final ExpandableListView systemView = (ExpandableListView) mTabHost final ExpandableListView systemView = (ExpandableListView) mTabHost
@@ -212,7 +213,8 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment {
mKeyguardManager = (KeyguardManager) getActivity() mKeyguardManager = (KeyguardManager) getActivity()
.getSystemService(Context.KEYGUARD_SERVICE); .getSystemService(Context.KEYGUARD_SERVICE);
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED); filter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);
filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);
filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNLOCKED); filter.addAction(Intent.ACTION_MANAGED_PROFILE_UNLOCKED);
getActivity().registerReceiver(mWorkProfileChangedReceiver, filter); getActivity().registerReceiver(mWorkProfileChangedReceiver, filter);
} }

13
src/com/android/settings/accounts/AccountSettings.java
View File

@@ -575,9 +575,10 @@ public class AccountSettings extends SettingsPreferenceFragment
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
Log.v(TAG, "Received broadcast: " + intent.getAction()); final String action = intent.getAction();
if (intent.getAction().equals(Intent.ACTION_MANAGED_PROFILE_REMOVED) Log.v(TAG, "Received broadcast: " + action);
|| intent.getAction().equals(Intent.ACTION_MANAGED_PROFILE_ADDED)) { if (action.equals(Intent.ACTION_MANAGED_PROFILE_REMOVED)
|| action.equals(Intent.ACTION_MANAGED_PROFILE_ADDED)) {
// Clean old state // Clean old state
stopListeningToAccountUpdates(); stopListeningToAccountUpdates();
cleanUpPreferences(); cleanUpPreferences();
@@ -590,7 +591,8 @@ public class AccountSettings extends SettingsPreferenceFragment
return; return;
} }
if (intent.getAction().equals(Intent.ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED)) { if (action.equals(Intent.ACTION_MANAGED_PROFILE_AVAILABLE)
|| action.equals(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)) {
// We assume there's only one managed profile, otherwise this needs to change. // We assume there's only one managed profile, otherwise this needs to change.
ProfileData profileData = mProfiles.valueAt(1); ProfileData profileData = mProfiles.valueAt(1);
if (intent.getIntExtra(Intent.EXTRA_USER_HANDLE, if (intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
@@ -608,7 +610,8 @@ public class AccountSettings extends SettingsPreferenceFragment
IntentFilter intentFilter = new IntentFilter(); IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED); intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED);
intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_ADDED); intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_ADDED);
intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED); intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);
intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);
context.registerReceiver(this, intentFilter); context.registerReceiver(this, intentFilter);
listeningToManagedProfileEvents = true; listeningToManagedProfileEvents = true;
} }