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

Commit 26cda0dd authored by josephpv's avatar josephpv
Browse files

Fix for settings crash during PS setup 

Fix for Null pointer exception to add null checks before calling
unRegisterReceiver for broadcast and startActivity.

Bug: 346233086
Test: Manual
Change-Id: I0941c34c3f5912c57abc9497809962ed0954ac06
parent bcb87740

src/com/android/settings/privatespace/PrivateSpaceCreationFragment.java

+12 −8
Original line number Diff line number Diff line
@@ -157,22 +157,26 @@ public class PrivateSpaceCreationFragment extends InstrumentedFragment { 


    /** Start new activity in private profile to add an account to private profile */

    private void startAccountLogin() {

        if (isAdded() && getContext() != null && getActivity() != null) {

            Intent intent = new Intent(getContext(), PrivateProfileContextHelperActivity.class);

            intent.putExtra(EXTRA_ACTION_TYPE, ACCOUNT_LOGIN_ACTION);

            mMetricsFeatureProvider.action(

                    getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_ACCOUNT_LOGIN_START);

            getActivity().startActivityForResult(intent, ACCOUNT_LOGIN_ACTION);

        }

    }



    private void registerReceiver() {

        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_PROFILE_ACCESSIBLE);

        getActivity().registerReceiver(mProfileAccessReceiver, filter);

        if (getContext() != null) {

            getContext().registerReceiver(mProfileAccessReceiver, filter);

        }

    }



    private void unRegisterReceiver() {

        if (mProfileAccessReceiver != null) {

            getActivity().unregisterReceiver(mProfileAccessReceiver);

        if (mProfileAccessReceiver != null && isAdded() && getContext() != null) {

            getContext().unregisterReceiver(mProfileAccessReceiver);

        }

    }

}