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

Commit 819f78e9 authored by Rubin Xu's avatar Rubin Xu
Browse files

Listen on new broadcasts for profile changes. 

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

Bug: 27532254
Change-Id: Iacb87f97148ceead6bf1f1cc7a0671711698b061
parent 9069181c

src/com/android/settings/TrustedCredentialsSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment { 
        @Override

        public void onReceive(Context context, Intent intent) {

            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)) {

                // Reload all alias

                final ExpandableListView systemView = (ExpandableListView) mTabHost
@@ -212,7 +213,8 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment { 
        mKeyguardManager = (KeyguardManager) getActivity()

                .getSystemService(Context.KEYGUARD_SERVICE);

        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);

        getActivity().registerReceiver(mWorkProfileChangedReceiver, filter);

    }

src/com/android/settings/accounts/AccountSettings.java

+8 −5
Original line number Diff line number Diff line
@@ -575,9 +575,10 @@ public class AccountSettings extends SettingsPreferenceFragment 


        @Override

        public void onReceive(Context context, Intent intent) {

            Log.v(TAG, "Received broadcast: " + intent.getAction());

            if (intent.getAction().equals(Intent.ACTION_MANAGED_PROFILE_REMOVED)

                    || intent.getAction().equals(Intent.ACTION_MANAGED_PROFILE_ADDED)) {

            final String action = intent.getAction();

            Log.v(TAG, "Received broadcast: " + action);

            if (action.equals(Intent.ACTION_MANAGED_PROFILE_REMOVED)

                    || action.equals(Intent.ACTION_MANAGED_PROFILE_ADDED)) {

                // Clean old state

                stopListeningToAccountUpdates();

                cleanUpPreferences();
@@ -590,7 +591,8 @@ public class AccountSettings extends SettingsPreferenceFragment 
                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.

                ProfileData profileData = mProfiles.valueAt(1);

                if (intent.getIntExtra(Intent.EXTRA_USER_HANDLE,
@@ -608,7 +610,8 @@ public class AccountSettings extends SettingsPreferenceFragment 
                IntentFilter intentFilter = new IntentFilter();

                intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED);

                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);

                listeningToManagedProfileEvents = true;

            }