Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev

This commit is contained in:
Jason Chiu
2022-08-31 02:19:07 +00:00
committed by Android (Google) Code Review

View File

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