Merge "Snap for 11510257 from e7a596c48050364d2160dbeddc9a9eddde2bd15c to simpleperf-release" into simpleperf-releasesimpleperf-release

10 files changed, 13 insertions, 9 deletions

diff --git a/src/android/AudioRecorder_to_android.cpp b/src/android/AudioRecorder_to_android.cpp
index d4b2964..a49893b 100644
--- a/src/android/AudioRecorder_to_android.cpp
+++ b/src/android/AudioRecorder_to_android.cpp
@@ -236,17 +236,12 @@ SLresult android_audioRecorder_checkSourceSink(CAudioRecorder* ar) {
     const SLuint32 sinkLocatorType = *(SLuint32 *)pAudioSnk->pLocator;
     const SLuint32 sinkFormatType = *(SLuint32 *)pAudioSnk->pFormat;
 
-    const SLuint32 *df_representation = NULL; // pointer to representation field, if it exists
-
     // sink must be an Android simple buffer queue with PCM data format
     switch (sinkLocatorType) {
     case SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE: {
         switch (sinkFormatType) {
         case SL_ANDROID_DATAFORMAT_PCM_EX: {
-            const SLAndroidDataFormat_PCM_EX *df_pcm =
-                    (SLAndroidDataFormat_PCM_EX *) pAudioSnk->pFormat;
             // checkDataFormat() already checked representation
-            df_representation = &df_pcm->representation;
         } // SL_ANDROID_DATAFORMAT_PCM_EX - fall through to next test.
             FALLTHROUGH_INTENDED;
         case SL_DATAFORMAT_PCM: {
diff --git a/src/locks.cpp b/src/locks.cpp
index 44128eb..f3edd33 100644
--- a/src/locks.cpp
+++ b/src/locks.cpp
@@ -117,7 +117,8 @@ forward_progress:
     thiz->mFile = file;
     thiz->mLine = line;
     // not android_atomic_inc because we are already holding a mutex
-    ++thiz->mGeneration;
+    // use explicit add as mGeneration is a volatile for which ++v and v += are deprecated.
+    thiz->mGeneration = thiz->mGeneration + 1;
 }
 #else
 void object_lock_exclusive(IObject *thiz)
diff --git a/tests/Android.bp b/tests/Android.bp
index a219706..c081fdb 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,9 +1,10 @@
 // Build the unit tests.
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // See: http://go/android-license-faq
     default_applicable_licenses: [
         "Android-Apache-2.0",
-        "frameworks_wilhelm_license",  // MIT
+        "frameworks_wilhelm_license", // MIT
     ],
 }
 
diff --git a/tests/automated/Android.bp b/tests/automated/Android.bp
index 6e3b1bc..26d5066 100644
--- a/tests/automated/Android.bp
+++ b/tests/automated/Android.bp
@@ -1,6 +1,7 @@
 // Build the unit tests.
 
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/examples/Android.bp b/tests/examples/Android.bp
index 8a0d0e4..08409a9 100644
--- a/tests/examples/Android.bp
+++ b/tests/examples/Android.bp
@@ -1,10 +1,11 @@
 // slesTest_recBuffQueue
 
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // See: http://go/android-license-faq
     default_applicable_licenses: [
         "Android-Apache-2.0",
-        "frameworks_wilhelm_license",  // MIT
+        "frameworks_wilhelm_license", // MIT
     ],
 }
 
diff --git a/tests/listening/Android.bp b/tests/listening/Android.bp
index 0771be3..8da6adb 100644
--- a/tests/listening/Android.bp
+++ b/tests/listening/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/mimeUri/Android.bp b/tests/mimeUri/Android.bp
index 994914d..3c5bbaf 100644
--- a/tests/mimeUri/Android.bp
+++ b/tests/mimeUri/Android.bp
@@ -1,10 +1,11 @@
 // slesTest_playStates
 
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // See: http://go/android-license-faq
     default_applicable_licenses: [
         "Android-Apache-2.0",
-        "frameworks_wilhelm_license",  // MIT
+        "frameworks_wilhelm_license", // MIT
     ],
 }
 
diff --git a/tests/native-media/Android.bp b/tests/native-media/Android.bp
index 66ff198..709ff26 100644
--- a/tests/native-media/Android.bp
+++ b/tests/native-media/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_platform_build",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/sandbox/Android.bp b/tests/sandbox/Android.bp
index 2142d19..c9c37a7 100644
--- a/tests/sandbox/Android.bp
+++ b/tests/sandbox/Android.bp
@@ -1,6 +1,7 @@
 // intbufq
 
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/sandbox/streamSource/Android.bp b/tests/sandbox/streamSource/Android.bp
index bfbb05a..cd9b388 100644
--- a/tests/sandbox/streamSource/Android.bp
+++ b/tests/sandbox/streamSource/Android.bp
@@ -1,6 +1,7 @@
 // slesTest_playStream
 
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }