summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2015-03-17 21:12:25 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-03-17 21:12:25 +0000
commit1938a389e7b5c5c11b5d6bc12a49e3ad78c2437e (patch)
tree1fb4366f7c10d72f6331a77a83dff481663615ef
parentb95d079c8036279c52a76e02c5bd5f99d58a8402 (diff)
parent3814163b6ddc35292f6b25f782ad7a858c703c24 (diff)
am 3814163b: am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
* commit '3814163b6ddc35292f6b25f782ad7a858c703c24': Frameworks/base: Fix format string in Camera
-rw-r--r--core/java/android/hardware/camera2/CameraManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index faa782af5518..b51337963d3c 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -1013,10 +1013,10 @@ public final class CameraManager {
if (DEBUG) {
Log.v(TAG,
String.format(
- "Device status was previously available (%d), " +
- " and is now again available (%d)" +
+ "Device status was previously available (%b), " +
+ " and is now again available (%b)" +
"so no new client visible update will be sent",
- isAvailable(status), isAvailable(status)));
+ isAvailable(oldStatus), isAvailable(status)));
}
return;
}