summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-07-22 17:59:10 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-22 17:59:10 -0700
commitaba28e7fecb06adab8de51619b2929b640369e83 (patch)
tree60ac494d70a72b7a565ee01af856c785372c32cb /api
parenta7cb8254943163606aa9339a0a8ba8930c7cafd9 (diff)
parent3ff98beeafd271a65c1f824699431366882b04f6 (diff)
downloadframeworks_base-aba28e7fecb06adab8de51619b2929b640369e83.zip
frameworks_base-aba28e7fecb06adab8de51619b2929b640369e83.tar.gz
frameworks_base-aba28e7fecb06adab8de51619b2929b640369e83.tar.bz2
Merge "Deprecate two methods in MediaRecorder.java class"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index f88001d..6757b55 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10406,8 +10406,8 @@ package android.media {
method public void setAudioEncodingBitRate(int);
method public void setAudioSamplingRate(int);
method public void setAudioSource(int) throws java.lang.IllegalStateException;
- method public void setAuxiliaryOutputFile(java.io.FileDescriptor);
- method public void setAuxiliaryOutputFile(java.lang.String);
+ method public deprecated void setAuxiliaryOutputFile(java.io.FileDescriptor);
+ method public deprecated void setAuxiliaryOutputFile(java.lang.String);
method public void setCamera(android.hardware.Camera);
method public void setCaptureRate(double);
method public void setLocation(float, float);