diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraDevice.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarOverlayLayout.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraDevice.java b/core/java/android/hardware/camera2/impl/CameraDevice.java index 40a7905..988f8f9 100644 --- a/core/java/android/hardware/camera2/impl/CameraDevice.java +++ b/core/java/android/hardware/camera2/impl/CameraDevice.java @@ -647,7 +647,7 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice { * should have arrived. The following line checks whether this holds. */ if (frameNumber != mCompletedFrameNumber + 1) { - throw new AssertionError(String.format( + Log.e(TAG, String.format( "result frame number %d comes out of order, should be %d + 1", frameNumber, mCompletedFrameNumber)); } diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java index 01bee0c..19d58bf 100644 --- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java +++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java @@ -576,7 +576,7 @@ public class ActionBarOverlayLayout extends ViewGroup { } public int getActionBarHideOffset() { - return -((int) mActionBarTop.getTranslationY()); + return mActionBarTop != null ? -((int) mActionBarTop.getTranslationY()) : 0; } public void setActionBarHideOffset(int offset) { |