Final synchronization of Gradle configs and NDKHelper source

* Applied consistent minSdk and import formatting to teapots and native modules.
* Cleaned up remaining Java source inconsistencies in NativeAudio and NDKHelper.

Author: Jake-The-Human

native-audio/app/src/main/java/com/example/nativeaudio/NativeAudio.java

@@ -17,13 +17,11 @@
 package com.example.nativeaudio;
 
 import android.Manifest;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.media.AudioManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -60,7 +58,6 @@ public class NativeAudio extends Activity
 
     /** Called when the activity is first created. */
     @Override
-    @TargetApi(17)
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setContentView(R.layout.main);
@@ -78,14 +75,12 @@ protected void onCreate(Bundle icicle) {
          * IF we do not have a fast audio path, we pass 0 for sampleRate, which will force native
          * side to pick up the 8Khz sample rate.
          */
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            AudioManager myAudioMgr = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-            String nativeParam = myAudioMgr.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
-            sampleRate = Integer.parseInt(nativeParam);
-            nativeParam = myAudioMgr.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
-            bufSize = Integer.parseInt(nativeParam);
-        }
-        createBufferQueueAudioPlayer(sampleRate, bufSize);
+      AudioManager myAudioMgr = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+      String nativeParam = myAudioMgr.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
+      sampleRate = Integer.parseInt(nativeParam);
+      nativeParam = myAudioMgr.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
+      bufSize = Integer.parseInt(nativeParam);
+      createBufferQueueAudioPlayer(sampleRate, bufSize);
 
         // initialize URI spinner
         Spinner uriSpinner = (Spinner) findViewById(R.id.uri_spinner);
@@ -275,19 +270,17 @@ public void onStopTrackingTouch(SeekBar seekBar) {
                         setStereoPositionUriAudioPlayer(permille);
                     }
                 });
-        if (Build.VERSION.SDK_INT > 19) {
-            int[]  uriIds = { R.id.uri_soundtrack, R.id.pause_uri,
-                              R.id.play_uri,       R.id.loop_uri,
-                              R.id.mute_left_uri,  R.id.mute_right_uri,
-                              R.id.solo_left_uri,  R.id.solo_right_uri,
-                              R.id.mute_uri,       R.id.enable_stereo_position_uri,
-                              R.id.channels_uri,   R.id.volume_uri,
-                              R.id.pan_uri,        R.id.uri_spinner,};
-            for(int id : uriIds)
-                findViewById(id).setEnabled(false);
-        }
-
-        ((Button) findViewById(R.id.record)).setOnClickListener(new OnClickListener() {
+      int[] uriIds = {R.id.uri_soundtrack, R.id.pause_uri,
+          R.id.play_uri, R.id.loop_uri,
+          R.id.mute_left_uri, R.id.mute_right_uri,
+          R.id.solo_left_uri, R.id.solo_right_uri,
+          R.id.mute_uri, R.id.enable_stereo_position_uri,
+          R.id.channels_uri, R.id.volume_uri,
+          R.id.pan_uri, R.id.uri_spinner,};
+      for(int id : uriIds)
+          findViewById(id).setEnabled(false);
+
+      ((Button) findViewById(R.id.record)).setOnClickListener(new OnClickListener() {
             public void onClick(View view) {
                 int status = ActivityCompat.checkSelfPermission(NativeAudio.this,
                         Manifest.permission.RECORD_AUDIO);
@@ -396,7 +389,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     public static native void startRecording();
     public static native void shutdown();
 
-    /** Load jni .so on initialization */
+    /* Load jni .so on initialization */
     static {
          System.loadLibrary("native-audio-jni");
     }

native-midi/app/build.gradle.kts

@@ -9,6 +9,8 @@ android {
         applicationId = "com.example.nativemidi"
         versionCode = 1
         versionName = "1.0"
+        // 'AMidiOutputPort_receive' is unavailable: introduced in Android 29 android
+        minSdk = 30
         externalNativeBuild {
             cmake {
                 arguments.add("-DANDROID_STL=c++_static")

teapots/choreographer-30fps/build.gradle.kts

@@ -7,6 +7,8 @@ android {
 
     defaultConfig {
         applicationId = "com.sample.choreographer"
+        // 'AImageDecoder' is unavailable: introduced in Android 30 android
+        minSdk = 30
         externalNativeBuild {
             cmake {
                 arguments.add("-DANDROID_STL=c++_static")

teapots/choreographer-30fps/src/main/java/com/sample/helper/NDKHelper.java

@@ -309,7 +309,6 @@ public String getStringResource(String resourceName)
     //
     // Audio related helpers
     //
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     public int getNativeAudioBufferSize() {
         int SDK_INT = android.os.Build.VERSION.SDK_INT;
         if (SDK_INT >= 17) {

teapots/classic-teapot/build.gradle.kts

@@ -7,6 +7,8 @@ android {
 
     defaultConfig {
         applicationId = "com.sample.teapot"
+        // 'AImageDecoder' is unavailable: introduced in Android 30 android
+        minSdk = 30
         externalNativeBuild {
             cmake {
                 arguments.add("-DANDROID_STL=c++_static")

teapots/classic-teapot/src/main/java/com/sample/helper/NDKHelper.java

@@ -16,7 +16,6 @@
 
 package com.sample.helper;
 
-import android.annotation.TargetApi;
 import android.app.NativeActivity;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -28,14 +27,12 @@
 import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.opengl.GLUtils;
-import android.os.Build;
 import android.util.Log;
 import java.io.File;
 import java.io.FileInputStream;
 import java.nio.ByteBuffer;
 import javax.microedition.khronos.opengles.GL10;
 
-@TargetApi(Build.VERSION_CODES.GINGERBREAD)
 public class NDKHelper {
 
     public NDKHelper(NativeActivity act) {
@@ -309,7 +306,6 @@ public String getStringResource(String resourceName)
     //
     // Audio related helpers
     //
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     public int getNativeAudioBufferSize() {
         int SDK_INT = android.os.Build.VERSION.SDK_INT;
         if (SDK_INT >= 17) {

teapots/image-decoder/build.gradle.kts

@@ -7,6 +7,8 @@ android {
 
     defaultConfig {
         applicationId = "com.sample.imagedecoder"
+        // 'AImageDecoder' is unavailable: introduced in Android 30 android
+        minSdk = 30
         externalNativeBuild {
             cmake {
                 arguments.add("-DANDROID_STL=c++_static")

teapots/image-decoder/src/main/java/com/sample/helper/NDKHelper.java

@@ -307,7 +307,6 @@ public String getStringResource(String resourceName)
     //
     // Audio related helpers
     //
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     public int getNativeAudioBufferSize() {
         int SDK_INT = android.os.Build.VERSION.SDK_INT;
         if (SDK_INT >= 17) {

teapots/more-teapots/build.gradle.kts

@@ -7,6 +7,8 @@ android {
 
     defaultConfig {
         applicationId = "com.sample.moreteapots"
+        // 'AImageDecoder' is unavailable: introduced in Android 30 android
+        minSdk = 30
         externalNativeBuild {
             cmake {
                 arguments.add("-DANDROID_STL=c++_static")

teapots/more-teapots/src/main/java/com/sample/helper/NDKHelper.java

@@ -309,7 +309,6 @@ public String getStringResource(String resourceName)
     //
     // Audio related helpers
     //
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     public int getNativeAudioBufferSize() {
         int SDK_INT = android.os.Build.VERSION.SDK_INT;
         if (SDK_INT >= 17) {