Follow-up after ag/15645323
Make 'createConfig' a static function.
Fix OWNERS file to point to the correct location.
Bug: 188932434
Test: m sthal_cli_3
Change-Id: I7a35096acb71a246691f9bb9ddf41660f3e7cf8f
diff --git a/soundtrigger/aidl/cli/OWNERS b/soundtrigger/aidl/cli/OWNERS
index e21b66e..9f87c4c 100644
--- a/soundtrigger/aidl/cli/OWNERS
+++ b/soundtrigger/aidl/cli/OWNERS
@@ -1 +1 @@
-include /media/java/android/media/soundtrigger_middleware/OWNERS
+include platform/frameworks/base:/media/aidl/android/media/soundtrigger_middleware/OWNERS
diff --git a/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java b/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
index b477878..2922e83 100644
--- a/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
+++ b/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java
@@ -248,16 +248,6 @@
}
}
- private AudioConfig createConfig() {
- AudioConfig config = new AudioConfig();
- config.channelMask = AudioChannelLayout.layoutMask(AudioChannelLayout.LAYOUT_MONO);
- config.format = new AudioFormatDescription();
- config.format.type = AudioFormatType.PCM;
- config.format.pcm = PcmType.INT_16_BIT;
- config.sampleRateHz = 16000;
- return config;
- }
-
@Override
public void registerGlobalCallback(ISoundTriggerHwGlobalCallback callback) {
System.out.println("registerGlobalCallback()");
@@ -355,5 +345,15 @@
public int getParameter(int modelHandle, int modelParam) {
throw new IllegalArgumentException();
}
+
+ private static AudioConfig createConfig() {
+ AudioConfig config = new AudioConfig();
+ config.channelMask = AudioChannelLayout.layoutMask(AudioChannelLayout.LAYOUT_MONO);
+ config.format = new AudioFormatDescription();
+ config.format.type = AudioFormatType.PCM;
+ config.format.pcm = PcmType.INT_16_BIT;
+ config.sampleRateHz = 16000;
+ return config;
+ }
}
}
