diff options
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/animation/AnimatorInflater.java | 2 | ||||
| -rw-r--r-- | core/java/android/provider/VoicemailContract.java | 5 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | media/java/android/media/AudioRecord.java | 8 |
5 files changed, 9 insertions, 11 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 2d387d13d303..708394c3a1ff 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28997,7 +28997,6 @@ package android.provider { public static final class VoicemailContract.Status implements android.provider.BaseColumns { method public static android.net.Uri buildSourceUri(java.lang.String); - method public static void setStatus(android.content.Context, android.telecom.PhoneAccountHandle, int, int, int); field public static final java.lang.String CONFIGURATION_STATE = "configuration_state"; field public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2 field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1 @@ -29021,9 +29020,6 @@ package android.provider { public static final class VoicemailContract.Voicemails implements android.provider.BaseColumns android.provider.OpenableColumns { method public static android.net.Uri buildSourceUri(java.lang.String); - method public static int deleteAll(android.content.Context); - method public static android.net.Uri insert(android.content.Context, android.telecom.Voicemail); - method public static int insert(android.content.Context, java.util.List<android.telecom.Voicemail>); field public static final android.net.Uri CONTENT_URI; field public static final java.lang.String DATE = "date"; field public static final java.lang.String DELETED = "deleted"; diff --git a/core/java/android/animation/AnimatorInflater.java b/core/java/android/animation/AnimatorInflater.java index df5a4cb9a366..224e8e9eae09 100644 --- a/core/java/android/animation/AnimatorInflater.java +++ b/core/java/android/animation/AnimatorInflater.java @@ -698,7 +698,7 @@ public class AnimatorInflater { int ordering = a.getInt(R.styleable.AnimatorSet_ordering, TOGETHER); createAnimatorFromXml(res, theme, parser, attrs, (AnimatorSet) anim, ordering, pixelSize); - final int hint = a.getInt(R.styleable.Animator_durationScaleHint, + final int hint = a.getInt(R.styleable.AnimatorSet_durationScaleHint, HINT_NO_SCALE); anim.setDurationScaleHint(hint, res); a.recycle(); diff --git a/core/java/android/provider/VoicemailContract.java b/core/java/android/provider/VoicemailContract.java index 4712f970ea3a..879f26c63224 100644 --- a/core/java/android/provider/VoicemailContract.java +++ b/core/java/android/provider/VoicemailContract.java @@ -19,7 +19,6 @@ package android.provider; import android.Manifest; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; -import android.annotation.SystemApi; import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; @@ -258,7 +257,6 @@ public class VoicemailContract { * * @hide */ - @SystemApi public static Uri insert(Context context, Voicemail voicemail) { ContentResolver contentResolver = context.getContentResolver(); ContentValues contentValues = getContentValues(voicemail); @@ -274,7 +272,6 @@ public class VoicemailContract { * * @hide */ - @SystemApi public static int insert(Context context, List<Voicemail> voicemails) { ContentResolver contentResolver = context.getContentResolver(); int count = voicemails.size(); @@ -293,7 +290,6 @@ public class VoicemailContract { * * @hide */ - @SystemApi public static int deleteAll(Context context) { return context.getContentResolver().delete( buildSourceUri(context.getPackageName()), "", new String[0]); @@ -452,7 +448,6 @@ public class VoicemailContract { * * @hide */ - @SystemApi public static void setStatus(Context context, PhoneAccountHandle accountHandle, int configurationState, int dataChannelState, int notificationChannelState) { ContentResolver contentResolver = context.getContentResolver(); diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index cbd74cdafa54..0f50502e24df 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -6042,6 +6042,7 @@ <!-- child animations should be played sequentially, in the same order as the xml. --> <enum name="sequentially" value="1" /> </attr> + <attr name="durationScaleHint" /> </declare-styleable> <!-- ========================== --> diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index b7a851f09c6a..fc0189cc1bb7 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -53,6 +53,12 @@ public class AudioRecord //--------------------------------------------------------- // Constants //-------------------- + + /** Minimum value for sample rate */ + private static final int SAMPLE_RATE_HZ_MIN = 4000; + /** Maximum value for sample rate */ + private static final int SAMPLE_RATE_HZ_MAX = 96000; + /** * indicates AudioRecord state is not successfully initialized. */ @@ -571,7 +577,7 @@ public class AudioRecord //-------------- // sample rate - if ( (sampleRateInHz < 4000) || (sampleRateInHz > 48000) ) { + if ((sampleRateInHz < SAMPLE_RATE_HZ_MIN) || (sampleRateInHz > SAMPLE_RATE_HZ_MAX)) { throw new IllegalArgumentException(sampleRateInHz + "Hz is not a supported sample rate."); } |