Merge "Fix for User edit info dialog during rotation" am: c6603dfda8 am: 7cda6b423a am: 454dbfd402 am: 1104b5e6b9

Change-Id: Ie43b9b77791ccd51af73df9b396938512e4933a8
This commit is contained in:
Automerger Merge Worker
2020-03-02 10:42:01 +00:00

View File

@@ -95,8 +95,7 @@ public class EditUserInfoController {
} }
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing() if (mEditUserInfoDialog != null && mEditUserPhotoController != null) {
&& mEditUserPhotoController != null) {
// Bitmap cannot be stored into bundle because it may exceed parcel limit // Bitmap cannot be stored into bundle because it may exceed parcel limit
// Store it in a temporary file instead // Store it in a temporary file instead
File file = mEditUserPhotoController.saveNewUserPhotoBitmap(); File file = mEditUserPhotoController.saveNewUserPhotoBitmap();