Merge "Remove @Nullable from primitive/void types."

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) {

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) {

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));

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");