commit 71455ba2e413c2a1fecb99587325beff1f94b82f
author Andy Hung <hunga@google.com> Wed May 05 09:08:25 2021 -0700
committer Andy Hung <hunga@google.com> Wed May 05 10:30:12 2021 -0700
tree 435996d669d6345c3017ff84257c076506ba999e
parent 9a8a479a73afa397c0dc387b99ca2a427fdab669

Fix VolumeShaper unducking for OpenSLES playback

Native PlayerBase::applyVolumeShaper was never called (silent failure)
due to an undeclared nullable InterpolatorConfig parcelable
which was sent as null.

Test: see bug for repro details
Bug: 185372526
Change-Id: Id18664978605602f287e15de0c920ffc83a9aada

aidl/android/media/VolumeShaperConfiguration.aidl

diff --git a/aidl/android/media/VolumeShaperConfiguration.aidl b/aidl/android/media/VolumeShaperConfiguration.aidl
index 6361851..824c169 100644
--- a/aidl/android/media/VolumeShaperConfiguration.aidl
+++ b/aidl/android/media/VolumeShaperConfiguration.aidl
@@ -29,5 +29,5 @@
     /** Bitmask, indexed by VolumeShaperConfigurationOptionFlag. */
     int optionFlags;
     double durationMs;
-    InterpolatorConfig interpolatorConfig;
+    @nullable InterpolatorConfig interpolatorConfig; // null if type == ID
 }

include/media/VolumeShaper.h

diff --git a/include/media/VolumeShaper.h b/include/media/VolumeShaper.h
index f8ead2f..5271e10 100644
--- a/include/media/VolumeShaper.h
+++ b/include/media/VolumeShaper.h
@@ -302,7 +302,8 @@
             if (mType != TYPE_ID) {
                 parcelable->optionFlags = getOptionFlagsAsAidl();
                 parcelable->durationMs = getDurationMs();
-                Interpolator<S, T>::writeToConfig(&parcelable->interpolatorConfig);
+                parcelable->interpolatorConfig.emplace(); // create value in std::optional
+                Interpolator<S, T>::writeToConfig(&*parcelable->interpolatorConfig);
             }
         }
 
@@ -319,8 +320,10 @@
                       ? NO_ERROR
                       : setOptionFlagsFromAidl(parcelable.optionFlags)
                         ?: setDurationMs(parcelable.durationMs)
-                           ?: Interpolator<S, T>::readFromConfig(parcelable.interpolatorConfig)
-                              ?: checkCurve();
+                           ?: !parcelable.interpolatorConfig  // check std::optional for value
+                               ? BAD_VALUE // must be nonnull.
+                               : Interpolator<S, T>::readFromConfig(*parcelable.interpolatorConfig)
+                                   ?: checkCurve();
         }
 
         // Returns a string for debug printing.