summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2019-10-29 08:15:17 -0700
committer android-build-merger <android-build-merger@google.com> 2019-10-29 08:15:17 -0700
commitc3d0b20217d878656afc7bd63b80efcd3df1b05f (patch)
treed2db6c3d476a552a96d5291652e97655ad0c4858
parentb2bc8ddcfb1466ca92ef1f74e3cdd13af9325b0b (diff)
parent579c900beb2b6a55306cb2617cd46fa30c97adaf (diff)
Merge "Declare Visualizer::setEnabled() 'final'" am: 00639037d7
am: 579c900beb Change-Id: I3640dfae077fcd84bdf332ed027c15f2cabc95a1
-rw-r--r--media/jni/audioeffect/Visualizer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/jni/audioeffect/Visualizer.h b/media/jni/audioeffect/Visualizer.h
index 8078e369ee82..d4672a95c6d8 100644
--- a/media/jni/audioeffect/Visualizer.h
+++ b/media/jni/audioeffect/Visualizer.h
@@ -73,7 +73,8 @@ public:
~Visualizer();
- virtual status_t setEnabled(bool enabled);
+ // Declared 'final' because we call this in ~Visualizer().
+ status_t setEnabled(bool enabled) final;
// maximum capture size in samples
static uint32_t getMaxCaptureSize() { return VISUALIZER_CAPTURE_SIZE_MAX; }