diff options
author | calderwoodra <calderwoodra@google.com> | 2017-07-11 16:33:32 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-07-12 09:44:38 -0700 |
commit | f715de6b08e428ba45d1076e4133fe9b7f6b9a7d (patch) | |
tree | 5e0e9d0c352dc811b412e693e16e245d3f37ddd1 /java | |
parent | 9ea21240eb498d4f59a8d72857365059dd41bd1b (diff) |
Fixed NPE in CameraComposerFragment.
If a user took a picture then quickly closed call composer, when the image was
ready we would try to update our view state. Since our fragment is no longer
attached, this cuases a crash when we check that getContext() is not null.
fragment.getContext is never null in robolectric.
Bug: 62687110
Test: manual, cannot test b/c we cannot take photos in Espresso and
PiperOrigin-RevId: 161600278
Change-Id: If9bd98578d221fca4bc99ff17a39f917f3a8bcca
Diffstat (limited to 'java')
-rw-r--r-- | java/com/android/dialer/callcomposer/CameraComposerFragment.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java index 1002b27b1..d55f3222c 100644 --- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java +++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java @@ -332,7 +332,11 @@ public class CameraComposerFragment extends CallComposerFragment /** Updates the state of the buttons and overlays based on the current state of the view */ private void updateViewState() { Assert.isNotNull(cameraView); - Assert.isNotNull(getContext()); + if (isDetached() || getContext() == null) { + LogUtil.i( + "CameraComposerFragment.updateViewState", "Fragment detached, cannot update view state"); + return; + } boolean isCameraAvailable = CameraManager.get().isCameraAvailable(); boolean uriReadyOrProcessing = cameraUri != null || processingUri; |