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

Commit f53c8be2 authored by Jason Chiu's avatar Jason Chiu Committed by Automerger Merge Worker
Browse files

Merge "Fix the injection disappearance in the Account detail page" into...

Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev am: da288939 am: f9baa407

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781356



Change-Id: I5593f67b9fcc0e2168dbaf8abf4b64447debc093
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bfb7760c f9baa407
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {

    @Override
    public void onCreate(Bundle icicle) {
        super.onCreate(icicle);
        getPreferenceManager().setPreferenceComparisonCallback(null);
        // Initialize the parameters since displayTile() will be called in super.onCreate().
        Bundle args = getArguments();
        final Activity activity = getActivity();
        mUserHandle = Utils.getSecureTargetUser(activity.getActivityToken(),
@@ -82,6 +81,9 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
                mAccountType = args.getString(KEY_ACCOUNT_TYPE);
            }
        }

        super.onCreate(icicle);
        getPreferenceManager().setPreferenceComparisonCallback(null);
        mAccountSynController.init(mAccount, mUserHandle);
        mRemoveAccountController.init(mAccount, mUserHandle);
    }