diff options
author | Chien-Yu Chen <cychen@google.com> | 2015-03-03 22:24:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-03 22:24:12 +0000 |
commit | a0e17fafa10463aa876240bf36d776335679add0 (patch) | |
tree | 76f3bdb0a40db3ca12659efc78bcdd38a4e662eb /api | |
parent | 2021ef006c1f0a93f2e53e5c48c60a65de65300e (diff) | |
parent | afa91399fd32ede17d440ec1c3321eee0426123c (diff) | |
download | frameworks_base-a0e17fafa10463aa876240bf36d776335679add0.zip frameworks_base-a0e17fafa10463aa876240bf36d776335679add0.tar.gz frameworks_base-a0e17fafa10463aa876240bf36d776335679add0.tar.bz2 |
Merge "CameraManager: implement flashlight controls"
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 1 | ||||
-rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 00afda2..0046938 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12902,7 +12902,6 @@ package android.hardware.camera2 { public static abstract class CameraManager.TorchCallback { ctor public CameraManager.TorchCallback(); - method public void onTorchModeAvailable(java.lang.String); method public void onTorchModeChanged(java.lang.String, boolean); method public void onTorchModeUnavailable(java.lang.String); } diff --git a/api/system-current.txt b/api/system-current.txt index 4992d8d..d48fd0d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -13178,7 +13178,6 @@ package android.hardware.camera2 { public static abstract class CameraManager.TorchCallback { ctor public CameraManager.TorchCallback(); - method public void onTorchModeAvailable(java.lang.String); method public void onTorchModeChanged(java.lang.String, boolean); method public void onTorchModeUnavailable(java.lang.String); } |