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

Commit 3afa988e authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Android (Google) Code Review
Browse files

Merge "Fix passwords settings crash due to null lifecycle owner." into sc-dev

parents 46b56950 318f7cc5

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

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.UserManager; 


import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.applications.autofill.PasswordsPreferenceController;

import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;

import com.android.settings.applications.defaultapps.DefaultWorkAutofillPreferenceController;

import com.android.settings.dashboard.DashboardFragment;
@@ -68,6 +69,12 @@ public class AccountDashboardFragment extends DashboardFragment { 
        return R.string.help_url_user_and_account_dashboard;

    }



    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

        getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));

    }



    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

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

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Context; 


import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.applications.autofill.PasswordsPreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.profileselector.ProfileSelectFragment;

import com.android.settings.users.AutoSyncDataPreferenceController;
@@ -61,6 +62,12 @@ public class AccountPersonalDashboardFragment extends DashboardFragment { 
        return R.string.help_url_user_and_account_dashboard;

    }



    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

        getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));

    }



    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

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

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Context; 


import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.applications.autofill.PasswordsPreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.profileselector.ProfileSelectFragment;

import com.android.settings.users.AutoSyncDataPreferenceController;
@@ -61,6 +62,12 @@ public class AccountWorkProfileDashboardFragment extends DashboardFragment { 
        return R.string.help_url_user_and_account_dashboard;

    }



    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

        getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));

    }



    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();