diff options
4 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 003eeb75ecfd..4af6f791ea9c 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -3723,7 +3723,6 @@ public class Activity extends ContextThemeWrapper * {@link FragmentManager} instead; this is also * available on older platforms through the Android compatibility package. */ - @Nullable @Deprecated public final boolean showDialog(int id, Bundle args) { if (mManagedDialogs == null) { diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java index 5d7585f9d9e8..03578342bbed 100644 --- a/core/java/android/widget/CompoundButton.java +++ b/core/java/android/widget/CompoundButton.java @@ -221,7 +221,6 @@ public abstract class CompoundButton extends Button implements Checkable { * @param drawable the drawable to set * @attr ref android.R.styleable#CompoundButton_button */ - @Nullable public void setButtonDrawable(@Nullable Drawable drawable) { if (mButtonDrawable != drawable) { if (mButtonDrawable != null) { diff --git a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerUtil.java b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerUtil.java index 1c95c25370d2..881d5d22da52 100644 --- a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerUtil.java +++ b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerUtil.java @@ -104,7 +104,6 @@ public class SoundTriggerUtil { * @param modelId The model ID to look-up the sound model for. * @return {@code true} if the call succeeds, {@code false} otherwise. */ - @Nullable public boolean deleteSoundModel(UUID modelId) { try { mSoundTriggerService.deleteSoundModel(new ParcelUuid(modelId)); diff --git a/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/EnrollmentUtil.java b/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/EnrollmentUtil.java index 9e544a520d55..7927ac4cb895 100644 --- a/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/EnrollmentUtil.java +++ b/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/EnrollmentUtil.java @@ -139,7 +139,6 @@ public class EnrollmentUtil { * @param keyphraseId The keyphrase ID to look-up the sound model for. * @return {@code true} if the call succeeds, {@code false} otherwise. */ - @Nullable public boolean deleteSoundModel(int keyphraseId, String bcp47Locale) { if (keyphraseId <= 0) { Log.e(TAG, "Keyphrase must have a valid ID"); |