diff options
244 files changed, 1031 insertions, 9223 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp index c87ecde4e5c8..bf3a6a356e31 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -122,17 +122,30 @@ droidstubs { } droidstubs { - name: "framework-doc-system-stubs", - defaults: ["framework-doc-stubs-sources-default"], + name: "android-non-updatable-doc-stubs-module-lib", + defaults: [ + "android-non-updatable-doc-stubs-defaults", + "module-classpath-stubs-defaults", + ], args: metalava_framework_docs_args + - " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", - api_levels_annotations_enabled: true, - api_levels_annotations_dirs: [ - "sdk-dir", - "api-versions-jars-dir", + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) " + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\\) ", + generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs. + write_sdk_values: false, +} + +droidstubs { + name: "android-non-updatable-doc-stubs-system-server", + defaults: [ + "android-non-updatable-doc-stubs-defaults", + "module-classpath-stubs-defaults", ], - api_levels_sdk_type: "system", - extensions_info_file: ":sdk-extensions-info", + args: metalava_framework_docs_args + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) " + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\\) " + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\) ", + generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs. + write_sdk_values: false, } droidstubs { @@ -150,6 +163,20 @@ droidstubs { extensions_info_file: ":sdk-extensions-info", } +droidstubs { + name: "framework-doc-system-stubs", + defaults: ["framework-doc-stubs-sources-default"], + args: metalava_framework_docs_args + + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\) ", + api_levels_annotations_enabled: true, + api_levels_annotations_dirs: [ + "sdk-dir", + "api-versions-jars-dir", + ], + api_levels_sdk_type: "system", + extensions_info_file: ":sdk-extensions-info", +} + ///////////////////////////////////////////////////////////////////// // API docs are created from the generated stub source files // using droiddoc diff --git a/StubLibraries.bp b/StubLibraries.bp index bc2e6dd79fea..0e084968410f 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -411,6 +411,36 @@ java_library { ], } +java_library { + name: "android_module_stubs_current_with_test_libs", + static_libs: [ + "android_module_lib_stubs_current", + "android.test.base.stubs", + "android.test.mock.stubs", + "android.test.runner.stubs", + ], + defaults: ["android.jar_defaults"], + visibility: [ + "//visibility:override", + "//visibility:private", + ], +} + +java_library { + name: "android_system_server_stubs_current_with_test_libs", + static_libs: [ + "android_system_server_stubs_current", + "android.test.base.stubs.system", + "android.test.mock.stubs.system", + "android.test.runner.stubs.system", + ], + defaults: ["android.jar_defaults"], + visibility: [ + "//visibility:override", + "//visibility:private", + ], +} + droidstubs { name: "api_versions_public", srcs: [":android_stubs_current_with_test_libs{.jar}"], @@ -420,6 +450,7 @@ droidstubs { "sdk-dir", "api-versions-jars-dir", ], + api_levels_sdk_type: "public", extensions_info_file: ":sdk-extensions-info", } @@ -436,6 +467,32 @@ droidstubs { extensions_info_file: ":sdk-extensions-info", } +droidstubs { + name: "api_versions_module_lib", + srcs: [":android_module_stubs_current_with_test_libs{.jar}"], + generate_stubs: false, + api_levels_annotations_enabled: true, + api_levels_annotations_dirs: [ + "sdk-dir", + "api-versions-jars-dir", + ], + api_levels_sdk_type: "module-lib", + extensions_info_file: ":sdk-extensions-info", +} + +droidstubs { + name: "api_versions_system_server", + srcs: [":android_system_server_stubs_current_with_test_libs{.jar}"], + generate_stubs: false, + api_levels_annotations_enabled: true, + api_levels_annotations_dirs: [ + "sdk-dir", + "api-versions-jars-dir", + ], + api_levels_sdk_type: "system-server", + extensions_info_file: ":sdk-extensions-info", +} + ///////////////////////////////////////////////////////////////////// // hwbinder.stubs provides APIs required for building HIDL Java // libraries. diff --git a/apct-tests/perftests/core/src/android/libcore/regression/StringBuilderPerfTest.java b/apct-tests/perftests/core/src/android/libcore/regression/StringBuilderPerfTest.java index 34fb88bf8627..10fa8b93acaf 100644 --- a/apct-tests/perftests/core/src/android/libcore/regression/StringBuilderPerfTest.java +++ b/apct-tests/perftests/core/src/android/libcore/regression/StringBuilderPerfTest.java @@ -20,28 +20,19 @@ import android.perftests.utils.BenchmarkState; import android.perftests.utils.PerfStatusReporter; import android.test.suitebuilder.annotation.LargeTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -import java.util.Arrays; -import java.util.Collection; /** Tests the performance of various StringBuilder methods. */ -@RunWith(Parameterized.class) +@RunWith(AndroidJUnit4.class) @LargeTest public class StringBuilderPerfTest { @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter(); - @Parameters(name = "mLength={0}") - public static Collection<Object[]> data() { - return Arrays.asList(new Object[][] {{1}, {10}, {100}}); - } - - @Parameterized.Parameter(0) - public int mLength; + public int mLength = 100; @Test public void timeAppendBoolean() { diff --git a/apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java b/apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java index 2da00c7a8e2c..50a77f371b6e 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/InternalResourceService.java @@ -517,7 +517,6 @@ public class InternalResourceService extends SystemService { removedPkgs.add(pkgInfo.packageName); mUidToPackageCache.remove(pkgInfo.applicationInfo.uid); mPkgCache.remove(i); - break; } } mAgent.onUserRemovedLocked(userId, removedPkgs); diff --git a/api/Android.bp b/api/Android.bp index 505d7bf99135..210b8f50b803 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -208,6 +208,24 @@ genrule { } genrule { + name: "sdk-annotations-module-lib.zip", + defaults: ["sdk-annotations-defaults"], + srcs: [ + ":android-non-updatable-doc-stubs-module-lib{.annotations.zip}", + ":all-modules-module-lib-annotations", + ], +} + +genrule { + name: "sdk-annotations-system-server.zip", + defaults: ["sdk-annotations-defaults"], + srcs: [ + ":android-non-updatable-doc-stubs-system-server{.annotations.zip}", + ":all-modules-system-server-annotations", + ], +} + +genrule { name: "combined-removed-dex", visibility: [ "//frameworks/base/boot", diff --git a/api/api.go b/api/api.go index f15804156bdf..6a6c493e041a 100644 --- a/api/api.go +++ b/api/api.go @@ -148,18 +148,35 @@ func createMergedStubsSrcjar(ctx android.LoadHookContext, modules []string) { ctx.CreateModule(genrule.GenRuleFactory, &props) } -func createMergedPublicAnnotationsFilegroup(ctx android.LoadHookContext, modules []string) { - props := fgProps{} - props.Name = proptools.StringPtr("all-modules-public-annotations") - props.Srcs = createSrcs(modules, "{.public.annotations.zip}") - ctx.CreateModule(android.FileGroupFactory, &props) -} - -func createMergedSystemAnnotationsFilegroup(ctx android.LoadHookContext, modules []string) { - props := fgProps{} - props.Name = proptools.StringPtr("all-modules-system-annotations") - props.Srcs = createSrcs(modules, "{.system.annotations.zip}") - ctx.CreateModule(android.FileGroupFactory, &props) +func createMergedAnnotationsFilegroups(ctx android.LoadHookContext, modules, system_server_modules []string) { + for _, i := range []struct{ + name string + tag string + modules []string + }{ + { + name: "all-modules-public-annotations", + tag: "{.public.annotations.zip}", + modules: modules, + }, { + name: "all-modules-system-annotations", + tag: "{.system.annotations.zip}", + modules: modules, + }, { + name: "all-modules-module-lib-annotations", + tag: "{.module-lib.annotations.zip}", + modules: modules, + }, { + name: "all-modules-system-server-annotations", + tag: "{.system-server.annotations.zip}", + modules: system_server_modules, + }, + } { + props := fgProps{} + props.Name = proptools.StringPtr(i.name) + props.Srcs = createSrcs(i.modules, i.tag) + ctx.CreateModule(android.FileGroupFactory, &props) + } } func createFilteredApiVersions(ctx android.LoadHookContext, modules []string) { @@ -172,17 +189,43 @@ func createFilteredApiVersions(ctx android.LoadHookContext, modules []string) { // difficult to achieve. modules = remove(modules, art) - props := genruleProps{} - props.Name = proptools.StringPtr("api-versions-xml-public-filtered") - props.Tools = []string{"api_versions_trimmer"} - props.Out = []string{"api-versions-public-filtered.xml"} - props.Cmd = proptools.StringPtr("$(location api_versions_trimmer) $(out) $(in)") - // Note: order matters: first parameter is the full api-versions.xml - // after that the stubs files in any order - // stubs files are all modules that export API surfaces EXCEPT ART - props.Srcs = append([]string{":api_versions_public{.api_versions.xml}"}, createSrcs(modules, ".stubs{.jar}")...) - props.Dists = []android.Dist{{Targets: []string{"sdk"}}} - ctx.CreateModule(genrule.GenRuleFactory, &props) + for _, i := range []struct{ + name string + out string + in string + }{ + { + // We shouldn't need public-filtered or system-filtered. + // public-filtered is currently used to lint things that + // use the module sdk or the system server sdk, but those + // should be switched over to module-filtered and + // system-server-filtered, and then public-filtered can + // be removed. + name: "api-versions-xml-public-filtered", + out: "api-versions-public-filtered.xml", + in: ":api_versions_public{.api_versions.xml}", + }, { + name: "api-versions-xml-module-lib-filtered", + out: "api-versions-module-lib-filtered.xml", + in: ":api_versions_module_lib{.api_versions.xml}", + }, { + name: "api-versions-xml-system-server-filtered", + out: "api-versions-system-server-filtered.xml", + in: ":api_versions_system_server{.api_versions.xml}", + }, + } { + props := genruleProps{} + props.Name = proptools.StringPtr(i.name) + props.Out = []string{i.out} + // Note: order matters: first parameter is the full api-versions.xml + // after that the stubs files in any order + // stubs files are all modules that export API surfaces EXCEPT ART + props.Srcs = append([]string{i.in}, createSrcs(modules, ".stubs{.jar}")...) + props.Tools = []string{"api_versions_trimmer"} + props.Cmd = proptools.StringPtr("$(location api_versions_trimmer) $(out) $(in)") + props.Dists = []android.Dist{{Targets: []string{"sdk"}}} + ctx.CreateModule(genrule.GenRuleFactory, &props) + } } func createMergedPublicStubs(ctx android.LoadHookContext, modules []string) { @@ -279,11 +322,12 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) { bootclasspath := a.properties.Bootclasspath + system_server_classpath := a.properties.System_server_classpath if ctx.Config().VendorConfig("ANDROID").Bool("include_nonpublic_framework_api") { bootclasspath = append(bootclasspath, a.properties.Conditional_bootclasspath...) sort.Strings(bootclasspath) } - createMergedTxts(ctx, bootclasspath, a.properties.System_server_classpath) + createMergedTxts(ctx, bootclasspath, system_server_classpath) createMergedStubsSrcjar(ctx, bootclasspath) @@ -292,8 +336,7 @@ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) { createMergedFrameworkModuleLibStubs(ctx, bootclasspath) createMergedFrameworkImpl(ctx, bootclasspath) - createMergedPublicAnnotationsFilegroup(ctx, bootclasspath) - createMergedSystemAnnotationsFilegroup(ctx, bootclasspath) + createMergedAnnotationsFilegroups(ctx, bootclasspath, system_server_classpath) createFilteredApiVersions(ctx, bootclasspath) diff --git a/cmds/incidentd/src/IncidentService.cpp b/cmds/incidentd/src/IncidentService.cpp index 836801deaa08..5af02f405ed9 100644 --- a/cmds/incidentd/src/IncidentService.cpp +++ b/cmds/incidentd/src/IncidentService.cpp @@ -52,11 +52,7 @@ enum { #define SKIPPED_DUMPSTATE_SECTIONS { \ 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, /* Logs */ \ 1200, 1201, 1202, /* Native, hal, java traces */ \ - 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, \ - 3014, 3015, 3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023, 3024, 3027, 3028, 3029, \ - 3030, 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043, \ - 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 3056, 4000, \ - 4001, /* Dumpsys */ } + 3018, /* dumpsys meminfo*/ } namespace android { namespace os { diff --git a/core/api/current.txt b/core/api/current.txt index 05e2a9aa7286..9c7796ef9d4b 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -43491,7 +43491,7 @@ package android.telephony { method public void registerTelephonyCallback(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyCallback); method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback); method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback); - method @Nullable @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(int, @NonNull android.telephony.NetworkScanRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyScanManager.NetworkScanCallback); + method @Nullable @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE}) public android.telephony.NetworkScan requestNetworkScan(int, @NonNull android.telephony.NetworkScanRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyScanManager.NetworkScanCallback); method public void sendDialerSpecialCode(String); method public String sendEnvelopeWithStatus(String); method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler); diff --git a/core/java/android/app/admin/EnterprisePlatformSecurity_OWNERS b/core/java/android/app/admin/EnterprisePlatformSecurity_OWNERS index f5604347065e..38fee895d5c3 100644 --- a/core/java/android/app/admin/EnterprisePlatformSecurity_OWNERS +++ b/core/java/android/app/admin/EnterprisePlatformSecurity_OWNERS @@ -1,4 +1,5 @@ rubinxu@google.com -acjohnston@google.com pgrafov@google.com +ayushsha@google.com +acjohnston@google.com #{LAST_RESORT_SUGGESTION} alexkershaw@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file diff --git a/core/java/android/app/admin/EnterprisePlatform_OWNERS b/core/java/android/app/admin/EnterprisePlatform_OWNERS index fb00fe506ed1..6ce25cc42876 100644 --- a/core/java/android/app/admin/EnterprisePlatform_OWNERS +++ b/core/java/android/app/admin/EnterprisePlatform_OWNERS @@ -1,2 +1,5 @@ +# Assign bugs to android-enterprise-triage@google.com file:WorkDeviceExperience_OWNERS +file:Provisioning_OWNERS +file:WorkProfile_OWNERS file:EnterprisePlatformSecurity_OWNERS
\ No newline at end of file diff --git a/core/java/android/app/admin/Provisioning_OWNERS b/core/java/android/app/admin/Provisioning_OWNERS new file mode 100644 index 000000000000..c59a9dc51aa7 --- /dev/null +++ b/core/java/android/app/admin/Provisioning_OWNERS @@ -0,0 +1,5 @@ +# Assign bugs to android-enterprise-triage@google.com +petuska@google.com +nupursn@google.com +shreyacsingh@google.com +alexkershaw@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file diff --git a/core/java/android/app/admin/WorkDeviceExperience_OWNERS b/core/java/android/app/admin/WorkDeviceExperience_OWNERS index dcacaa25a236..b881de0242ea 100644 --- a/core/java/android/app/admin/WorkDeviceExperience_OWNERS +++ b/core/java/android/app/admin/WorkDeviceExperience_OWNERS @@ -1,5 +1,7 @@ +# Assign bugs to android-enterprise-triage@google.com work-device-experience+reviews@google.com -scottjonathan@google.com -arangelov@google.com -kholoudm@google.com +scottjonathan@google.com #{LAST_RESORT_SUGGESTION} +eliselliott@google.com #{LAST_RESORT_SUGGESTION} +kholoudm@google.com #{LAST_RESORT_SUGGESTION} +acjohnston@google.com #{LAST_RESORT_SUGGESTION} alexkershaw@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file diff --git a/core/java/android/app/admin/WorkProfile_OWNERS b/core/java/android/app/admin/WorkProfile_OWNERS new file mode 100644 index 000000000000..260b672788d1 --- /dev/null +++ b/core/java/android/app/admin/WorkProfile_OWNERS @@ -0,0 +1,5 @@ +# Assign bugs to android-enterprise-triage@google.com +liahav@google.com +olit@google.com +scottjonathan@google.com #{LAST_RESORT_SUGGESTION} +alexkershaw@google.com #{LAST_RESORT_SUGGESTION}
\ No newline at end of file diff --git a/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java b/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java index 830584314039..bc6368639baa 100644 --- a/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java +++ b/core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java @@ -299,7 +299,7 @@ public final class SQLiteDatabaseConfiguration { if (isLegacyCompatibilityWalEnabled()) { return SQLiteCompatibilityWalFlags.getWALSyncMode(); } else { - return SQLiteGlobal.getDefaultSyncMode(); + return SQLiteGlobal.getWALSyncMode(); } } else { return SQLiteGlobal.getDefaultSyncMode(); diff --git a/core/java/android/os/Vibrator.java b/core/java/android/os/Vibrator.java index 465d90d36698..4137ca18b068 100644 --- a/core/java/android/os/Vibrator.java +++ b/core/java/android/os/Vibrator.java @@ -527,7 +527,8 @@ public abstract class Vibrator { } /** - * Query whether the vibrator supports all the given effects. + * Query whether the vibrator supports all the given effects. If no argument is provided this + * method will always return {@link #VIBRATION_EFFECT_SUPPORT_YES}. * * <p>If an effect is not supported, the system may still automatically fall back to a simpler * vibration instead, which is not optimised for the specific device, however vibration isn't @@ -549,7 +550,8 @@ public abstract class Vibrator { * <p>Use {@link #areEffectsSupported(int...)} to get individual results for each effect. * * @param effectIds Which effects to query for. - * @return Whether all the effects are natively supported by the device. + * @return Whether all specified effects are natively supported by the device. Empty query + * defaults to {@link #VIBRATION_EFFECT_SUPPORT_YES}. */ @VibrationEffectSupport public final int areAllEffectsSupported( @@ -598,7 +600,8 @@ public abstract class Vibrator { } /** - * Query whether the vibrator supports all of the given primitives. + * Query whether the vibrator supports all of the given primitives. If no argument is provided + * this method will always return {@code true}. * * <p>If a primitive is not supported by the device, then <em>no vibration</em> will occur if * it is played. @@ -606,7 +609,7 @@ public abstract class Vibrator { * <p>Use {@link #arePrimitivesSupported(int...)} to get individual results for each primitive. * * @param primitiveIds Which primitives to query for. - * @return Whether all specified primitives are supported. + * @return Whether all specified primitives are supported. Empty query defaults to {@code true}. */ public final boolean areAllPrimitivesSupported( @NonNull @VibrationEffect.Composition.PrimitiveType int... primitiveIds) { diff --git a/core/java/com/android/internal/backup/OWNERS b/core/java/com/android/internal/backup/OWNERS new file mode 100644 index 000000000000..53b6c78b3895 --- /dev/null +++ b/core/java/com/android/internal/backup/OWNERS @@ -0,0 +1 @@ +include /services/backup/OWNERS
\ No newline at end of file diff --git a/core/java/com/android/internal/display/BrightnessSynchronizer.java b/core/java/com/android/internal/display/BrightnessSynchronizer.java index 627631a376f7..62c7966bb2d6 100644 --- a/core/java/com/android/internal/display/BrightnessSynchronizer.java +++ b/core/java/com/android/internal/display/BrightnessSynchronizer.java @@ -115,7 +115,7 @@ public class BrightnessSynchronizer { Slog.i(TAG, "Setting initial brightness to default value of: " + defaultBrightness); } - mBrightnessSyncObserver.startObserving(); + mBrightnessSyncObserver.startObserving(mHandler); mHandler.sendEmptyMessageAtTime(MSG_RUN_UPDATE, mClock.uptimeMillis()); } @@ -482,27 +482,29 @@ public class BrightnessSynchronizer { } }; - private final ContentObserver mContentObserver = new ContentObserver(mHandler) { - @Override - public void onChange(boolean selfChange, Uri uri) { - if (selfChange) { - return; - } - if (BRIGHTNESS_URI.equals(uri)) { - handleBrightnessChangeInt(getScreenBrightnessInt()); + private ContentObserver createBrightnessContentObserver(Handler handler) { + return new ContentObserver(handler) { + @Override + public void onChange(boolean selfChange, Uri uri) { + if (selfChange) { + return; + } + if (BRIGHTNESS_URI.equals(uri)) { + handleBrightnessChangeInt(getScreenBrightnessInt()); + } } - } - }; + }; + } boolean isObserving() { return mIsObserving; } - void startObserving() { + void startObserving(Handler handler) { final ContentResolver cr = mContext.getContentResolver(); - cr.registerContentObserver(BRIGHTNESS_URI, false, mContentObserver, - UserHandle.USER_ALL); - mDisplayManager.registerDisplayListener(mListener, mHandler, + cr.registerContentObserver(BRIGHTNESS_URI, false, + createBrightnessContentObserver(handler), UserHandle.USER_ALL); + mDisplayManager.registerDisplayListener(mListener, handler, DisplayManager.EVENT_FLAG_DISPLAY_BRIGHTNESS); mIsObserving = true; } diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index f178296727e6..076e4e118e66 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -515,7 +515,12 @@ public class ZygoteInit { if (shouldProfileSystemServer() && (Build.IS_USERDEBUG || Build.IS_ENG)) { try { Log.d(TAG, "Preparing system server profile"); - prepareSystemServerProfile(systemServerClasspath); + final String standaloneSystemServerJars = + Os.getenv("STANDALONE_SYSTEMSERVER_JARS"); + final String systemServerPaths = standaloneSystemServerJars != null + ? String.join(":", systemServerClasspath, standaloneSystemServerJars) + : systemServerClasspath; + prepareSystemServerProfile(systemServerPaths); } catch (Exception e) { Log.wtf(TAG, "Failed to set up system server profile", e); } @@ -608,12 +613,12 @@ public class ZygoteInit { * permissions. From the installer perspective the system server is a regular package which can * capture profile information. */ - private static void prepareSystemServerProfile(String systemServerClasspath) + private static void prepareSystemServerProfile(String systemServerPaths) throws RemoteException { - if (systemServerClasspath.isEmpty()) { + if (systemServerPaths.isEmpty()) { return; } - String[] codePaths = systemServerClasspath.split(":"); + String[] codePaths = systemServerPaths.split(":"); final IInstalld installd = IInstalld.Stub .asInterface(ServiceManager.getService("installd")); diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index bb4ab39a59d1..1f64df49cb56 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -101,9 +101,18 @@ static void android_os_Parcel_markSensitive(jlong nativePtr) static void android_os_Parcel_markForBinder(JNIEnv* env, jclass clazz, jlong nativePtr, jobject binder) { + LOG_ALWAYS_FATAL_IF(binder == nullptr, "Null binder specified for markForBinder"); + Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr); if (parcel) { - parcel->markForBinder(ibinderForJavaObject(env, binder)); + sp<IBinder> nBinder = ibinderForJavaObject(env, binder); + + if (nBinder == nullptr) { + ALOGE("Native binder in markForBinder is null for non-null jobject"); + return; + } + + parcel->markForBinder(nBinder); } } diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index f28e2f636dac..9f88f3369ae8 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -798,6 +798,12 @@ sp<IBinder> ibinderForJavaObject(JNIEnv* env, jobject obj) if (env->IsInstanceOf(obj, gBinderOffsets.mClass)) { JavaBBinderHolder* jbh = (JavaBBinderHolder*) env->GetLongField(obj, gBinderOffsets.mObject); + + if (jbh == nullptr) { + ALOGE("JavaBBinderHolder null on binder"); + return nullptr; + } + return jbh->get(env, obj); } diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index be82879c8411..0eb999f772d3 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -260,6 +260,13 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr return INSTALL_FAILED_CONTAINER_ERROR; } + if (fsync(fd) < 0) { + ALOGE("Coulnd't fsync temporary file name: %s: %s\n", localTmpFileName, strerror(errno)); + close(fd); + unlink(localTmpFileName); + return INSTALL_FAILED_INTERNAL_ERROR; + } + close(fd); // Set the modification time for this file to the ZIP's mod time. diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 392d89e4fc6a..8ca16071a1e4 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -483,6 +483,8 @@ applications that come with the platform <permission name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" /> <!-- Permission required for GTS test - GtsAssistIntentTestCases --> <permission name="android.permission.MANAGE_VOICE_KEYPHRASES" /> + <!-- Permission required for test - CellBroadcastComplianceTest --> + <permission name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" /> <!-- Permission required for ATS test - CarDevicePolicyManagerTest --> <permission name="android.permission.LOCK_DEVICE" /> <!-- Permissions required for CTS test - CtsSafetyCenterTestCases --> diff --git a/libs/hwui/DeferredLayerUpdater.cpp b/libs/hwui/DeferredLayerUpdater.cpp index a5c0924579eb..b763a96e8e8a 100644 --- a/libs/hwui/DeferredLayerUpdater.cpp +++ b/libs/hwui/DeferredLayerUpdater.cpp @@ -169,6 +169,8 @@ void DeferredLayerUpdater::apply() { sk_sp<SkImage> layerImage = mImageSlots[slot].createIfNeeded( hardwareBuffer, dataspace, newContent, mRenderState.getRenderThread().getGrContext()); + AHardwareBuffer_Desc bufferDesc; + AHardwareBuffer_describe(hardwareBuffer, &bufferDesc); // unref to match the ref added by ASurfaceTexture_dequeueBuffer. eglCreateImageKHR // (invoked by createIfNeeded) will add a ref to the AHardwareBuffer. AHardwareBuffer_release(hardwareBuffer); @@ -189,6 +191,7 @@ void DeferredLayerUpdater::apply() { maxLuminanceNits = std::max(cta861_3.maxContentLightLevel, maxLuminanceNits); } + mLayer->setBufferFormat(bufferDesc.format); updateLayer(forceFilter, layerImage, outTransform, currentCropRect, maxLuminanceNits); } diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h index 47eb5d3bfb83..345749b6d920 100644 --- a/libs/hwui/Layer.h +++ b/libs/hwui/Layer.h @@ -102,6 +102,10 @@ public: inline float getMaxLuminanceNits() { return mMaxLuminanceNits; } + void setBufferFormat(uint32_t format) { mBufferFormat = format; } + + uint32_t getBufferFormat() const { return mBufferFormat; } + void draw(SkCanvas* canvas); protected: @@ -169,6 +173,8 @@ private: */ float mMaxLuminanceNits = -1; + uint32_t mBufferFormat = 0; + }; // struct Layer } // namespace uirenderer diff --git a/libs/hwui/pipeline/skia/LayerDrawable.cpp b/libs/hwui/pipeline/skia/LayerDrawable.cpp index 2fba13c3cfea..3ba540921f64 100644 --- a/libs/hwui/pipeline/skia/LayerDrawable.cpp +++ b/libs/hwui/pipeline/skia/LayerDrawable.cpp @@ -107,6 +107,32 @@ static bool isHdrDataspace(ui::Dataspace dataspace) { return transfer == HAL_DATASPACE_TRANSFER_ST2084 || transfer == HAL_DATASPACE_TRANSFER_HLG; } +static void adjustCropForYUV(uint32_t format, int bufferWidth, int bufferHeight, SkRect* cropRect) { + // Chroma channels of YUV420 images are subsampled we may need to shrink the crop region by + // a whole texel on each side. Since skia still adds its own 0.5 inset, we apply an + // additional 0.5 inset. See GLConsumer::computeTransformMatrix for details. + float shrinkAmount = 0.0f; + switch (format) { + // Use HAL formats since some AHB formats are only available in vndk + case HAL_PIXEL_FORMAT_YCBCR_420_888: + case HAL_PIXEL_FORMAT_YV12: + case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: + shrinkAmount = 0.5f; + break; + default: + break; + } + + // Shrink the crop if it has more than 1-px and differs from the buffer size. + if (cropRect->width() > 1 && cropRect->width() < bufferWidth) { + cropRect->inset(shrinkAmount, 0); + } + + if (cropRect->height() > 1 && cropRect->height() < bufferHeight) { + cropRect->inset(0, shrinkAmount); + } +} + // TODO: Context arg probably doesn't belong here – do debug check at callsite instead. bool LayerDrawable::DrawLayer(GrRecordingContext* context, SkCanvas* canvas, @@ -142,6 +168,7 @@ bool LayerDrawable::DrawLayer(GrRecordingContext* context, SkRect skiaSrcRect; if (srcRect && !srcRect->isEmpty()) { skiaSrcRect = *srcRect; + adjustCropForYUV(layer->getBufferFormat(), imageWidth, imageHeight, &skiaSrcRect); } else { skiaSrcRect = SkRect::MakeIWH(imageWidth, imageHeight); } diff --git a/media/Android.bp b/media/Android.bp index 97970dae0fa0..e8555b046237 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -40,210 +40,3 @@ aidl_interface { "media_permission-aidl", ], } - -aidl_interface { - name: "android.media.audio.common.types", - vendor_available: true, - host_supported: true, - double_loadable: true, - flags: [ - "-Werror", - "-Weverything", - ], - local_include_dir: "aidl", - srcs: [ - "aidl/android/media/audio/common/AudioAttributes.aidl", - "aidl/android/media/audio/common/AudioChannelLayout.aidl", - "aidl/android/media/audio/common/AudioConfig.aidl", - "aidl/android/media/audio/common/AudioConfigBase.aidl", - "aidl/android/media/audio/common/AudioContentType.aidl", - "aidl/android/media/audio/common/AudioDevice.aidl", - "aidl/android/media/audio/common/AudioDeviceAddress.aidl", - "aidl/android/media/audio/common/AudioDeviceDescription.aidl", - "aidl/android/media/audio/common/AudioDeviceType.aidl", - "aidl/android/media/audio/common/AudioEncapsulationMetadataType.aidl", - "aidl/android/media/audio/common/AudioEncapsulationMode.aidl", - "aidl/android/media/audio/common/AudioEncapsulationType.aidl", - "aidl/android/media/audio/common/AudioFlag.aidl", - "aidl/android/media/audio/common/AudioFormatDescription.aidl", - "aidl/android/media/audio/common/AudioFormatType.aidl", - "aidl/android/media/audio/common/AudioGain.aidl", - "aidl/android/media/audio/common/AudioGainConfig.aidl", - "aidl/android/media/audio/common/AudioGainMode.aidl", - "aidl/android/media/audio/common/AudioInputFlags.aidl", - "aidl/android/media/audio/common/AudioIoFlags.aidl", - "aidl/android/media/audio/common/AudioMMapPolicy.aidl", - "aidl/android/media/audio/common/AudioMMapPolicyInfo.aidl", - "aidl/android/media/audio/common/AudioMMapPolicyType.aidl", - "aidl/android/media/audio/common/AudioMode.aidl", - "aidl/android/media/audio/common/AudioOffloadInfo.aidl", - "aidl/android/media/audio/common/AudioOutputFlags.aidl", - "aidl/android/media/audio/common/AudioPort.aidl", - "aidl/android/media/audio/common/AudioPortConfig.aidl", - "aidl/android/media/audio/common/AudioPortDeviceExt.aidl", - "aidl/android/media/audio/common/AudioPortExt.aidl", - "aidl/android/media/audio/common/AudioPortMixExt.aidl", - "aidl/android/media/audio/common/AudioPortMixExtUseCase.aidl", - "aidl/android/media/audio/common/AudioProfile.aidl", - "aidl/android/media/audio/common/AudioSource.aidl", - "aidl/android/media/audio/common/AudioStandard.aidl", - "aidl/android/media/audio/common/AudioStreamType.aidl", - "aidl/android/media/audio/common/AudioUsage.aidl", - "aidl/android/media/audio/common/AudioUuid.aidl", - "aidl/android/media/audio/common/Boolean.aidl", - "aidl/android/media/audio/common/Byte.aidl", - "aidl/android/media/audio/common/ExtraAudioDescriptor.aidl", - "aidl/android/media/audio/common/Float.aidl", - "aidl/android/media/audio/common/Double.aidl", - "aidl/android/media/audio/common/Int.aidl", - "aidl/android/media/audio/common/Long.aidl", - "aidl/android/media/audio/common/PcmType.aidl", - ], - stability: "vintf", - backend: { - cpp: { - min_sdk_version: "29", - apex_available: [ - "//apex_available:platform", - "com.android.media", - ], - }, - java: { - sdk_version: "module_current", - min_sdk_version: "29", - apex_available: [ - "//apex_available:platform", - "com.android.car.framework", - ], - }, - ndk: { - min_sdk_version: "29", - apex_available: [ - "//apex_available:platform", - "com.android.btservices", - ], - }, - }, - versions_with_info: [ - { - version: "1", - imports: [], - }, - // IMPORTANT: Update latest_android_media_audio_common_types every time - // you add the latest frozen version to versions_with_info - ], - -} - -// Note: This should always be one version ahead of the last frozen version -latest_android_media_audio_common_types = "android.media.audio.common.types-V2" - -// Modules that depend on android.media.audio.common.types directly can include -// the following cc_defaults to avoid explicitly managing dependency versions -// across many scattered files. -cc_defaults { - name: "latest_android_media_audio_common_types_cpp_shared", - shared_libs: [ - latest_android_media_audio_common_types + "-cpp", - ], -} - -cc_defaults { - name: "latest_android_media_audio_common_types_cpp_export_shared", - defaults: [ - "latest_android_media_audio_common_types_cpp_shared", - ], - export_shared_lib_headers: [ - latest_android_media_audio_common_types + "-cpp", - ], -} - -cc_defaults { - name: "latest_android_media_audio_common_types_cpp_static", - static_libs: [ - latest_android_media_audio_common_types + "-cpp", - ], -} - -cc_defaults { - name: "latest_android_media_audio_common_types_cpp_export_static", - defaults: [ - "latest_android_media_audio_common_types_cpp_static", - ], - export_static_lib_headers: [ - latest_android_media_audio_common_types + "-cpp", - ], -} - -cc_defaults { - name: "latest_android_media_audio_common_types_ndk_shared", - shared_libs: [ - latest_android_media_audio_common_types + "-ndk", - ], -} - -cc_defaults { - name: "latest_android_media_audio_common_types_ndk_static", - static_libs: [ - latest_android_media_audio_common_types + "-ndk", - ], -} - -cc_defaults { - name: "latest_android_media_audio_common_types_cpp_target_shared", - target: { - android: { - shared_libs: [ - latest_android_media_audio_common_types + "-cpp", - ], - }, - }, -} - -aidl_interface { - name: "android.media.soundtrigger.types", - vendor_available: true, - host_supported: true, - flags: [ - "-Werror", - "-Weverything", - ], - local_include_dir: "aidl", - srcs: [ - "aidl/android/media/soundtrigger/AudioCapabilities.aidl", - "aidl/android/media/soundtrigger/ConfidenceLevel.aidl", - "aidl/android/media/soundtrigger/ModelParameter.aidl", - "aidl/android/media/soundtrigger/ModelParameterRange.aidl", - "aidl/android/media/soundtrigger/Phrase.aidl", - "aidl/android/media/soundtrigger/PhraseRecognitionEvent.aidl", - "aidl/android/media/soundtrigger/PhraseRecognitionExtra.aidl", - "aidl/android/media/soundtrigger/PhraseSoundModel.aidl", - "aidl/android/media/soundtrigger/Properties.aidl", - "aidl/android/media/soundtrigger/RecognitionConfig.aidl", - "aidl/android/media/soundtrigger/RecognitionEvent.aidl", - "aidl/android/media/soundtrigger/RecognitionMode.aidl", - "aidl/android/media/soundtrigger/RecognitionStatus.aidl", - "aidl/android/media/soundtrigger/SoundModel.aidl", - "aidl/android/media/soundtrigger/SoundModelType.aidl", - "aidl/android/media/soundtrigger/Status.aidl", - ], - stability: "vintf", - backend: { - cpp: { - enabled: true, - }, - java: { - sdk_version: "module_current", - }, - }, - imports: [ - "android.media.audio.common.types-V2", - ], - versions_with_info: [ - { - version: "1", - imports: ["android.media.audio.common.types-V2"], - }, - ], - -} diff --git a/media/aidl/android/media/audio/common/AudioAttributes.aidl b/media/aidl/android/media/audio/common/AudioAttributes.aidl deleted file mode 100644 index eb29e10ab3a5..000000000000 --- a/media/aidl/android/media/audio/common/AudioAttributes.aidl +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioContentType; -import android.media.audio.common.AudioFlag; -import android.media.audio.common.AudioSource; -import android.media.audio.common.AudioUsage; - -/** - * AudioAttributes give information about an audio stream that is more - * descriptive than stream type alone. - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioAttributes { - /** - * Classifies the content of the audio signal using categories such as - * speech or music - */ - AudioContentType contentType = AudioContentType.UNKNOWN; - /** - * Classifies the intended use of the audio signal using categories such as - * alarm or ringtone - */ - AudioUsage usage = AudioUsage.UNKNOWN; - /** - * Classifies the audio source using categories such as voice uplink or - * remote submix - */ - AudioSource source = AudioSource.DEFAULT; - /** - * Bitmask describing how playback is to be affected. - */ - int flags = AudioFlag.NONE; - /** - * Tag is an additional use case qualifier complementing AudioUsage and - * AudioContentType. Tags are set by vendor-specific applications and must - * be prefixed by "VX_". Vendors must namespace their tag names using the - * name of their company to avoid conflicts. The namespace must use at least - * three characters, and must go directly after the "VX_" prefix. - * For example: "VX_MYCOMPANY_VR". - */ - @utf8InCpp String[] tags; -}
\ No newline at end of file diff --git a/media/aidl/android/media/audio/common/AudioChannelLayout.aidl b/media/aidl/android/media/audio/common/AudioChannelLayout.aidl deleted file mode 100644 index 311bd590c7a2..000000000000 --- a/media/aidl/android/media/audio/common/AudioChannelLayout.aidl +++ /dev/null @@ -1,243 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * This structure describes a layout of a multi-channel stream. - * There are two possible ways for representing a layout: - * - * - indexed mask, which tells what channels of an audio frame are used, but - * doesn't label them in any way, thus a correspondence between channels in - * the same position of frames originating from different streams must be - * established externally; - * - * - layout mask, which gives a label to each channel, thus allowing to - * match channels between streams of different layouts. - * - * Both representations are agnostic of the direction of audio transfer. Also, - * by construction, the number of bits set to '1' in the mask indicates the - * number of channels in the audio frame. A channel mask per se only defines the - * presence or absence of a channel, not the order. Please see 'INTERLEAVE_*' - * constants for the platform convention of order. - * - * The structure also defines a "voice mask" which is a special case of - * layout mask, intended for processing voice audio from telecommunication - * use cases. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -union AudioChannelLayout { - /** - * This variant is used for representing the "null" ("none") value - * for the channel layout. The field value must always be '0'. - */ - int none = 0; - /** - * This variant is used for indicating an "invalid" layout for use by the - * framework only. HAL implementations must not accept or emit - * AudioChannelLayout values for this variant. The field value must always - * be '0'. - */ - int invalid = 0; - /** - * This variant is used for representing indexed masks. The mask indicates - * what channels are used. For example, the mask that specifies to use only - * channels 1 and 3 when interacting with a multi-channel device is defined - * as a combination of the 1st and the 3rd bits and thus is equal to 5. See - * also the 'INDEX_MASK_*' constants. The 'indexMask' field must have at - * least one bit set. - */ - int indexMask; - /** - * This variant is used for representing layout masks. - * It is recommended to use one of 'LAYOUT_*' values. The 'layoutMask' field - * must have at least one bit set. - */ - int layoutMask; - /** - * This variant is used for processing of voice audio input and output. - * It is recommended to use one of 'VOICE_*' values. The 'voiceMask' field - * must have at least one bit set. - */ - int voiceMask; - - /** - * 'INDEX_MASK_*' constants define how many channels are used. - * The mask constants below are 'canonical' masks. Each 'INDEX_MASK_N' - * constant declares that all N channels are used and arranges - * them starting from the LSB. - */ - const int INDEX_MASK_1 = (1 << 1) - 1; - const int INDEX_MASK_2 = (1 << 2) - 1; - const int INDEX_MASK_3 = (1 << 3) - 1; - const int INDEX_MASK_4 = (1 << 4) - 1; - const int INDEX_MASK_5 = (1 << 5) - 1; - const int INDEX_MASK_6 = (1 << 6) - 1; - const int INDEX_MASK_7 = (1 << 7) - 1; - const int INDEX_MASK_8 = (1 << 8) - 1; - const int INDEX_MASK_9 = (1 << 9) - 1; - const int INDEX_MASK_10 = (1 << 10) - 1; - const int INDEX_MASK_11 = (1 << 11) - 1; - const int INDEX_MASK_12 = (1 << 12) - 1; - const int INDEX_MASK_13 = (1 << 13) - 1; - const int INDEX_MASK_14 = (1 << 14) - 1; - const int INDEX_MASK_15 = (1 << 15) - 1; - const int INDEX_MASK_16 = (1 << 16) - 1; - const int INDEX_MASK_17 = (1 << 17) - 1; - const int INDEX_MASK_18 = (1 << 18) - 1; - const int INDEX_MASK_19 = (1 << 19) - 1; - const int INDEX_MASK_20 = (1 << 20) - 1; - const int INDEX_MASK_21 = (1 << 21) - 1; - const int INDEX_MASK_22 = (1 << 22) - 1; - const int INDEX_MASK_23 = (1 << 23) - 1; - const int INDEX_MASK_24 = (1 << 24) - 1; - - /** - * 'LAYOUT_*' constants define channel layouts recognized by - * the audio system. The order of the channels in the frame is assumed - * to be from the LSB to MSB for all the bits set to '1'. - */ - const int LAYOUT_MONO = CHANNEL_FRONT_LEFT; - const int LAYOUT_STEREO = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT; - const int LAYOUT_2POINT1 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_LOW_FREQUENCY; - const int LAYOUT_TRI = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER; - const int LAYOUT_TRI_BACK = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_BACK_CENTER; - const int LAYOUT_3POINT1 = - CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER | CHANNEL_LOW_FREQUENCY; - const int LAYOUT_2POINT0POINT2 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT - | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT; - const int LAYOUT_2POINT1POINT2 = LAYOUT_2POINT0POINT2 | CHANNEL_LOW_FREQUENCY; - const int LAYOUT_3POINT0POINT2 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER - | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT; - const int LAYOUT_3POINT1POINT2 = LAYOUT_3POINT0POINT2 | CHANNEL_LOW_FREQUENCY; - const int LAYOUT_QUAD = - CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT; - const int LAYOUT_QUAD_SIDE = - CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT; - const int LAYOUT_SURROUND = - CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER | CHANNEL_BACK_CENTER; - const int LAYOUT_PENTA = LAYOUT_QUAD | CHANNEL_FRONT_CENTER; - const int LAYOUT_5POINT1 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER - | CHANNEL_LOW_FREQUENCY | CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT; - const int LAYOUT_5POINT1_SIDE = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER - | CHANNEL_LOW_FREQUENCY | CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT; - const int LAYOUT_5POINT1POINT2 = - LAYOUT_5POINT1 | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT; - const int LAYOUT_5POINT1POINT4 = LAYOUT_5POINT1 | CHANNEL_TOP_FRONT_LEFT - | CHANNEL_TOP_FRONT_RIGHT | CHANNEL_TOP_BACK_LEFT | CHANNEL_TOP_BACK_RIGHT; - const int LAYOUT_6POINT1 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER - | CHANNEL_LOW_FREQUENCY | CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT | CHANNEL_BACK_CENTER; - const int LAYOUT_7POINT1 = LAYOUT_5POINT1 | CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT; - const int LAYOUT_7POINT1POINT2 = - LAYOUT_7POINT1 | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT; - const int LAYOUT_7POINT1POINT4 = LAYOUT_7POINT1 | CHANNEL_TOP_FRONT_LEFT - | CHANNEL_TOP_FRONT_RIGHT | CHANNEL_TOP_BACK_LEFT | CHANNEL_TOP_BACK_RIGHT; - const int LAYOUT_9POINT1POINT4 = - LAYOUT_7POINT1POINT4 | CHANNEL_FRONT_WIDE_LEFT | CHANNEL_FRONT_WIDE_RIGHT; - const int LAYOUT_9POINT1POINT6 = - LAYOUT_9POINT1POINT4 | CHANNEL_TOP_SIDE_LEFT | CHANNEL_TOP_SIDE_RIGHT; - const int LAYOUT_13POINT_360RA = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER - | CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT | CHANNEL_TOP_FRONT_LEFT - | CHANNEL_TOP_FRONT_RIGHT | CHANNEL_TOP_FRONT_CENTER | CHANNEL_TOP_BACK_LEFT - | CHANNEL_TOP_BACK_RIGHT | CHANNEL_BOTTOM_FRONT_LEFT | CHANNEL_BOTTOM_FRONT_RIGHT - | CHANNEL_BOTTOM_FRONT_CENTER; - const int LAYOUT_22POINT2 = LAYOUT_7POINT1POINT4 | CHANNEL_FRONT_LEFT_OF_CENTER - | CHANNEL_FRONT_RIGHT_OF_CENTER | CHANNEL_BACK_CENTER | CHANNEL_TOP_CENTER - | CHANNEL_TOP_FRONT_CENTER | CHANNEL_TOP_BACK_CENTER | CHANNEL_TOP_SIDE_LEFT - | CHANNEL_TOP_SIDE_RIGHT | CHANNEL_BOTTOM_FRONT_LEFT | CHANNEL_BOTTOM_FRONT_RIGHT - | CHANNEL_BOTTOM_FRONT_CENTER | CHANNEL_LOW_FREQUENCY_2; - const int LAYOUT_MONO_HAPTIC_A = LAYOUT_MONO | CHANNEL_HAPTIC_A; - const int LAYOUT_STEREO_HAPTIC_A = LAYOUT_STEREO | CHANNEL_HAPTIC_A; - const int LAYOUT_HAPTIC_AB = CHANNEL_HAPTIC_A | CHANNEL_HAPTIC_B; - const int LAYOUT_MONO_HAPTIC_AB = LAYOUT_MONO | LAYOUT_HAPTIC_AB; - const int LAYOUT_STEREO_HAPTIC_AB = LAYOUT_STEREO | LAYOUT_HAPTIC_AB; - const int LAYOUT_FRONT_BACK = CHANNEL_FRONT_CENTER | CHANNEL_BACK_CENTER; - - /** - * Expresses the convention when stereo audio samples are stored interleaved - * in an array. This should improve readability by allowing code to use - * symbolic indices instead of hard-coded [0] and [1]. - * - * For multi-channel beyond stereo, the platform convention is that channels - * are interleaved in order from least significant channel mask bit to most - * significant channel mask bit, with unused bits skipped. Any exceptions - * to this convention will be noted at the appropriate API. - */ - const int INTERLEAVE_LEFT = 0; - const int INTERLEAVE_RIGHT = 1; - - /** - * 'CHANNEL_*' constants are used to build 'LAYOUT_*' masks. Each constant - * must have exactly one bit set. The values do not match - * 'android.media.AudioFormat.CHANNEL_OUT_*' constants from the SDK - * for better efficiency in masks processing. - */ - const int CHANNEL_FRONT_LEFT = 1 << 0; - const int CHANNEL_FRONT_RIGHT = 1 << 1; - const int CHANNEL_FRONT_CENTER = 1 << 2; - const int CHANNEL_LOW_FREQUENCY = 1 << 3; - const int CHANNEL_BACK_LEFT = 1 << 4; - const int CHANNEL_BACK_RIGHT = 1 << 5; - const int CHANNEL_FRONT_LEFT_OF_CENTER = 1 << 6; - const int CHANNEL_FRONT_RIGHT_OF_CENTER = 1 << 7; - const int CHANNEL_BACK_CENTER = 1 << 8; - const int CHANNEL_SIDE_LEFT = 1 << 9; - const int CHANNEL_SIDE_RIGHT = 1 << 10; - const int CHANNEL_TOP_CENTER = 1 << 11; - const int CHANNEL_TOP_FRONT_LEFT = 1 << 12; - const int CHANNEL_TOP_FRONT_CENTER = 1 << 13; - const int CHANNEL_TOP_FRONT_RIGHT = 1 << 14; - const int CHANNEL_TOP_BACK_LEFT = 1 << 15; - const int CHANNEL_TOP_BACK_CENTER = 1 << 16; - const int CHANNEL_TOP_BACK_RIGHT = 1 << 17; - const int CHANNEL_TOP_SIDE_LEFT = 1 << 18; - const int CHANNEL_TOP_SIDE_RIGHT = 1 << 19; - const int CHANNEL_BOTTOM_FRONT_LEFT = 1 << 20; - const int CHANNEL_BOTTOM_FRONT_CENTER = 1 << 21; - const int CHANNEL_BOTTOM_FRONT_RIGHT = 1 << 22; - const int CHANNEL_LOW_FREQUENCY_2 = 1 << 23; - const int CHANNEL_FRONT_WIDE_LEFT = 1 << 24; - const int CHANNEL_FRONT_WIDE_RIGHT = 1 << 25; - /** - * Haptic channels are not part of multichannel standards, however they - * enhance user experience when playing so they are packed together with the - * channels of the program. To avoid collision with positional channels the - * values for haptic channels start at the MSB of an integer (after the sign - * bit) and move down to LSB. - */ - const int CHANNEL_HAPTIC_B = 1 << 29; - const int CHANNEL_HAPTIC_A = 1 << 30; - - /** - * 'VOICE_*' constants define layouts for voice audio. The order of the - * channels in the frame is assumed to be from the LSB to MSB for all the - * bits set to '1'. - */ - const int VOICE_UPLINK_MONO = CHANNEL_VOICE_UPLINK; - const int VOICE_DNLINK_MONO = CHANNEL_VOICE_DNLINK; - const int VOICE_CALL_MONO = CHANNEL_VOICE_UPLINK | CHANNEL_VOICE_DNLINK; - - /** - * 'CHANNEL_VOICE_*' constants are used to build 'VOICE_*' masks. Each - * constant must have exactly one bit set. Use the same values as - * 'android.media.AudioFormat.CHANNEL_IN_VOICE_*' constants from the SDK. - */ - const int CHANNEL_VOICE_UPLINK = 0x4000; - const int CHANNEL_VOICE_DNLINK = 0x8000; -} diff --git a/media/aidl/android/media/audio/common/AudioConfig.aidl b/media/aidl/android/media/audio/common/AudioConfig.aidl deleted file mode 100644 index ce2da4fb4b67..000000000000 --- a/media/aidl/android/media/audio/common/AudioConfig.aidl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioConfigBase; -import android.media.audio.common.AudioOffloadInfo; - -/** - * Commonly used audio stream configuration parameters. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioConfig { - AudioConfigBase base; - AudioOffloadInfo offloadInfo; - /** I/O buffer size in frames. */ - long frameCount; -} diff --git a/media/aidl/android/media/audio/common/AudioConfigBase.aidl b/media/aidl/android/media/audio/common/AudioConfigBase.aidl deleted file mode 100644 index 5210d0d97415..000000000000 --- a/media/aidl/android/media/audio/common/AudioConfigBase.aidl +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioChannelLayout; -import android.media.audio.common.AudioFormatDescription; - -/** - * Base configuration attributes applicable to any stream of audio. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioConfigBase { - int sampleRate; - AudioChannelLayout channelMask; - AudioFormatDescription format; -} diff --git a/media/aidl/android/media/audio/common/AudioContentType.aidl b/media/aidl/android/media/audio/common/AudioContentType.aidl deleted file mode 100644 index f42ae2fedc52..000000000000 --- a/media/aidl/android/media/audio/common/AudioContentType.aidl +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -/** - * Content type specifies "what" is playing. The content type expresses the - * general category of the content: speech, music, movie audio, etc. - * This enum corresponds to AudioAttributes.CONTENT_TYPE_* constants in the SDK. - * - * {@hide} - */ -@Backing(type="int") -@VintfStability -enum AudioContentType { - /** - * Content type value to use when the content type is unknown, or other than - * the ones defined. - */ - UNKNOWN = 0, - /** - * Content type value to use when the content type is speech. - */ - SPEECH = 1, - /** - * Content type value to use when the content type is music. - */ - MUSIC = 2, - /** - * Content type value to use when the content type is a soundtrack, - * typically accompanying a movie or TV program. - */ - MOVIE = 3, - /** - * Content type value to use when the content type is a sound used to - * accompany a user action, such as a beep or sound effect expressing a key - * click, or event, such as the type of a sound for a bonus being received - * in a game. These sounds are mostly synthesized or short Foley sounds. - */ - SONIFICATION = 4, - /** - * Content type value to use when the content type is ultrasound. - */ - ULTRASOUND = 1997, -} diff --git a/media/aidl/android/media/audio/common/AudioDevice.aidl b/media/aidl/android/media/audio/common/AudioDevice.aidl deleted file mode 100644 index f897eb2ac059..000000000000 --- a/media/aidl/android/media/audio/common/AudioDevice.aidl +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioDeviceAddress; -import android.media.audio.common.AudioDeviceDescription; - -/** - * Represents a concrete audio device by bundling together the device type and - * the device address. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioDevice { - AudioDeviceDescription type; - AudioDeviceAddress address; -} diff --git a/media/aidl/android/media/audio/common/AudioDeviceAddress.aidl b/media/aidl/android/media/audio/common/AudioDeviceAddress.aidl deleted file mode 100644 index ca48f7ebbe3a..000000000000 --- a/media/aidl/android/media/audio/common/AudioDeviceAddress.aidl +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * This structure defines various representations for the audio device - * address. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -union AudioDeviceAddress { - /** - * String uniquely identifying the device among other devices - * of the same type. Can be empty in case there is only one device - * of this type. - * - * Depending on the device type, its id may be assigned by the framework - * (one case used at the time of writing is REMOTE_SUBMIX), or assigned by - * the HAL service (the canonical examples are BUS and MIC devices). In any - * case, both framework and HAL must never attempt to parse the value of the - * 'id' field, regardless of whom has generated it. If the address must be - * parsed, one of the members below must be used instead of 'id'. - */ - @utf8InCpp String id; - /** - * IEEE 802 MAC address. Set for Bluetooth devices. The array must have - * exactly 6 elements. - */ - byte[] mac; - /** - * IPv4 Address. Set for IPv4 devices. The array must have exactly 4 - * elements. - */ - byte[] ipv4; - /** - * IPv6 Address. Set for IPv6 devices. The array must have exactly 8 - * elements. - */ - int[] ipv6; - /** - * PCI bus Address. Set for USB devices. The array must have exactly 2 - * elements, in the following order: the card id, and the device id. - */ - int[] alsa; -} diff --git a/media/aidl/android/media/audio/common/AudioDeviceDescription.aidl b/media/aidl/android/media/audio/common/AudioDeviceDescription.aidl deleted file mode 100644 index c21acca12ded..000000000000 --- a/media/aidl/android/media/audio/common/AudioDeviceDescription.aidl +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioDeviceType; - -/** - * Describes the kind of an audio device. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioDeviceDescription { - /** - * Type and directionality of the device. For bidirectional audio devices - * two descriptions need to be created, having the same value for - * the 'connection' field. - * - * See 'AudioDeviceType' for the list of supported values. - */ - AudioDeviceType type = AudioDeviceType.NONE; - /** - * Specifies the type of the connection of the device to the audio system. - * Usually it's some kind of a communication protocol, e.g. Bluetooth SCO or - * USB. There is a list of connection types recognized by the framework, - * defined using 'CONNECTION_' constants. Vendors can add their own - * connection types with "VX_<vendor>_" prefix, where the "vendor" part - * must consist of at least 3 letters or numbers. - * - * When the 'connection' field is left empty and 'type != NONE | DEFAULT', - * it is assumed that the device is permanently attached to the audio - * system, e.g. a built-in speaker or microphone. - * - * The 'connection' field must be left empty if 'type' is 'NONE' or - * '{IN|OUT}_DEFAULT'. - */ - @utf8InCpp String connection; - /** - * Analog connection, for example, via 3.5 mm analog jack, - * or a low-end (analog) desk dock. - */ - const @utf8InCpp String CONNECTION_ANALOG = "analog"; - /** - * Bluetooth A2DP connection. - */ - const @utf8InCpp String CONNECTION_BT_A2DP = "bt-a2dp"; - /** - * Bluetooth Low Energy (LE) connection. - */ - const @utf8InCpp String CONNECTION_BT_LE = "bt-le"; - /** - * Bluetooth SCO connection. - */ - const @utf8InCpp String CONNECTION_BT_SCO = "bt-sco"; - /** - * Bus connection. Mostly used in automotive scenarios. - */ - const @utf8InCpp String CONNECTION_BUS = "bus"; - /** - * HDMI connection. - */ - const @utf8InCpp String CONNECTION_HDMI = "hdmi"; - /** - * HDMI ARC connection. - */ - const @utf8InCpp String CONNECTION_HDMI_ARC = "hdmi-arc"; - /** - * HDMI eARC connection. - */ - const @utf8InCpp String CONNECTION_HDMI_EARC = "hdmi-earc"; - /** - * IP v4 connection. - */ - const @utf8InCpp String CONNECTION_IP_V4 = "ip-v4"; - /** - * SPDIF connection. - */ - const @utf8InCpp String CONNECTION_SPDIF = "spdif"; - /** - * A wireless connection when the actual protocol is unspecified. - */ - const @utf8InCpp String CONNECTION_WIRELESS = "wireless"; - /** - * USB connection. The Android device is the USB Host. - */ - const @utf8InCpp String CONNECTION_USB = "usb"; -} diff --git a/media/aidl/android/media/audio/common/AudioDeviceType.aidl b/media/aidl/android/media/audio/common/AudioDeviceType.aidl deleted file mode 100644 index 8e200de34e3d..000000000000 --- a/media/aidl/android/media/audio/common/AudioDeviceType.aidl +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * The type of the audio device. Only used as part of 'AudioDeviceDescription' - * structure. - * - * Types are divided into "input" and "output" categories. Audio devices that - * have both audio input and output, for example, headsets, are represented by a - * pair of input and output device types. - * - * The 'AudioDeviceType' intentionally binds together directionality and 'kind' - * of the device to avoid making them fully orthogonal. This is because not all - * types of devices are bidirectional, for example, speakers can only be used - * for output and microphones can only be used for input (at least, in the - * context of the audio framework). - * - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum AudioDeviceType { - /** - * "None" type is a "null" value. All fields of 'AudioDeviceDescription' - * must have default / empty / null values. - */ - NONE = 0, - /** - * The "default" device is used when the client does not have any - * preference for a particular device. - */ - IN_DEFAULT = 1, - /** - * A device implementing Android Open Accessory protocol. - * Note: AOAv2 audio support has been deprecated in Android 8.0. - */ - IN_ACCESSORY = 2, - /** - * Input from a DSP front-end proxy device. - */ - IN_AFE_PROXY = 3, - /** - * Used when only the connection protocol is known, e.g. a "HDMI Device." - */ - IN_DEVICE = 4, - /** - * A device providing reference input for echo canceller. - */ - IN_ECHO_REFERENCE = 5, - /** - * FM Tuner input. - */ - IN_FM_TUNER = 6, - /** - * A microphone of a headset. - */ - IN_HEADSET = 7, - /** - * Loopback input. - */ - IN_LOOPBACK = 8, - /** - * The main microphone (the frontal mic on mobile devices). - */ - IN_MICROPHONE = 9, - /** - * The secondary microphone (the back mic on mobile devices). - */ - IN_MICROPHONE_BACK = 10, - /** - * Input from a submix of other streams. - */ - IN_SUBMIX = 11, - /** - * Audio received via the telephone line. - */ - IN_TELEPHONY_RX = 12, - /** - * TV Tuner audio input. - */ - IN_TV_TUNER = 13, - /** - * Input from a phone / table dock. - */ - IN_DOCK = 14, - /** - * The "default" device is used when the client does not have any - * preference for a particular device. - */ - OUT_DEFAULT = 129, - /** - * A device implementing Android Open Accessory protocol. - * Note: AOAv2 audio support has been deprecated in Android 8.0. - */ - OUT_ACCESSORY = 130, - /** - * Output from a DSP front-end proxy device. - */ - OUT_AFE_PROXY = 131, - /** - * Car audio system. - */ - OUT_CARKIT = 132, - /** - * Used when only the connection protocol is known, e.g. a "HDMI Device." - */ - OUT_DEVICE = 133, - /** - * The echo canceller device. - */ - OUT_ECHO_CANCELLER = 134, - /** - * The FM Tuner device. - */ - OUT_FM = 135, - /** - * Headphones. - */ - OUT_HEADPHONE = 136, - /** - * Headphones of a headset. - */ - OUT_HEADSET = 137, - /** - * Hearing aid. - */ - OUT_HEARING_AID = 138, - /** - * Secondary line level output. - */ - OUT_LINE_AUX = 139, - /** - * The main speaker. - */ - OUT_SPEAKER = 140, - /** - * The speaker of a mobile device in the case when it is close to the ear. - */ - OUT_SPEAKER_EARPIECE = 141, - /** - * The main speaker with overload / overheating protection. - */ - OUT_SPEAKER_SAFE = 142, - /** - * Output into a submix. - */ - OUT_SUBMIX = 143, - /** - * Output into a telephone line. - */ - OUT_TELEPHONY_TX = 144, - /** - * Output into a speaker of a phone / table dock. - */ - OUT_DOCK = 145, - /** - * Output to a broadcast group. - */ - OUT_BROADCAST = 146, -} diff --git a/media/aidl/android/media/audio/common/AudioEncapsulationMetadataType.aidl b/media/aidl/android/media/audio/common/AudioEncapsulationMetadataType.aidl deleted file mode 100644 index e0b272c85b30..000000000000 --- a/media/aidl/android/media/audio/common/AudioEncapsulationMetadataType.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -/** - * Enumeration of metadata types permitted for use by encapsulation mode audio - * streams (see AudioEncapsulationMode). This type corresponds to - * AudioTrack.ENCAPSULATION_METADATA_TYPE_* constants in the SDK. - * - * {@hide} - */ -@Backing(type="int") -@VintfStability -enum AudioEncapsulationMetadataType { - /** Default value. */ - NONE = 0, - /** - * Encapsulation metadata type for framework tuner information. - */ - FRAMEWORK_TUNER = 1, - /** - * Encapsulation metadata type for DVB AD descriptor. - * - * This metadata is formatted per ETSI TS 101 154 Table E.1: AD_descriptor. - */ - DVB_AD_DESCRIPTOR = 2, -} diff --git a/media/aidl/android/media/audio/common/AudioEncapsulationMode.aidl b/media/aidl/android/media/audio/common/AudioEncapsulationMode.aidl deleted file mode 100644 index 6f8e9e10e106..000000000000 --- a/media/aidl/android/media/audio/common/AudioEncapsulationMode.aidl +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -/** - * Encapsulation mode used for sending audio compressed data. - * - * {@hide} - */ -@VintfStability -@Backing(type="byte") -enum AudioEncapsulationMode { - /** - * Used as default value in parcelables to indicate that a value was not - * set. Should never be considered a valid setting, except for backward - * compatibility scenarios. - */ - INVALID = -1, - /** No encapsulation mode for metadata. */ - NONE = 0, - /** Elementary stream payload with metadata. */ - ELEMENTARY_STREAM = 1, - /** Handle-based payload with metadata. */ - HANDLE = 2, -} diff --git a/media/aidl/android/media/audio/common/AudioEncapsulationType.aidl b/media/aidl/android/media/audio/common/AudioEncapsulationType.aidl deleted file mode 100644 index 9e80bd675760..000000000000 --- a/media/aidl/android/media/audio/common/AudioEncapsulationType.aidl +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * Audio encapsulation type is used to describe if the audio data should be sent - * with a particular encapsulation type or not. This enum corresponds to - * AudioProfile.AUDIO_ENCAPSULATION_* constants in the SDK. - * - * {@hide} - */ -@Backing(type="int") -@VintfStability -enum AudioEncapsulationType { - /** No encapsulation type is specified. */ - NONE = 0, - /** Encapsulation used the format defined in the standard IEC 61937. */ - IEC61937 = 1, -} diff --git a/media/aidl/android/media/audio/common/AudioFlag.aidl b/media/aidl/android/media/audio/common/AudioFlag.aidl deleted file mode 100644 index b9d493e620ab..000000000000 --- a/media/aidl/android/media/audio/common/AudioFlag.aidl +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * Defines the audio flags that are used in AudioAttributes - */ -@Backing(type="int") -@VintfStability -enum AudioFlag { - NONE = 0x0, - /** - * Flag defining a behavior where the audibility of the sound will be - * ensured by the system. To ensure sound audibility, the system only uses - * built-in speakers or wired headphones and specifically excludes wireless - * audio devices. Note this flag should only be used for sounds subject to - * regulatory behaviors in some countries, such as for camera shutter sound, - * and not for routing behaviors. - */ - AUDIBILITY_ENFORCED = 0x1 << 0, - /** - * Skipping 0x1 << 1. This was previously used for SECURE flag, but because - * the security feature was never implemented using this flag, and the flag - * was never made public, this value may be used for another flag. - */ - /** - * Flag to enable when the stream is associated with SCO usage. - * Internal use only for dealing with legacy STREAM_BLUETOOTH_SCO - */ - SCO = 0x1 << 2, - /** - * Flag defining a behavior where the system ensures that the playback of - * the sound will be compatible with its use as a broadcast for surrounding - * people and/or devices. Ensures audibility with no or minimal - * post-processing applied. - */ - BEACON = 0x1 << 3, - /** - * Flag requesting the use of an output stream supporting hardware A/V - * synchronization. - */ - HW_AV_SYNC = 0x1 << 4, - /** - * Flag requesting capture from the source used for hardware hotword - * detection. To be used with capture preset MediaRecorder.AudioSource - * HOTWORD or MediaRecorder.AudioSource.VOICE_RECOGNITION. - */ - HW_HOTWORD = 0x1 << 5, - /** - * Flag requesting audible playback even under limited interruptions. - */ - BYPASS_INTERRUPTION_POLICY = 0x1 << 6, - /** - * Flag requesting audible playback even when the underlying stream is muted - */ - BYPASS_MUTE = 0x1 << 7, - /** - * Flag requesting a low latency path when creating an AudioTrack. - * When using this flag, the sample rate must match the native sample rate - * of the device. Effects processing is also unavailable. - */ - LOW_LATENCY = 0x1 << 8, - /** - * Flag requesting a deep buffer path when creating an AudioTrack. - * - * A deep buffer path, if available, may consume less power and is - * suitable for media playback where latency is not a concern. - */ - DEEP_BUFFER = 0x1 << 9, - /** - * Flag specifying that the audio shall not be captured by third-party apps - * with a MediaProjection. - */ - NO_MEDIA_PROJECTION = 0x1 << 10, - /** - * Flag indicating force muting haptic channels. - */ - MUTE_HAPTIC = 0x1 << 11, - /** - * Flag specifying that the audio shall not be captured by any apps, not - * even system apps. - */ - NO_SYSTEM_CAPTURE = 0x1 << 12, - /** - * Flag requesting private audio capture. - */ - CAPTURE_PRIVATE = 0x1 << 13, - /** - * Flag indicating the audio content has been processed to provide a virtual - * multichannel audio experience. - */ - CONTENT_SPATIALIZED = 0x1 << 14, - /** - * Flag indicating the audio content is never to be spatialized. - */ - NEVER_SPATIALIZE = 0x1 << 15, - /** - * Flag indicating the audio is part of a call redirection. - * Valid for playback and capture. - */ - CALL_REDIRECTION = 0x1 << 16, -}
\ No newline at end of file diff --git a/media/aidl/android/media/audio/common/AudioFormatDescription.aidl b/media/aidl/android/media/audio/common/AudioFormatDescription.aidl deleted file mode 100644 index 57f2bdbf927e..000000000000 --- a/media/aidl/android/media/audio/common/AudioFormatDescription.aidl +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioFormatType; -import android.media.audio.common.PcmType; - -/** - * An extensible type for specifying audio formats. All formats are largely - * divided into two classes: PCM and non-PCM (bitstreams). Bitstreams can - * be encapsulated into PCM streams. - * - * The type defined in a way to make each format uniquely identifiable, so - * that if the framework and the HAL construct a value for the same type - * (e.g. PCM 16 bit), they will produce identical parcelables which will have - * identical hashes. This makes possible deduplicating type descriptions - * by the framework when they are received from different HAL modules without - * relying on having some centralized registry of enumeration values. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioFormatDescription { - /** - * The type of the audio format. See the 'AudioFormatType' for the - * list of supported values. - */ - AudioFormatType type = AudioFormatType.DEFAULT; - /** - * The type of the PCM stream or the transport stream for PCM - * encapsulations. See 'PcmType' for the list of supported values. - */ - PcmType pcm = PcmType.DEFAULT; - /** - * Optional encoding specification. Must be left empty when: - * - * - 'type == DEFAULT && pcm == DEFAULT' -- that means "default" type; - * - 'type == PCM' -- that means a regular PCM stream (not an encapsulation - * of an encoded bitstream). - * - * For PCM encapsulations of encoded bitstreams (e.g. an encapsulation - * according to IEC-61937 standard), the value of the 'pcm' field must - * be set accordingly, as an example, PCM_INT_16_BIT must be used for - * IEC-61937. Note that 'type == NON_PCM' in this case. - * - * Encoding names mostly follow IANA standards for media types (MIME), and - * frameworks/av/media/libstagefright/foundation/MediaDefs.cpp with the - * latter having priority. Since there are still many audio types not found - * in any of these lists, the following rules are applied: - * - * - If there is a direct MIME type for the encoding, the MIME type name - * is used as is, e.g. "audio/eac3" for the EAC-3 format. - * - If the encoding is a "subformat" of a MIME-registered format, - * the latter is augmented with a suffix, e.g. "audio/eac3-joc" for the - * JOC extension of EAC-3. - * - If it's a proprietary format, a "vnd." prefix is added, similar to - * IANA rules, e.g. "audio/vnd.dolby.truehd". - * - Otherwise, "x-" prefix is added, e.g. "audio/x-iec61937". - * - All MIME types not found in the IANA formats list have an associated - * comment. - */ - @utf8InCpp String encoding; -} diff --git a/media/aidl/android/media/audio/common/AudioFormatType.aidl b/media/aidl/android/media/audio/common/AudioFormatType.aidl deleted file mode 100644 index ea78c7a302db..000000000000 --- a/media/aidl/android/media/audio/common/AudioFormatType.aidl +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * The type of the audio format. Only used as part of 'AudioFormatDescription' - * structure. - * - * {@hide} - */ -@VintfStability -@Backing(type="byte") -enum AudioFormatType { - /** - * "Default" type is used when the client does not care about the actual - * format. All fields of 'AudioFormatDescription' must have default / empty - * / null values. - */ - DEFAULT = 0, - /** - * When the 'encoding' field of 'AudioFormatDescription' is not empty, it - * specifies the codec used for bitstream (non-PCM) data. It is also used - * in the case when the bitstream data is encapsulated into a PCM stream, - * see the documentation for 'AudioFormatDescription'. - */ - NON_PCM = DEFAULT, - /** - * PCM type. The 'pcm' field of 'AudioFormatDescription' is used to specify - * the actual sample size and representation. - */ - PCM = 1, - /** - * Value reserved for system use only. HALs must never return this value to - * the system or accept it from the system. - */ - SYS_RESERVED_INVALID = -1, -} diff --git a/media/aidl/android/media/audio/common/AudioGain.aidl b/media/aidl/android/media/audio/common/AudioGain.aidl deleted file mode 100644 index dbfcd8c5ff88..000000000000 --- a/media/aidl/android/media/audio/common/AudioGain.aidl +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioChannelLayout; - -/** - * This structure represents a gain stage. A gain stage is always attached - * to an AudioPort. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioGain { - /** Bitmask, indexed by AudioGainMode. */ - int mode; - /** For AudioGainMode.CHANNELS, specifies controlled channels. */ - AudioChannelLayout channelMask; - /** Minimum gain value in millibels. */ - int minValue; - /** Maximum gain value in millibels. */ - int maxValue; - /** Default gain value in millibels. */ - int defaultValue; - /** Gain step in millibels. */ - int stepValue; - /** Minimum ramp duration in milliseconds. */ - int minRampMs; - /** Maximum ramp duration in milliseconds. */ - int maxRampMs; - /** Indicates whether it is allowed to use this stage for volume control. */ - boolean useForVolume; -} diff --git a/media/aidl/android/media/audio/common/AudioGainConfig.aidl b/media/aidl/android/media/audio/common/AudioGainConfig.aidl deleted file mode 100644 index a24711171ea2..000000000000 --- a/media/aidl/android/media/audio/common/AudioGainConfig.aidl +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioChannelLayout; - -/** - * The gain configuration structure is used to get or set the gain values of a - * given AudioPort. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioGainConfig { - /** Index of the corresponding AudioGain in AudioPort.gains. */ - int index; - /** Bitmask, indexed by AudioGainMode. */ - int mode; - /** For AudioGainMode.CHANNELS, specifies controlled channels. */ - AudioChannelLayout channelMask; - /** - * Gain values in millibels. For each channel ordered from LSb to MSb in - * channel mask. The number of values is 1 in joint mode, otherwise equals - * the number of bits implied by channelMask. - */ - int[] values; - /** Ramp duration in milliseconds. */ - int rampDurationMs; -} diff --git a/media/aidl/android/media/audio/common/AudioGainMode.aidl b/media/aidl/android/media/audio/common/AudioGainMode.aidl deleted file mode 100644 index e46752e85414..000000000000 --- a/media/aidl/android/media/audio/common/AudioGainMode.aidl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * Type of gain control exposed by an audio port. The values are - * indexes of bits in a bitmask. - * - * {@hide} - */ -@VintfStability -@Backing(type="byte") -enum AudioGainMode { - /** Gain is the same for all channels. */ - JOINT = 0, - /** The gain is set individually for each channel. */ - CHANNELS = 1, - /** Ramping is applied. */ - RAMP = 2, -} diff --git a/media/aidl/android/media/audio/common/AudioInputFlags.aidl b/media/aidl/android/media/audio/common/AudioInputFlags.aidl deleted file mode 100644 index 83a5d9dc98e4..000000000000 --- a/media/aidl/android/media/audio/common/AudioInputFlags.aidl +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * Specifies options applicable to audio input. These can be functional - * requests or performance requests. These flags apply both to audio ports and - * audio streams. Flags specified for an audio stream are usually used to find - * the best matching audio port for it. - * - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum AudioInputFlags { - /** - * Input is optimized for decreasing audio latency. - */ - FAST = 0, - /** - * Input is for capturing "hotword" audio commands. - */ - HW_HOTWORD = 1, - /** - * Input stream should only have minimal signal processing applied. - */ - RAW = 2, - /** - * Input stream needs to be synchronized with an output stream. - */ - SYNC = 3, - /** - * Input uses MMAP no IRQ mode--direct memory mapping with the hardware. - */ - MMAP_NOIRQ = 4, - /** - * Input is used for receiving VoIP audio. - */ - VOIP_TX = 5, - /** - * Input stream contains AV synchronization markers embedded. - */ - HW_AV_SYNC = 6, - /** - * Input contains an encoded audio stream. - */ - DIRECT = 7, - /** - * Input is for capturing "ultrasound" audio commands. - */ - ULTRASOUND = 8, -} diff --git a/media/aidl/android/media/audio/common/AudioIoFlags.aidl b/media/aidl/android/media/audio/common/AudioIoFlags.aidl deleted file mode 100644 index f978fb6c32b0..000000000000 --- a/media/aidl/android/media/audio/common/AudioIoFlags.aidl +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * Stores a bitmask of input or output flags. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -union AudioIoFlags { - /** Bitmask indexed by AudioInputFlags. */ - int input; - /** Bitmask indexed by AudioOutputFlags. */ - int output; -} diff --git a/media/aidl/android/media/audio/common/AudioMMapPolicy.aidl b/media/aidl/android/media/audio/common/AudioMMapPolicy.aidl deleted file mode 100644 index e7e8710da95b..000000000000 --- a/media/aidl/android/media/audio/common/AudioMMapPolicy.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -/** - * Audio MMAP policy describe how the aaudio MMAP feature is used. - * {@hide} - */ -@Backing(type="int") -@VintfStability -enum AudioMMapPolicy { - /** - * The policy is unspecified. - */ - UNSPECIFIED = 0, - /** - * The MMAP feature is disabled and never used. - */ - NEVER = 1, - /** - * If MMAP feature works then uses it. Otherwise, fall back to something else. - */ - AUTO = 2, - /** - * The MMAP feature must be used. If not available then fail. - */ - ALWAYS = 3, -} diff --git a/media/aidl/android/media/audio/common/AudioMMapPolicyInfo.aidl b/media/aidl/android/media/audio/common/AudioMMapPolicyInfo.aidl deleted file mode 100644 index e8f948d84d60..000000000000 --- a/media/aidl/android/media/audio/common/AudioMMapPolicyInfo.aidl +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -import android.media.audio.common.AudioDevice; -import android.media.audio.common.AudioMMapPolicy; - -/** - * Audio MMAP policy info describes how an aaudio MMAP feature can be - * used on a particular device. - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioMMapPolicyInfo { - /** - * The audio device. - */ - AudioDevice device; - /** - * The aaudio mmap policy for the audio device. - */ - AudioMMapPolicy mmapPolicy = AudioMMapPolicy.UNSPECIFIED; -} diff --git a/media/aidl/android/media/audio/common/AudioMMapPolicyType.aidl b/media/aidl/android/media/audio/common/AudioMMapPolicyType.aidl deleted file mode 100644 index 9a15b56d7957..000000000000 --- a/media/aidl/android/media/audio/common/AudioMMapPolicyType.aidl +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -/** - * The aaudio MMAP policy type. - * {@hide} - */ -@Backing(type="int") -@VintfStability -enum AudioMMapPolicyType { - /** - * Default aaudio mmap policy. It is used to query whether the - * aaudio MMAP could be used or not. - */ - DEFAULT = 1, - /** - * Exclusive aaudio mmap policy. It is used to query whether the - * aaudio MMAP could be used in exclusive mode or not. - */ - EXCLUSIVE = 2, -} diff --git a/media/aidl/android/media/audio/common/AudioMode.aidl b/media/aidl/android/media/audio/common/AudioMode.aidl deleted file mode 100644 index 701bcb60bb27..000000000000 --- a/media/aidl/android/media/audio/common/AudioMode.aidl +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -/** - * Major modes for a mobile device. The current mode setting affects audio - * routing. - * - * {@hide} - */ -@Backing(type="int") -@VintfStability -enum AudioMode { - /** - * Used as default value in parcelables to indicate that a value was not - * set. Should never be considered a valid setting, except for backward - * compatibility scenarios. - */ - SYS_RESERVED_INVALID = -2, - /** - * Value reserved for system use only. HALs must never return this value to - * the system or accept it from the system. - */ - SYS_RESERVED_CURRENT = -1, - /** Normal mode (no call in progress). */ - NORMAL = 0, - /** Mobile device is receiving an incoming connection request. */ - RINGTONE = 1, - /** Calls handled by the telephony stack (PSTN). */ - IN_CALL = 2, - /** Calls handled by apps (VoIP). */ - IN_COMMUNICATION = 3, - /** Call screening in progress. */ - CALL_SCREEN = 4, - /** PSTN Call redirection in progress. */ - SYS_RESERVED_CALL_REDIRECT = 5, - /** VoIP Call redirection in progress. */ - SYS_RESERVED_COMMUNICATION_REDIRECT = 6, -} diff --git a/media/aidl/android/media/audio/common/AudioOffloadInfo.aidl b/media/aidl/android/media/audio/common/AudioOffloadInfo.aidl deleted file mode 100644 index d8da065b73d7..000000000000 --- a/media/aidl/android/media/audio/common/AudioOffloadInfo.aidl +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioConfigBase; -import android.media.audio.common.AudioEncapsulationMode; -import android.media.audio.common.AudioStreamType; -import android.media.audio.common.AudioUsage; - -/** - * Additional information about the stream passed to hardware decoders. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioOffloadInfo { - /** Base audio configuration. */ - AudioConfigBase base; - /** Stream type. Intended for use by the system only. */ - AudioStreamType streamType = AudioStreamType.INVALID; - /** Bit rate in bits per second. */ - int bitRatePerSecond; - /** Duration in microseconds, -1 if unknown. */ - long durationUs; - /** True if the stream is tied to a video stream. */ - boolean hasVideo; - /** True if streaming, false if local playback. */ - boolean isStreaming; - /** Sample bit width. */ - int bitWidth = 16; - /** Offload fragment size. */ - int offloadBufferSize; - /** See the documentation of AudioUsage. */ - AudioUsage usage = AudioUsage.INVALID; - /** See the documentation of AudioEncapsulationMode. */ - AudioEncapsulationMode encapsulationMode = AudioEncapsulationMode.INVALID; - /** Content id from tuner HAL (0 if none). */ - int contentId; - /** Sync id from tuner HAL (0 if none). */ - int syncId; -} diff --git a/media/aidl/android/media/audio/common/AudioOutputFlags.aidl b/media/aidl/android/media/audio/common/AudioOutputFlags.aidl deleted file mode 100644 index 2556b68809cc..000000000000 --- a/media/aidl/android/media/audio/common/AudioOutputFlags.aidl +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * Specifies options applicable to audio output. These can be functional - * requests or performance requests. These flags apply both to audio ports and - * audio streams. Flags specified for an audio stream are usually used to find - * the best matching audio port for it. - * - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum AudioOutputFlags{ - /** - * Output must not be altered by the framework, it bypasses software mixers. - */ - DIRECT = 0, - /** - * When used with audio ports, indicates the "main" (primary) port. This - * port is opened by default and receives routing, audio mode and volume - * controls related to voice calls. - */ - PRIMARY = 1, - /** - * Output is optimized for decreasing audio latency. - */ - FAST = 2, - /** - * Output is optimized for having the low power consumption. - */ - DEEP_BUFFER = 3, - /** - * Output is compressed audio format, intended for hardware decoding. - */ - COMPRESS_OFFLOAD = 4, - /** - * Write operations must return as fast as possible instead of - * being blocked until all provided data has been consumed. - */ - NON_BLOCKING = 5, - /** - * Output stream contains AV synchronization markers embedded. - */ - HW_AV_SYNC = 6, - /** - * Used to support ultrasonic communication with beacons. - * Note: "TTS" here means "Transmitted Through Speaker", - * not "Text-to-Speech". - */ - TTS = 7, - /** - * Output stream should only have minimal signal processing applied. - */ - RAW = 8, - /** - * Output stream needs to be synchronized with an input stream. - */ - SYNC = 9, - /** - * Output stream is encoded according to IEC958. - */ - IEC958_NONAUDIO = 10, - /** - * Output must not be altered by the framework and hardware. - */ - DIRECT_PCM = 11, - /** - * Output uses MMAP no IRQ mode--direct memory mapping with the hardware. - */ - MMAP_NOIRQ = 12, - /** - * Output is used for transmitting VoIP audio. - */ - VOIP_RX = 13, - /** - * Output is used for music playback during telephony calls. - */ - INCALL_MUSIC = 14, - /** - * The rendered must ignore any empty blocks between compressed audio - * tracks. - */ - GAPLESS_OFFLOAD = 15, - /** - * Output is used for spatial audio. - */ - SPATIALIZER = 16, - /** - * Output is used for transmitting ultrasound audio. - */ - ULTRASOUND = 17, -} diff --git a/media/aidl/android/media/audio/common/AudioPort.aidl b/media/aidl/android/media/audio/common/AudioPort.aidl deleted file mode 100644 index d32b840ebfe8..000000000000 --- a/media/aidl/android/media/audio/common/AudioPort.aidl +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioGain; -import android.media.audio.common.AudioIoFlags; -import android.media.audio.common.AudioPortExt; -import android.media.audio.common.AudioProfile; -import android.media.audio.common.ExtraAudioDescriptor; - -/** - * Audio port structure describes the capabilities of an audio port. - * This is a "blueprint" which contains all the possible configurations - * that are supported by the port. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioPort { - /** - * Unique identifier of the port within a HAL module. - */ - int id; - /** - * Human-readable name describing the function of the port. - * E.g. "telephony_tx" or "fm_tuner". - */ - @utf8InCpp String name; - /** - * AudioProfiles supported by this port: format, rates, channels. - */ - AudioProfile[] profiles; - /** - * I/O feature flags. - */ - AudioIoFlags flags; - /** - * ExtraAudioDescriptors supported by this port. Used for formats not - * recognized by the platform. The audio capability is described by a - * hardware descriptor. - */ - ExtraAudioDescriptor[] extraAudioDescriptors; - /** Gain controllers. */ - AudioGain[] gains; - /** Extra parameters depending on the port role. */ - AudioPortExt ext; -} diff --git a/media/aidl/android/media/audio/common/AudioPortConfig.aidl b/media/aidl/android/media/audio/common/AudioPortConfig.aidl deleted file mode 100644 index 2702b147e7f4..000000000000 --- a/media/aidl/android/media/audio/common/AudioPortConfig.aidl +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioChannelLayout; -import android.media.audio.common.AudioFormatDescription; -import android.media.audio.common.AudioGainConfig; -import android.media.audio.common.AudioIoFlags; -import android.media.audio.common.AudioPortExt; -import android.media.audio.common.Int; - -/** - * Audio port configuration structure specifies a particular configuration - * of an audio port. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioPortConfig { - /** - * Port config unique ID. This field is set to a non-zero value when it is - * needed to select a previously reported port config and apply new - * configuration to it. - */ - int id; - /** - * The ID of the AudioPort instance this configuration applies to. - */ - int portId; - /** Sample rate in Hz. Can be left unspecified. */ - @nullable Int sampleRate; - /** Channel mask. Can be left unspecified. */ - @nullable AudioChannelLayout channelMask; - /** Format. Can be left unspecified. */ - @nullable AudioFormatDescription format; - /** Gain to apply. Can be left unspecified. */ - @nullable AudioGainConfig gain; - /** I/O feature flags. Can be left unspecified. */ - @nullable AudioIoFlags flags; - /** Extra parameters depending on the port role. */ - AudioPortExt ext; -} diff --git a/media/aidl/android/media/audio/common/AudioPortDeviceExt.aidl b/media/aidl/android/media/audio/common/AudioPortDeviceExt.aidl deleted file mode 100644 index 63136d7a3423..000000000000 --- a/media/aidl/android/media/audio/common/AudioPortDeviceExt.aidl +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioDevice; -import android.media.audio.common.AudioFormatDescription; - -/** - * Extra parameters which are specified when the audio port is in the device role. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioPortDeviceExt { - /** Audio device specification. */ - AudioDevice device; - /** Bitmask indexed by 'FLAG_INDEX_' constants. */ - int flags; - /** - * List of supported encoded formats. Specified for ports that perform - * hardware-accelerated decoding or transcoding, or connected to external - * hardware. - */ - AudioFormatDescription[] encodedFormats; - - /** - * A default device port is fallback used when the preference for the device - * to use has not been specified (AudioDeviceType.type == {IN|OUT}_DEFAULT), - * or the specified device does not satisfy routing criteria based on audio - * stream attributes and use cases. The device port for which the ID is - * returned must be associated with a permanently attached device - * (AudioDeviceDescription.connection == ''). There can be no more than one - * default device port in a HAL module in each I/O direction. - */ - const int FLAG_INDEX_DEFAULT_DEVICE = 0; -} diff --git a/media/aidl/android/media/audio/common/AudioPortExt.aidl b/media/aidl/android/media/audio/common/AudioPortExt.aidl deleted file mode 100644 index eadc0ab7c7c5..000000000000 --- a/media/aidl/android/media/audio/common/AudioPortExt.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioPortDeviceExt; -import android.media.audio.common.AudioPortMixExt; - -/** - * Extra parameters of an AudioPort/AudioPortConfig that depend on - * the actual port role. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -union AudioPortExt { - /** Represents an empty union. Value is ignored. */ - boolean unspecified; - /** Information specific to device ports. */ - AudioPortDeviceExt device; - /** Information specific to mix ports. */ - AudioPortMixExt mix; - /** - * NOT USED. Framework audio session identifier. - * Use android.media.AudioPortExtSys.session on the system side. - */ - int session; -} diff --git a/media/aidl/android/media/audio/common/AudioPortMixExt.aidl b/media/aidl/android/media/audio/common/AudioPortMixExt.aidl deleted file mode 100644 index eb117eca52bd..000000000000 --- a/media/aidl/android/media/audio/common/AudioPortMixExt.aidl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioPortMixExtUseCase; - -/** - * Extra parameters which are specified when the audio port is in the mix role. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioPortMixExt { - /** I/O handle of the input/output stream. */ - int handle; - /** Parameters specific to the mix use case. */ - AudioPortMixExtUseCase usecase; - /** - * Maximum number of input or output streams that can be simultaneously - * opened for this port. '0' means 'unlimited'. - */ - int maxOpenStreamCount; - /** - * Maximum number of input or output streams that can be simultaneously - * active for this port. '0' means 'all opened streams'. - */ - int maxActiveStreamCount; - /** Mute duration while changing device, when used for output. */ - int recommendedMuteDurationMs; -} diff --git a/media/aidl/android/media/audio/common/AudioPortMixExtUseCase.aidl b/media/aidl/android/media/audio/common/AudioPortMixExtUseCase.aidl deleted file mode 100644 index af9ada0c90c2..000000000000 --- a/media/aidl/android/media/audio/common/AudioPortMixExtUseCase.aidl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioSource; -import android.media.audio.common.AudioStreamType; - -/** - * Provides additional information depending on the type of the audio port - * when it is used in the mix role. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -union AudioPortMixExtUseCase { - /** - * This is the default case for this union. The value is ignored. - */ - boolean unspecified; - /** - * This case applies when the audio port is a source. - * The value specifies the destination stream type. - */ - AudioStreamType stream; - /** - * This case applies when the audio port is a sink. - * The value specifies the source. - */ - AudioSource source; -} diff --git a/media/aidl/android/media/audio/common/AudioProfile.aidl b/media/aidl/android/media/audio/common/AudioProfile.aidl deleted file mode 100644 index 2124b0d5f1f4..000000000000 --- a/media/aidl/android/media/audio/common/AudioProfile.aidl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioChannelLayout; -import android.media.audio.common.AudioEncapsulationType; -import android.media.audio.common.AudioFormatDescription; - -/** - * AudioProfile describes a set of configurations supported for a certain - * audio format. A profile can be either "static" which means all the - * configurations are predefined, or "dynamic" which means configurations - * are queried at run time. Dynamic profiles generally used with detachable - * devices, e.g. HDMI or USB devices. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioProfile { - /** Name is commonly used with static profiles. Can be empty. */ - @utf8InCpp String name; - /** If the format is set to 'DEFAULT', this indicates a dynamic profile. */ - AudioFormatDescription format; - /** Can be empty if channel masks are "dynamic". */ - AudioChannelLayout[] channelMasks; - /** Can be empty if sample rates are "dynamic". */ - int[] sampleRates; - /** For encoded audio formats, an encapsulation can be specified. */ - AudioEncapsulationType encapsulationType = AudioEncapsulationType.NONE; -} diff --git a/media/aidl/android/media/audio/common/AudioSource.aidl b/media/aidl/android/media/audio/common/AudioSource.aidl deleted file mode 100644 index 77799946c04a..000000000000 --- a/media/aidl/android/media/audio/common/AudioSource.aidl +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -/** - * Defines the audio source. An audio source defines both a default physical - * source of audio signal, and a recording configuration. This enum corresponds - * to MediaRecorder.AudioSource.* constants in the SDK. - * - * {@hide} - */ -@Backing(type="int") -@VintfStability -enum AudioSource { - /** - * Used as default value in parcelables to indicate that a value was not - * set. Should never be considered a valid setting, except for backward - * compatibility scenarios. - */ - SYS_RESERVED_INVALID = -1, - /** Default audio source. */ - DEFAULT = 0, - /** Microphone audio source. */ - MIC = 1, - /** Voice call uplink (Tx) audio source. */ - VOICE_UPLINK = 2, - /** Voice call downlink (Rx) audio source. */ - VOICE_DOWNLINK = 3, - /** Voice call uplink + downlink (duplex) audio source. */ - VOICE_CALL = 4, - /** - * Microphone audio source tuned for video recording, with the same - * orientation as the camera if available. - */ - CAMCORDER = 5, - /** Microphone audio source tuned for voice recognition. */ - VOICE_RECOGNITION = 6, - /** - * Microphone audio source tuned for voice communications such as VoIP. It - * will for instance take advantage of echo cancellation or automatic gain - * control if available. - */ - VOICE_COMMUNICATION = 7, - /** - * Audio source for a submix of audio streams to be presented remotely. An - * application can use this audio source to capture a mix of audio streams - * that should be transmitted to a remote receiver such as a Wifi display. - * While recording is active, these audio streams are redirected to the - * remote submix instead of being played on the device speaker or headset. - */ - REMOTE_SUBMIX = 8, - /** - * Microphone audio source tuned for unprocessed (raw) sound if available, - * behaves like DEFAULT otherwise. - */ - UNPROCESSED = 9, - /** - * Source for capturing audio meant to be processed in real time and played - * back for live performance (e.g karaoke). The capture path will minimize - * latency and coupling with playback path. - */ - VOICE_PERFORMANCE = 10, - /** - * Source for an echo canceller to capture the reference signal to be - * canceled. The echo reference signal will be captured as close as - * possible to the DAC in order to include all post processing applied to - * the playback path. - */ - ECHO_REFERENCE = 1997, - /** Audio source for capturing broadcast FM tuner output. */ - FM_TUNER = 1998, - /** - * A low-priority, preemptible audio source for for background software - * hotword detection. Same tuning as VOICE_RECOGNITION. - */ - HOTWORD = 1999, - /** Microphone audio source for ultrasound sound if available, - * behaves like DEFAULT otherwise. - */ - ULTRASOUND = 2000, -} diff --git a/media/aidl/android/media/audio/common/AudioStandard.aidl b/media/aidl/android/media/audio/common/AudioStandard.aidl deleted file mode 100644 index 0529e91c78d2..000000000000 --- a/media/aidl/android/media/audio/common/AudioStandard.aidl +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -/** - * The audio standard that describe audio playback/capture capabilites. - * - * {@hide} - */ -@Backing(type="int") -@VintfStability -enum AudioStandard { - NONE = 0, - EDID = 1, -} diff --git a/media/aidl/android/media/audio/common/AudioStreamType.aidl b/media/aidl/android/media/audio/common/AudioStreamType.aidl deleted file mode 100644 index e7f2961f7592..000000000000 --- a/media/aidl/android/media/audio/common/AudioStreamType.aidl +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * Audio stream type describing the intended use case of a stream. Streams - * must be used in the context of volume management only. For playback type - * identification purposes, AudioContentType and AudioUsage must be used, - * similar to how it's done in the SDK. - * - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum AudioStreamType { - /** - * Used as default value in parcelables to indicate that a value was not - * set. Should never be considered a valid setting, except for backward - * compatibility scenarios. - */ - INVALID = -2, - /** - * Indicates that the operation is applied to the "default" stream - * in this context, e.g. MUSIC in normal device state, or RING if the - * phone is ringing. - * - * Value reserved for system use only. HALs must never return this value to - * the system or accept it from the system. - */ - SYS_RESERVED_DEFAULT = -1, - /** Used to identify the volume of audio streams for phone calls. */ - VOICE_CALL = 0, - /** Used to identify the volume of audio streams for system sounds. */ - SYSTEM = 1, - /** - * Used to identify the volume of audio streams for the phone ring and - * message alerts. - */ - RING = 2, - /** Used to identify the volume of audio streams for music playback. */ - MUSIC = 3, - /** Used to identify the volume of audio streams for alarms. */ - ALARM = 4, - /** Used to identify the volume of audio streams for notifications. */ - NOTIFICATION = 5, - /** - * Used to identify the volume of audio streams for phone calls when - * connected via Bluetooth. - */ - BLUETOOTH_SCO = 6, - /** - * Used to identify the volume of audio streams for enforced system sounds - * in certain countries (e.g camera in Japan). - */ - ENFORCED_AUDIBLE = 7, - /** Used to identify the volume of audio streams for DTMF tones. */ - DTMF = 8, - /** - * Used to identify the volume of audio streams exclusively transmitted - * through the speaker (TTS) of the device. - */ - TTS = 9, - /** - * Used to identify the volume of audio streams for accessibility prompts. - */ - ACCESSIBILITY = 10, - /** - * Used to identify the volume of audio streams for virtual assistant. - */ - ASSISTANT = 11, - /** - * Used for dynamic policy output mixes. Only used by the audio policy. - * - * Value reserved for system use only. HALs must never return this value to - * the system or accept it from the system. - */ - SYS_RESERVED_REROUTING = 12, - /** - * Used for audio flinger tracks volume. Only used by the audioflinger. - * - * Value reserved for system use only. HALs must never return this value to - * the system or accept it from the system. - */ - SYS_RESERVED_PATCH = 13, - /** Used for the stream corresponding to the call assistant usage. */ - CALL_ASSISTANT = 14, -} diff --git a/media/aidl/android/media/audio/common/AudioUsage.aidl b/media/aidl/android/media/audio/common/AudioUsage.aidl deleted file mode 100644 index 34a7185b9296..000000000000 --- a/media/aidl/android/media/audio/common/AudioUsage.aidl +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum AudioUsage { - /** - * Used as default value in parcelables to indicate that a value was not - * set. Should never be considered a valid setting, except for backward - * compatibility scenarios. - */ - INVALID = -1, - /** - * Usage value to use when the usage is unknown. - */ - UNKNOWN = 0, - /** - * Usage value to use when the usage is media, such as music, or movie - * soundtracks. - */ - MEDIA = 1, - /** - * Usage value to use when the usage is voice communications, such as - * telephony or VoIP. - */ - VOICE_COMMUNICATION = 2, - /** - * Usage value to use when the usage is in-call signalling, such as with - * a "busy" beep, or DTMF tones. - */ - VOICE_COMMUNICATION_SIGNALLING = 3, - /** - * Usage value to use when the usage is an alarm (e.g. wake-up alarm). - */ - ALARM = 4, - /** - * Usage value to use when the usage is notification. See other notification - * usages for more specialized uses. - */ - NOTIFICATION = 5, - /** - * Usage value to use when the usage is telephony ringtone. - */ - NOTIFICATION_TELEPHONY_RINGTONE = 6, - /** - * Usage value to use when the usage is a request to enter/end a - * communication, such as a VoIP communication or video-conference. - * - * Value reserved for system use only. HALs must never return this value to - * the system or accept it from the system. - */ - SYS_RESERVED_NOTIFICATION_COMMUNICATION_REQUEST = 7, - /** - * Usage value to use when the usage is notification for an "instant" - * communication such as a chat, or SMS. - * - * Value reserved for system use only. HALs must never return this value to - * the system or accept it from the system. - */ - SYS_RESERVED_NOTIFICATION_COMMUNICATION_INSTANT = 8, - /** - * Usage value to use when the usage is notification for a - * non-immediate type of communication such as e-mail. - * - * Value reserved for system use only. HALs must never return this value to - * the system or accept it from the system. - */ - SYS_RESERVED_NOTIFICATION_COMMUNICATION_DELAYED = 9, - /** - * Usage value to use when the usage is to attract the user's attention, - * such as a reminder or low battery warning. - */ - NOTIFICATION_EVENT = 10, - /** - * Usage value to use when the usage is for accessibility, such as with - * a screen reader. - */ - ASSISTANCE_ACCESSIBILITY = 11, - /** - * Usage value to use when the usage is driving or navigation directions. - */ - ASSISTANCE_NAVIGATION_GUIDANCE = 12, - /** - * Usage value to use when the usage is sonification, such as with user - * interface sounds. - */ - ASSISTANCE_SONIFICATION = 13, - /** - * Usage value to use when the usage is for game audio. - */ - GAME = 14, - /** - * Usage value to use when feeding audio to the platform and replacing - * "traditional" audio source, such as audio capture devices. - */ - VIRTUAL_SOURCE = 15, - /** - * Usage value to use for audio responses to user queries, audio - * instructions or help utterances. - */ - ASSISTANT = 16, - /** - * Usage value to use for assistant voice interaction with remote caller on - * Cell and VoIP calls. - */ - CALL_ASSISTANT = 17, - /** - * Usage value to use when the usage is an emergency. - */ - EMERGENCY = 1000, - /** - * Usage value to use when the usage is a safety sound. - */ - SAFETY = 1001, - /** - * Usage value to use when the usage is a vehicle status. - */ - VEHICLE_STATUS = 1002, - /** - * Usage value to use when the usage is an announcement. - */ - ANNOUNCEMENT = 1003, -} diff --git a/media/aidl/android/media/audio/common/AudioUuid.aidl b/media/aidl/android/media/audio/common/AudioUuid.aidl deleted file mode 100644 index f2715ff498e6..000000000000 --- a/media/aidl/android/media/audio/common/AudioUuid.aidl +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.audio.common; - -/** - * Commonly used structure for passing unique identifiers (UUID). - * For the definition of UUID, refer to ITU-T X.667 spec. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable AudioUuid { - int timeLow; - int timeMid; - int timeHiAndVersion; - int clockSeq; - byte[] node; // Length = 6 -} diff --git a/media/aidl/android/media/audio/common/Boolean.aidl b/media/aidl/android/media/audio/common/Boolean.aidl deleted file mode 100644 index fddd5324c534..000000000000 --- a/media/aidl/android/media/audio/common/Boolean.aidl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * This is a simple wrapper around a 'boolean', putting it in a parcelable, so it - * can be used as an 'inout' parameter, be made '@nullable', etc. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable Boolean { - boolean value; -} diff --git a/media/aidl/android/media/audio/common/Byte.aidl b/media/aidl/android/media/audio/common/Byte.aidl deleted file mode 100644 index f0a31a2818bf..000000000000 --- a/media/aidl/android/media/audio/common/Byte.aidl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * This is a simple wrapper around a 'byte', putting it in a parcelable, so it - * can be used as an 'inout' parameter, be made '@nullable', etc. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable Byte { - byte value; -} diff --git a/media/aidl/android/media/audio/common/Double.aidl b/media/aidl/android/media/audio/common/Double.aidl deleted file mode 100644 index d7ab7b8f6431..000000000000 --- a/media/aidl/android/media/audio/common/Double.aidl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * This is a simple wrapper around a 'double', putting it in a parcelable, so it - * can be used as an 'inout' parameter, be made '@nullable', etc. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable Double { - double value; -} diff --git a/media/aidl/android/media/audio/common/ExtraAudioDescriptor.aidl b/media/aidl/android/media/audio/common/ExtraAudioDescriptor.aidl deleted file mode 100644 index 330e0d1c6829..000000000000 --- a/media/aidl/android/media/audio/common/ExtraAudioDescriptor.aidl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -import android.media.audio.common.AudioEncapsulationType; -import android.media.audio.common.AudioStandard; - -/** - * The audio descriptor that descibes playback/capture capabilities according to - * a particular standard. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable ExtraAudioDescriptor { - AudioStandard standard = AudioStandard.NONE; - byte[] audioDescriptor; - AudioEncapsulationType encapsulationType = AudioEncapsulationType.NONE; -} diff --git a/media/aidl/android/media/audio/common/Float.aidl b/media/aidl/android/media/audio/common/Float.aidl deleted file mode 100644 index 4c5257efa56e..000000000000 --- a/media/aidl/android/media/audio/common/Float.aidl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * This is a simple wrapper around a 'float', putting it in a parcelable, so it - * can be used as an 'inout' parameter, be made '@nullable', etc. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable Float { - float value; -} diff --git a/media/aidl/android/media/audio/common/Int.aidl b/media/aidl/android/media/audio/common/Int.aidl deleted file mode 100644 index 01c768e94a3a..000000000000 --- a/media/aidl/android/media/audio/common/Int.aidl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * This is a simple wrapper around an 'int', putting it in a parcelable, so it - * can be used as an 'inout' parameter, be made '@nullable', etc. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable Int { - int value; -} diff --git a/media/aidl/android/media/audio/common/Long.aidl b/media/aidl/android/media/audio/common/Long.aidl deleted file mode 100644 index a4aeb53619c0..000000000000 --- a/media/aidl/android/media/audio/common/Long.aidl +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * This is a simple wrapper around a 'long', putting it in a parcelable, so it - * can be used as an 'inout' parameter, be made '@nullable', etc. - * - * {@hide} - */ -@JavaDerive(equals=true, toString=true) -@VintfStability -parcelable Long { - long value; -} diff --git a/media/aidl/android/media/audio/common/PcmType.aidl b/media/aidl/android/media/audio/common/PcmType.aidl deleted file mode 100644 index 6e07d9b19eaf..000000000000 --- a/media/aidl/android/media/audio/common/PcmType.aidl +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.media.audio.common; - -/** - * The type of the encoding used for representing PCM samples. Only used as - * part of 'AudioFormatDescription' structure. - * - * {@hide} - */ -@VintfStability -@Backing(type="byte") -enum PcmType { - /** - * "Default" value used when the type 'AudioFormatDescription' is "default". - */ - DEFAULT = 0, - /** - * Unsigned 8-bit integer. - */ - UINT_8_BIT = DEFAULT, - /** - * Signed 16-bit integer. - */ - INT_16_BIT = 1, - /** - * Signed 32-bit integer. - */ - INT_32_BIT = 2, - /** - * Q8.24 fixed point format. - */ - FIXED_Q_8_24 = 3, - /** - * IEEE 754 32-bit floating point format. - */ - FLOAT_32_BIT = 4, - /** - * Signed 24-bit integer. - */ - INT_24_BIT = 5, -} diff --git a/media/aidl/android/media/soundtrigger/AudioCapabilities.aidl b/media/aidl/android/media/soundtrigger/AudioCapabilities.aidl deleted file mode 100644 index 7b0825b1e6cb..000000000000 --- a/media/aidl/android/media/soundtrigger/AudioCapabilities.aidl +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * AudioCapabilities supported by the implemented HAL driver. - * @hide - */ -@VintfStability -@Backing(type="int") -enum AudioCapabilities { - /** - * If set the underlying module supports AEC. - */ - ECHO_CANCELLATION = 1 << 0, - /** - * If set, the underlying module supports noise suppression. - */ - NOISE_SUPPRESSION = 1 << 1, -} diff --git a/media/aidl/android/media/soundtrigger/ConfidenceLevel.aidl b/media/aidl/android/media/soundtrigger/ConfidenceLevel.aidl deleted file mode 100644 index 3fcba404e21c..000000000000 --- a/media/aidl/android/media/soundtrigger/ConfidenceLevel.aidl +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * A recognition confidence level. - * This type is used to represent either a threshold or an actual detection confidence level. - * - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable ConfidenceLevel { - /** user ID. */ - int userId; - /** - * Confidence level in percent (0 - 100). - * <ul> - * <li>Min level for recognition configuration - * <li>Detected level for recognition event. - * </ul> - */ - int levelPercent; -} diff --git a/media/aidl/android/media/soundtrigger/ModelParameter.aidl b/media/aidl/android/media/soundtrigger/ModelParameter.aidl deleted file mode 100644 index 948400883736..000000000000 --- a/media/aidl/android/media/soundtrigger/ModelParameter.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * Model specific parameters to be used with parameter set and get APIs. - * - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum ModelParameter { - /** - * Placeholder for invalid model parameter used for returning error or - * passing an invalid value. - */ - INVALID = -1, - - /** - * Controls the sensitivity threshold adjustment factor for a given model. - * Negative value corresponds to less sensitive model (high threshold) and - * a positive value corresponds to a more sensitive model (low threshold). - * Default value is 0. - */ - THRESHOLD_FACTOR = 0, -} diff --git a/media/aidl/android/media/soundtrigger/ModelParameterRange.aidl b/media/aidl/android/media/soundtrigger/ModelParameterRange.aidl deleted file mode 100644 index e7c616bae9bb..000000000000 --- a/media/aidl/android/media/soundtrigger/ModelParameterRange.aidl +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * Value range for a model parameter. - * - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable ModelParameterRange { - /** Minimum (inclusive) */ - int minInclusive; - /** Maximum (inclusive) */ - int maxInclusive; -} diff --git a/media/aidl/android/media/soundtrigger/Phrase.aidl b/media/aidl/android/media/soundtrigger/Phrase.aidl deleted file mode 100644 index 077db21586c0..000000000000 --- a/media/aidl/android/media/soundtrigger/Phrase.aidl +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * Key phrase descriptor. - * - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable Phrase { - /** Unique keyphrase ID assigned at enrollment time. */ - int id; - /** Recognition modes supported by this key phrase (bitfield of RecognitionMode enum). */ - int recognitionModes; - /** List of users IDs associated with this key phrase. */ - int[] users; - /** Locale - Java Locale style (e.g. en_US). */ - String locale; - /** Phrase text. */ - String text; -} diff --git a/media/aidl/android/media/soundtrigger/PhraseRecognitionEvent.aidl b/media/aidl/android/media/soundtrigger/PhraseRecognitionEvent.aidl deleted file mode 100644 index 654f7c259d2f..000000000000 --- a/media/aidl/android/media/soundtrigger/PhraseRecognitionEvent.aidl +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -import android.media.soundtrigger.PhraseRecognitionExtra; -import android.media.soundtrigger.RecognitionEvent; - -/** - * An event that gets sent to indicate a phrase recognition (or aborting of the recognition - process). - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable PhraseRecognitionEvent { - /** Common recognition event. */ - RecognitionEvent common; - /** List of descriptors for each recognized key phrase */ - PhraseRecognitionExtra[] phraseExtras; -} diff --git a/media/aidl/android/media/soundtrigger/PhraseRecognitionExtra.aidl b/media/aidl/android/media/soundtrigger/PhraseRecognitionExtra.aidl deleted file mode 100644 index eb523eb0d396..000000000000 --- a/media/aidl/android/media/soundtrigger/PhraseRecognitionExtra.aidl +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -import android.media.soundtrigger.ConfidenceLevel; - -/** - * Specialized recognition event for key phrase detection. - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable PhraseRecognitionExtra { - /** Keyphrase ID */ - int id; - /** Bitfield, indexed by RecognitionMode. */ - int recognitionModes; - /** Confidence level for mode RECOGNITION_MODE_VOICE_TRIGGER. Value is between 0-100. */ - int confidenceLevel; - /** Number of user confidence levels */ - ConfidenceLevel[] levels; -} diff --git a/media/aidl/android/media/soundtrigger/PhraseSoundModel.aidl b/media/aidl/android/media/soundtrigger/PhraseSoundModel.aidl deleted file mode 100644 index e0ffdeecd99c..000000000000 --- a/media/aidl/android/media/soundtrigger/PhraseSoundModel.aidl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -import android.media.soundtrigger.SoundModel; -import android.media.soundtrigger.Phrase; - -/** - * Specialized sound model for key phrase detection. - * Proprietary representation of key phrases in binary data must match - * information indicated by phrases field. - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable PhraseSoundModel { - /** Common part of sound model descriptor */ - SoundModel common; - /** List of descriptors for key phrases supported by this sound model */ - Phrase[] phrases; -} diff --git a/media/aidl/android/media/soundtrigger/Properties.aidl b/media/aidl/android/media/soundtrigger/Properties.aidl deleted file mode 100644 index efa1b6aac68d..000000000000 --- a/media/aidl/android/media/soundtrigger/Properties.aidl +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * Capabilities of a sound trigger module. - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable Properties { - /** Implementor name */ - String implementor; - /** Implementation description */ - String description; - /** Implementation version */ - int version; - /** - * Unique implementation ID. The UUID must change with each version of - the engine implementation */ - String uuid; - /** - * String naming the architecture used for running the supported models. - * (eg. a platform running models on a DSP could implement this string to convey the DSP - * architecture used) - * This property is supported for soundtrigger HAL v2.3 and above. - * If running a previous version, the string will be empty. - */ - String supportedModelArch; - /** Maximum number of concurrent sound models loaded */ - int maxSoundModels; - /** Maximum number of key phrases */ - int maxKeyPhrases; - /** Maximum number of concurrent users detected */ - int maxUsers; - /** All supported modes. Bitfield, indexed by RecognitionMode. */ - int recognitionModes; - /** Supports seamless transition from detection to capture */ - boolean captureTransition; - /** Maximum buffering capacity in ms if captureTransition is true */ - int maxBufferMs; - /** Supports capture by other use cases while detection is active */ - boolean concurrentCapture; - /** Returns the trigger capture in event */ - boolean triggerInEvent; - /** - * Rated power consumption when detection is active with TDB - * silence/sound/speech ratio */ - int powerConsumptionMw; - /** - * Bit field encoding of the AudioCapabilities - * supported by the firmware. - * This property is supported for soundtrigger HAL v2.3 and above. - * If running a previous version, this value will be 0. - */ - int audioCapabilities; -} diff --git a/media/aidl/android/media/soundtrigger/RecognitionConfig.aidl b/media/aidl/android/media/soundtrigger/RecognitionConfig.aidl deleted file mode 100644 index a00f0e58e293..000000000000 --- a/media/aidl/android/media/soundtrigger/RecognitionConfig.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -import android.media.soundtrigger.PhraseRecognitionExtra; - -/** - * Configuration for tuning behavior of an active recognition process. - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable RecognitionConfig { - /* Capture and buffer audio for this recognition instance. */ - boolean captureRequested; - - /* Configuration for each key phrase. */ - PhraseRecognitionExtra[] phraseRecognitionExtras; - - /** - * Bit field encoding of the AudioCapabilities - * supported by the firmware. - */ - int audioCapabilities; - - /** Capture configuration data. Content is implementation-defined. */ - byte[] data; -} diff --git a/media/aidl/android/media/soundtrigger/RecognitionEvent.aidl b/media/aidl/android/media/soundtrigger/RecognitionEvent.aidl deleted file mode 100644 index 6d69038b8dbd..000000000000 --- a/media/aidl/android/media/soundtrigger/RecognitionEvent.aidl +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -import android.media.audio.common.AudioConfig; -import android.media.soundtrigger.RecognitionStatus; -import android.media.soundtrigger.SoundModelType; - -/** - * An event that gets sent to indicate a recognition (or aborting of the recognition process). - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable RecognitionEvent { - /** Recognition status. */ - RecognitionStatus status = RecognitionStatus.INVALID; - /** Event type, same as sound model type. */ - SoundModelType type = SoundModelType.INVALID; - /** Is it possible to capture audio from this utterance buffered by the implementation. */ - boolean captureAvailable; - /** - * Delay in ms between end of model detection and start of audio available for capture. - * A negative value is possible (e.g. if key phrase is also available for Capture. - */ - int captureDelayMs; - /** Duration in ms of audio captured before the start of the trigger. 0 if none. */ - int capturePreambleMs; - /** If true, the 'data' field below contains the capture of the trigger sound. */ - boolean triggerInData; - /** - * Audio format of either the trigger in event data or to use for capture of the rest of the - * utterance. May be null when no audio is available for this event type. - */ - @nullable AudioConfig audioConfig; - /** Additional data. */ - byte[] data; - /** - * If true, recognition is still active after this event. - * For compatibility with earlier versions of this data type, when the status field is set to - * RecognitionStatus.FORCED, the value of this field should be treated as 'true', regardless of - * the actual value. - * When the status is RecognitionStatus.ABORTED or RecognitionStatus.FAILURE, this must be set - * to false. - */ - boolean recognitionStillActive; -} diff --git a/media/aidl/android/media/soundtrigger/RecognitionMode.aidl b/media/aidl/android/media/soundtrigger/RecognitionMode.aidl deleted file mode 100644 index ce2cffedda32..000000000000 --- a/media/aidl/android/media/soundtrigger/RecognitionMode.aidl +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * Recognition mode. - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum RecognitionMode { - /** Simple voice trigger. */ - VOICE_TRIGGER = 0x1, - /** Trigger only if one user in model identified. */ - USER_IDENTIFICATION = 0x2, - /** Trigger only if one user in model authenticated. */ - USER_AUTHENTICATION = 0x4, - /** Generic sound trigger. */ - GENERIC_TRIGGER = 0x8, -} diff --git a/media/aidl/android/media/soundtrigger/RecognitionStatus.aidl b/media/aidl/android/media/soundtrigger/RecognitionStatus.aidl deleted file mode 100644 index cccf0f3b6d49..000000000000 --- a/media/aidl/android/media/soundtrigger/RecognitionStatus.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * A status for indicating the type of a recognition event. - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum RecognitionStatus { - /** - * Used as default value in parcelables to indicate that a value was not set. - * Should never be considered a valid setting, except for backward compatibility scenarios. - */ - INVALID = -1, - /** Recognition success. */ - SUCCESS = 0, - /** Recognition aborted (e.g. capture preempted by another use-case. */ - ABORTED = 1, - /** Recognition failure. */ - FAILURE = 2, - /** - * Recognition event was triggered by a forceRecognitionEvent request, not by the DSP. - * Note that forced detections *do not* stop the active recognition, unlike the other types. - */ - FORCED = 3 -} diff --git a/media/aidl/android/media/soundtrigger/SoundModel.aidl b/media/aidl/android/media/soundtrigger/SoundModel.aidl deleted file mode 100644 index 94244d0ba0ff..000000000000 --- a/media/aidl/android/media/soundtrigger/SoundModel.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -import android.media.soundtrigger.SoundModelType; -import android.os.ParcelFileDescriptor; - -/** - * Base sound model descriptor. This struct can be extended for various specific types by way of - * aggregation. - * {@hide} - */ -@JavaDerive(equals = true, toString = true) -@VintfStability -parcelable SoundModel { - /** Model type. */ - SoundModelType type = SoundModelType.INVALID; - /** Unique sound model ID. */ - String uuid; - /** - * Unique vendor ID. Identifies the engine the sound model - * was build for */ - String vendorUuid; - /** Opaque data transparent to Android framework. May be null if dataSize is 0. */ - @nullable ParcelFileDescriptor data; - /** Size of the above data, in bytes. */ - int dataSize; -} diff --git a/media/aidl/android/media/soundtrigger/SoundModelType.aidl b/media/aidl/android/media/soundtrigger/SoundModelType.aidl deleted file mode 100644 index 34a9376a26b9..000000000000 --- a/media/aidl/android/media/soundtrigger/SoundModelType.aidl +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * Sound model type. - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum SoundModelType { - /** - * Used as default value in parcelables to indicate that a value was not set. - * Should never be considered a valid setting, except for backward compatibility scenarios. - */ - INVALID = -1, - /** Key phrase sound models */ - KEYPHRASE = 0, - /** All models other than keyphrase */ - GENERIC = 1, -} diff --git a/media/aidl/android/media/soundtrigger/Status.aidl b/media/aidl/android/media/soundtrigger/Status.aidl deleted file mode 100644 index ca1487fb119f..000000000000 --- a/media/aidl/android/media/soundtrigger/Status.aidl +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.media.soundtrigger; - -/** - * {@hide} - */ -@VintfStability -@Backing(type="int") -enum Status { - /** - * Used as default value in parcelables to indicate that a value was not set. - * Should never be considered a valid setting, except for backward compatibility scenarios. - */ - INVALID = -1, - /** Success. */ - SUCCESS = 0, - /** Failure due to resource contention. This is typically a temporary condition. */ - RESOURCE_CONTENTION = 1, - /** Operation is not supported in this implementation. This is a permanent condition. */ - OPERATION_NOT_SUPPORTED = 2, - /** Temporary lack of permission. */ - TEMPORARY_PERMISSION_DENIED = 3, - /** The object on which this method is called is dead and all of its state is lost. */ - DEAD_OBJECT = 4, - /** - * Unexpected internal error has occurred. Usually this will result in the service rebooting - * shortly after. The client should treat the state of the server as undefined. - */ - INTERNAL_ERROR = 5, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/.hash b/media/aidl_api/android.media.audio.common.types/1/.hash deleted file mode 100644 index 328aab4b355c..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/.hash +++ /dev/null @@ -1 +0,0 @@ -985ad49c876a50c60c726dc87f60cb598fd087ad diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioChannelLayout.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioChannelLayout.aidl deleted file mode 100644 index 6845ac1f6e1f..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioChannelLayout.aidl +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioChannelLayout { - int none = 0; - int invalid = 0; - int indexMask; - int layoutMask; - int voiceMask; - const int INDEX_MASK_1 = 1; - const int INDEX_MASK_2 = 3; - const int INDEX_MASK_3 = 7; - const int INDEX_MASK_4 = 15; - const int INDEX_MASK_5 = 31; - const int INDEX_MASK_6 = 63; - const int INDEX_MASK_7 = 127; - const int INDEX_MASK_8 = 255; - const int INDEX_MASK_9 = 511; - const int INDEX_MASK_10 = 1023; - const int INDEX_MASK_11 = 2047; - const int INDEX_MASK_12 = 4095; - const int INDEX_MASK_13 = 8191; - const int INDEX_MASK_14 = 16383; - const int INDEX_MASK_15 = 32767; - const int INDEX_MASK_16 = 65535; - const int INDEX_MASK_17 = 131071; - const int INDEX_MASK_18 = 262143; - const int INDEX_MASK_19 = 524287; - const int INDEX_MASK_20 = 1048575; - const int INDEX_MASK_21 = 2097151; - const int INDEX_MASK_22 = 4194303; - const int INDEX_MASK_23 = 8388607; - const int INDEX_MASK_24 = 16777215; - const int LAYOUT_MONO = 1; - const int LAYOUT_STEREO = 3; - const int LAYOUT_2POINT1 = 11; - const int LAYOUT_TRI = 7; - const int LAYOUT_TRI_BACK = 259; - const int LAYOUT_3POINT1 = 15; - const int LAYOUT_2POINT0POINT2 = 786435; - const int LAYOUT_2POINT1POINT2 = 786443; - const int LAYOUT_3POINT0POINT2 = 786439; - const int LAYOUT_3POINT1POINT2 = 786447; - const int LAYOUT_QUAD = 51; - const int LAYOUT_QUAD_SIDE = 1539; - const int LAYOUT_SURROUND = 263; - const int LAYOUT_PENTA = 55; - const int LAYOUT_5POINT1 = 63; - const int LAYOUT_5POINT1_SIDE = 1551; - const int LAYOUT_5POINT1POINT2 = 786495; - const int LAYOUT_5POINT1POINT4 = 184383; - const int LAYOUT_6POINT1 = 319; - const int LAYOUT_7POINT1 = 1599; - const int LAYOUT_7POINT1POINT2 = 788031; - const int LAYOUT_7POINT1POINT4 = 185919; - const int LAYOUT_9POINT1POINT4 = 50517567; - const int LAYOUT_9POINT1POINT6 = 51303999; - const int LAYOUT_13POINT_360RA = 7534087; - const int LAYOUT_22POINT2 = 16777215; - const int LAYOUT_MONO_HAPTIC_A = 1073741825; - const int LAYOUT_STEREO_HAPTIC_A = 1073741827; - const int LAYOUT_HAPTIC_AB = 1610612736; - const int LAYOUT_MONO_HAPTIC_AB = 1610612737; - const int LAYOUT_STEREO_HAPTIC_AB = 1610612739; - const int LAYOUT_FRONT_BACK = 260; - const int INTERLEAVE_LEFT = 0; - const int INTERLEAVE_RIGHT = 1; - const int CHANNEL_FRONT_LEFT = 1; - const int CHANNEL_FRONT_RIGHT = 2; - const int CHANNEL_FRONT_CENTER = 4; - const int CHANNEL_LOW_FREQUENCY = 8; - const int CHANNEL_BACK_LEFT = 16; - const int CHANNEL_BACK_RIGHT = 32; - const int CHANNEL_FRONT_LEFT_OF_CENTER = 64; - const int CHANNEL_FRONT_RIGHT_OF_CENTER = 128; - const int CHANNEL_BACK_CENTER = 256; - const int CHANNEL_SIDE_LEFT = 512; - const int CHANNEL_SIDE_RIGHT = 1024; - const int CHANNEL_TOP_CENTER = 2048; - const int CHANNEL_TOP_FRONT_LEFT = 4096; - const int CHANNEL_TOP_FRONT_CENTER = 8192; - const int CHANNEL_TOP_FRONT_RIGHT = 16384; - const int CHANNEL_TOP_BACK_LEFT = 32768; - const int CHANNEL_TOP_BACK_CENTER = 65536; - const int CHANNEL_TOP_BACK_RIGHT = 131072; - const int CHANNEL_TOP_SIDE_LEFT = 262144; - const int CHANNEL_TOP_SIDE_RIGHT = 524288; - const int CHANNEL_BOTTOM_FRONT_LEFT = 1048576; - const int CHANNEL_BOTTOM_FRONT_CENTER = 2097152; - const int CHANNEL_BOTTOM_FRONT_RIGHT = 4194304; - const int CHANNEL_LOW_FREQUENCY_2 = 8388608; - const int CHANNEL_FRONT_WIDE_LEFT = 16777216; - const int CHANNEL_FRONT_WIDE_RIGHT = 33554432; - const int CHANNEL_HAPTIC_B = 536870912; - const int CHANNEL_HAPTIC_A = 1073741824; - const int VOICE_UPLINK_MONO = 16384; - const int VOICE_DNLINK_MONO = 32768; - const int VOICE_CALL_MONO = 49152; - const int CHANNEL_VOICE_UPLINK = 16384; - const int CHANNEL_VOICE_DNLINK = 32768; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioConfig.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioConfig.aidl deleted file mode 100644 index 6b8686ce2c96..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioConfig.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioConfig { - android.media.audio.common.AudioConfigBase base; - android.media.audio.common.AudioOffloadInfo offloadInfo; - long frameCount; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioConfigBase.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioConfigBase.aidl deleted file mode 100644 index f3e716b1d3b4..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioConfigBase.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioConfigBase { - int sampleRate; - android.media.audio.common.AudioChannelLayout channelMask; - android.media.audio.common.AudioFormatDescription format; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioContentType.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioContentType.aidl deleted file mode 100644 index f9ac61426fa3..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioContentType.aidl +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioContentType { - UNKNOWN = 0, - SPEECH = 1, - MUSIC = 2, - MOVIE = 3, - SONIFICATION = 4, - ULTRASOUND = 1997, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDevice.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDevice.aidl deleted file mode 100644 index fb5cb62281e2..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDevice.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioDevice { - android.media.audio.common.AudioDeviceDescription type; - android.media.audio.common.AudioDeviceAddress address; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDeviceAddress.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDeviceAddress.aidl deleted file mode 100644 index 905d3aa5fb0d..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDeviceAddress.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioDeviceAddress { - @utf8InCpp String id; - byte[] mac; - byte[] ipv4; - int[] ipv6; - int[] alsa; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDeviceDescription.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDeviceDescription.aidl deleted file mode 100644 index 1c66a8f98b1e..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDeviceDescription.aidl +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioDeviceDescription { - android.media.audio.common.AudioDeviceType type = android.media.audio.common.AudioDeviceType.NONE; - @utf8InCpp String connection; - const @utf8InCpp String CONNECTION_ANALOG = "analog"; - const @utf8InCpp String CONNECTION_BT_A2DP = "bt-a2dp"; - const @utf8InCpp String CONNECTION_BT_LE = "bt-le"; - const @utf8InCpp String CONNECTION_BT_SCO = "bt-sco"; - const @utf8InCpp String CONNECTION_BUS = "bus"; - const @utf8InCpp String CONNECTION_HDMI = "hdmi"; - const @utf8InCpp String CONNECTION_HDMI_ARC = "hdmi-arc"; - const @utf8InCpp String CONNECTION_HDMI_EARC = "hdmi-earc"; - const @utf8InCpp String CONNECTION_IP_V4 = "ip-v4"; - const @utf8InCpp String CONNECTION_SPDIF = "spdif"; - const @utf8InCpp String CONNECTION_WIRELESS = "wireless"; - const @utf8InCpp String CONNECTION_USB = "usb"; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDeviceType.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDeviceType.aidl deleted file mode 100644 index 6a7b6864b801..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioDeviceType.aidl +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioDeviceType { - NONE = 0, - IN_DEFAULT = 1, - IN_ACCESSORY = 2, - IN_AFE_PROXY = 3, - IN_DEVICE = 4, - IN_ECHO_REFERENCE = 5, - IN_FM_TUNER = 6, - IN_HEADSET = 7, - IN_LOOPBACK = 8, - IN_MICROPHONE = 9, - IN_MICROPHONE_BACK = 10, - IN_SUBMIX = 11, - IN_TELEPHONY_RX = 12, - IN_TV_TUNER = 13, - IN_DOCK = 14, - OUT_DEFAULT = 129, - OUT_ACCESSORY = 130, - OUT_AFE_PROXY = 131, - OUT_CARKIT = 132, - OUT_DEVICE = 133, - OUT_ECHO_CANCELLER = 134, - OUT_FM = 135, - OUT_HEADPHONE = 136, - OUT_HEADSET = 137, - OUT_HEARING_AID = 138, - OUT_LINE_AUX = 139, - OUT_SPEAKER = 140, - OUT_SPEAKER_EARPIECE = 141, - OUT_SPEAKER_SAFE = 142, - OUT_SUBMIX = 143, - OUT_TELEPHONY_TX = 144, - OUT_DOCK = 145, - OUT_BROADCAST = 146, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioEncapsulationMetadataType.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioEncapsulationMetadataType.aidl deleted file mode 100644 index 0ee0dbb0d8c3..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioEncapsulationMetadataType.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioEncapsulationMetadataType { - NONE = 0, - FRAMEWORK_TUNER = 1, - DVB_AD_DESCRIPTOR = 2, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioEncapsulationMode.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioEncapsulationMode.aidl deleted file mode 100644 index 0cf2f31217aa..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioEncapsulationMode.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="byte") @VintfStability -enum AudioEncapsulationMode { - INVALID = -1, - NONE = 0, - ELEMENTARY_STREAM = 1, - HANDLE = 2, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioEncapsulationType.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioEncapsulationType.aidl deleted file mode 100644 index 8a31fc4eb61c..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioEncapsulationType.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioEncapsulationType { - NONE = 0, - IEC61937 = 1, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioFormatDescription.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioFormatDescription.aidl deleted file mode 100644 index 58c75ebc1ae2..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioFormatDescription.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioFormatDescription { - android.media.audio.common.AudioFormatType type = android.media.audio.common.AudioFormatType.DEFAULT; - android.media.audio.common.PcmType pcm = android.media.audio.common.PcmType.DEFAULT; - @utf8InCpp String encoding; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioFormatType.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioFormatType.aidl deleted file mode 100644 index 7f55abeeaf0c..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioFormatType.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="byte") @VintfStability -enum AudioFormatType { - DEFAULT = 0, - NON_PCM = 0, - PCM = 1, - SYS_RESERVED_INVALID = -1, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioGain.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioGain.aidl deleted file mode 100644 index adc5b672eec9..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioGain.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioGain { - int mode; - android.media.audio.common.AudioChannelLayout channelMask; - int minValue; - int maxValue; - int defaultValue; - int stepValue; - int minRampMs; - int maxRampMs; - boolean useForVolume; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioGainConfig.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioGainConfig.aidl deleted file mode 100644 index 01877c78ede4..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioGainConfig.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioGainConfig { - int index; - int mode; - android.media.audio.common.AudioChannelLayout channelMask; - int[] values; - int rampDurationMs; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioGainMode.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioGainMode.aidl deleted file mode 100644 index fddc20c308d2..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioGainMode.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="byte") @VintfStability -enum AudioGainMode { - JOINT = 0, - CHANNELS = 1, - RAMP = 2, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioInputFlags.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioInputFlags.aidl deleted file mode 100644 index 37aa64ae4cee..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioInputFlags.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioInputFlags { - FAST = 0, - HW_HOTWORD = 1, - RAW = 2, - SYNC = 3, - MMAP_NOIRQ = 4, - VOIP_TX = 5, - HW_AV_SYNC = 6, - DIRECT = 7, - ULTRASOUND = 8, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioIoFlags.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioIoFlags.aidl deleted file mode 100644 index 4a4672506edb..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioIoFlags.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioIoFlags { - int input; - int output; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMMapPolicy.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMMapPolicy.aidl deleted file mode 100644 index 98bf0e5849e3..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMMapPolicy.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioMMapPolicy { - UNSPECIFIED = 0, - NEVER = 1, - AUTO = 2, - ALWAYS = 3, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMMapPolicyInfo.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMMapPolicyInfo.aidl deleted file mode 100644 index 7c4f75e9098a..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMMapPolicyInfo.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioMMapPolicyInfo { - android.media.audio.common.AudioDevice device; - android.media.audio.common.AudioMMapPolicy mmapPolicy = android.media.audio.common.AudioMMapPolicy.UNSPECIFIED; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMMapPolicyType.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMMapPolicyType.aidl deleted file mode 100644 index efe8826bba44..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMMapPolicyType.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioMMapPolicyType { - DEFAULT = 1, - EXCLUSIVE = 2, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMode.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMode.aidl deleted file mode 100644 index 8256c1c81b77..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioMode.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioMode { - SYS_RESERVED_INVALID = -2, - SYS_RESERVED_CURRENT = -1, - NORMAL = 0, - RINGTONE = 1, - IN_CALL = 2, - IN_COMMUNICATION = 3, - CALL_SCREEN = 4, - SYS_RESERVED_CALL_REDIRECT = 5, - SYS_RESERVED_COMMUNICATION_REDIRECT = 6, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioOffloadInfo.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioOffloadInfo.aidl deleted file mode 100644 index 40bd53b2eb31..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioOffloadInfo.aidl +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioOffloadInfo { - android.media.audio.common.AudioConfigBase base; - android.media.audio.common.AudioStreamType streamType = android.media.audio.common.AudioStreamType.INVALID; - int bitRatePerSecond; - long durationUs; - boolean hasVideo; - boolean isStreaming; - int bitWidth = 16; - int offloadBufferSize; - android.media.audio.common.AudioUsage usage = android.media.audio.common.AudioUsage.INVALID; - android.media.audio.common.AudioEncapsulationMode encapsulationMode = android.media.audio.common.AudioEncapsulationMode.INVALID; - int contentId; - int syncId; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioOutputFlags.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioOutputFlags.aidl deleted file mode 100644 index 4a512a8049a2..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioOutputFlags.aidl +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioOutputFlags { - DIRECT = 0, - PRIMARY = 1, - FAST = 2, - DEEP_BUFFER = 3, - COMPRESS_OFFLOAD = 4, - NON_BLOCKING = 5, - HW_AV_SYNC = 6, - TTS = 7, - RAW = 8, - SYNC = 9, - IEC958_NONAUDIO = 10, - DIRECT_PCM = 11, - MMAP_NOIRQ = 12, - VOIP_RX = 13, - INCALL_MUSIC = 14, - GAPLESS_OFFLOAD = 15, - SPATIALIZER = 16, - ULTRASOUND = 17, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPort.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPort.aidl deleted file mode 100644 index 970bbc06890f..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPort.aidl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioPort { - int id; - @utf8InCpp String name; - android.media.audio.common.AudioProfile[] profiles; - android.media.audio.common.AudioIoFlags flags; - android.media.audio.common.ExtraAudioDescriptor[] extraAudioDescriptors; - android.media.audio.common.AudioGain[] gains; - android.media.audio.common.AudioPortExt ext; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortConfig.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortConfig.aidl deleted file mode 100644 index 18e6406117dc..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortConfig.aidl +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioPortConfig { - int id; - int portId; - @nullable android.media.audio.common.Int sampleRate; - @nullable android.media.audio.common.AudioChannelLayout channelMask; - @nullable android.media.audio.common.AudioFormatDescription format; - @nullable android.media.audio.common.AudioGainConfig gain; - @nullable android.media.audio.common.AudioIoFlags flags; - android.media.audio.common.AudioPortExt ext; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortDeviceExt.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortDeviceExt.aidl deleted file mode 100644 index 37d7041731bf..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortDeviceExt.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioPortDeviceExt { - android.media.audio.common.AudioDevice device; - int flags; - android.media.audio.common.AudioFormatDescription[] encodedFormats; - const int FLAG_INDEX_DEFAULT_DEVICE = 0; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortExt.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortExt.aidl deleted file mode 100644 index af9d9c4d5671..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortExt.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioPortExt { - boolean unspecified; - android.media.audio.common.AudioPortDeviceExt device; - android.media.audio.common.AudioPortMixExt mix; - int session; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortMixExt.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortMixExt.aidl deleted file mode 100644 index 5b74c0d9f7e4..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortMixExt.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioPortMixExt { - int handle; - android.media.audio.common.AudioPortMixExtUseCase usecase; - int maxOpenStreamCount; - int maxActiveStreamCount; - int recommendedMuteDurationMs; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortMixExtUseCase.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortMixExtUseCase.aidl deleted file mode 100644 index e9acb40a1ab1..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioPortMixExtUseCase.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioPortMixExtUseCase { - boolean unspecified; - android.media.audio.common.AudioStreamType stream; - android.media.audio.common.AudioSource source; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioProfile.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioProfile.aidl deleted file mode 100644 index 134cdd98c418..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioProfile.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioProfile { - @utf8InCpp String name; - android.media.audio.common.AudioFormatDescription format; - android.media.audio.common.AudioChannelLayout[] channelMasks; - int[] sampleRates; - android.media.audio.common.AudioEncapsulationType encapsulationType = android.media.audio.common.AudioEncapsulationType.NONE; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioSource.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioSource.aidl deleted file mode 100644 index acf822e5e0a5..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioSource.aidl +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioSource { - SYS_RESERVED_INVALID = -1, - DEFAULT = 0, - MIC = 1, - VOICE_UPLINK = 2, - VOICE_DOWNLINK = 3, - VOICE_CALL = 4, - CAMCORDER = 5, - VOICE_RECOGNITION = 6, - VOICE_COMMUNICATION = 7, - REMOTE_SUBMIX = 8, - UNPROCESSED = 9, - VOICE_PERFORMANCE = 10, - ECHO_REFERENCE = 1997, - FM_TUNER = 1998, - HOTWORD = 1999, - ULTRASOUND = 2000, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioStandard.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioStandard.aidl deleted file mode 100644 index 6c4490f0a449..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioStandard.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioStandard { - NONE = 0, - EDID = 1, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioStreamType.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioStreamType.aidl deleted file mode 100644 index bcfd374cb204..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioStreamType.aidl +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioStreamType { - INVALID = -2, - SYS_RESERVED_DEFAULT = -1, - VOICE_CALL = 0, - SYSTEM = 1, - RING = 2, - MUSIC = 3, - ALARM = 4, - NOTIFICATION = 5, - BLUETOOTH_SCO = 6, - ENFORCED_AUDIBLE = 7, - DTMF = 8, - TTS = 9, - ACCESSIBILITY = 10, - ASSISTANT = 11, - SYS_RESERVED_REROUTING = 12, - SYS_RESERVED_PATCH = 13, - CALL_ASSISTANT = 14, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioUsage.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioUsage.aidl deleted file mode 100644 index 4c7245543cfd..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioUsage.aidl +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioUsage { - INVALID = -1, - UNKNOWN = 0, - MEDIA = 1, - VOICE_COMMUNICATION = 2, - VOICE_COMMUNICATION_SIGNALLING = 3, - ALARM = 4, - NOTIFICATION = 5, - NOTIFICATION_TELEPHONY_RINGTONE = 6, - SYS_RESERVED_NOTIFICATION_COMMUNICATION_REQUEST = 7, - SYS_RESERVED_NOTIFICATION_COMMUNICATION_INSTANT = 8, - SYS_RESERVED_NOTIFICATION_COMMUNICATION_DELAYED = 9, - NOTIFICATION_EVENT = 10, - ASSISTANCE_ACCESSIBILITY = 11, - ASSISTANCE_NAVIGATION_GUIDANCE = 12, - ASSISTANCE_SONIFICATION = 13, - GAME = 14, - VIRTUAL_SOURCE = 15, - ASSISTANT = 16, - CALL_ASSISTANT = 17, - EMERGENCY = 1000, - SAFETY = 1001, - VEHICLE_STATUS = 1002, - ANNOUNCEMENT = 1003, -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioUuid.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioUuid.aidl deleted file mode 100644 index af307dadf3a3..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/AudioUuid.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioUuid { - int timeLow; - int timeMid; - int timeHiAndVersion; - int clockSeq; - byte[] node; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/ExtraAudioDescriptor.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/ExtraAudioDescriptor.aidl deleted file mode 100644 index 2ae2405f544e..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/ExtraAudioDescriptor.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable ExtraAudioDescriptor { - android.media.audio.common.AudioStandard standard = android.media.audio.common.AudioStandard.NONE; - byte[] audioDescriptor; - android.media.audio.common.AudioEncapsulationType encapsulationType = android.media.audio.common.AudioEncapsulationType.NONE; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/Int.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/Int.aidl deleted file mode 100644 index b0d3c4922531..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/Int.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Int { - int value; -} diff --git a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/PcmType.aidl b/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/PcmType.aidl deleted file mode 100644 index 79bfa625ba8e..000000000000 --- a/media/aidl_api/android.media.audio.common.types/1/android/media/audio/common/PcmType.aidl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="byte") @VintfStability -enum PcmType { - DEFAULT = 0, - UINT_8_BIT = 0, - INT_16_BIT = 1, - INT_32_BIT = 2, - FIXED_Q_8_24 = 3, - FLOAT_32_BIT = 4, - INT_24_BIT = 5, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioAttributes.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioAttributes.aidl deleted file mode 100644 index 6d5e234af08e..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioAttributes.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioAttributes { - android.media.audio.common.AudioContentType contentType = android.media.audio.common.AudioContentType.UNKNOWN; - android.media.audio.common.AudioUsage usage = android.media.audio.common.AudioUsage.UNKNOWN; - android.media.audio.common.AudioSource source = android.media.audio.common.AudioSource.DEFAULT; - int flags = 0; - @utf8InCpp String[] tags; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioChannelLayout.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioChannelLayout.aidl deleted file mode 100644 index 6845ac1f6e1f..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioChannelLayout.aidl +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioChannelLayout { - int none = 0; - int invalid = 0; - int indexMask; - int layoutMask; - int voiceMask; - const int INDEX_MASK_1 = 1; - const int INDEX_MASK_2 = 3; - const int INDEX_MASK_3 = 7; - const int INDEX_MASK_4 = 15; - const int INDEX_MASK_5 = 31; - const int INDEX_MASK_6 = 63; - const int INDEX_MASK_7 = 127; - const int INDEX_MASK_8 = 255; - const int INDEX_MASK_9 = 511; - const int INDEX_MASK_10 = 1023; - const int INDEX_MASK_11 = 2047; - const int INDEX_MASK_12 = 4095; - const int INDEX_MASK_13 = 8191; - const int INDEX_MASK_14 = 16383; - const int INDEX_MASK_15 = 32767; - const int INDEX_MASK_16 = 65535; - const int INDEX_MASK_17 = 131071; - const int INDEX_MASK_18 = 262143; - const int INDEX_MASK_19 = 524287; - const int INDEX_MASK_20 = 1048575; - const int INDEX_MASK_21 = 2097151; - const int INDEX_MASK_22 = 4194303; - const int INDEX_MASK_23 = 8388607; - const int INDEX_MASK_24 = 16777215; - const int LAYOUT_MONO = 1; - const int LAYOUT_STEREO = 3; - const int LAYOUT_2POINT1 = 11; - const int LAYOUT_TRI = 7; - const int LAYOUT_TRI_BACK = 259; - const int LAYOUT_3POINT1 = 15; - const int LAYOUT_2POINT0POINT2 = 786435; - const int LAYOUT_2POINT1POINT2 = 786443; - const int LAYOUT_3POINT0POINT2 = 786439; - const int LAYOUT_3POINT1POINT2 = 786447; - const int LAYOUT_QUAD = 51; - const int LAYOUT_QUAD_SIDE = 1539; - const int LAYOUT_SURROUND = 263; - const int LAYOUT_PENTA = 55; - const int LAYOUT_5POINT1 = 63; - const int LAYOUT_5POINT1_SIDE = 1551; - const int LAYOUT_5POINT1POINT2 = 786495; - const int LAYOUT_5POINT1POINT4 = 184383; - const int LAYOUT_6POINT1 = 319; - const int LAYOUT_7POINT1 = 1599; - const int LAYOUT_7POINT1POINT2 = 788031; - const int LAYOUT_7POINT1POINT4 = 185919; - const int LAYOUT_9POINT1POINT4 = 50517567; - const int LAYOUT_9POINT1POINT6 = 51303999; - const int LAYOUT_13POINT_360RA = 7534087; - const int LAYOUT_22POINT2 = 16777215; - const int LAYOUT_MONO_HAPTIC_A = 1073741825; - const int LAYOUT_STEREO_HAPTIC_A = 1073741827; - const int LAYOUT_HAPTIC_AB = 1610612736; - const int LAYOUT_MONO_HAPTIC_AB = 1610612737; - const int LAYOUT_STEREO_HAPTIC_AB = 1610612739; - const int LAYOUT_FRONT_BACK = 260; - const int INTERLEAVE_LEFT = 0; - const int INTERLEAVE_RIGHT = 1; - const int CHANNEL_FRONT_LEFT = 1; - const int CHANNEL_FRONT_RIGHT = 2; - const int CHANNEL_FRONT_CENTER = 4; - const int CHANNEL_LOW_FREQUENCY = 8; - const int CHANNEL_BACK_LEFT = 16; - const int CHANNEL_BACK_RIGHT = 32; - const int CHANNEL_FRONT_LEFT_OF_CENTER = 64; - const int CHANNEL_FRONT_RIGHT_OF_CENTER = 128; - const int CHANNEL_BACK_CENTER = 256; - const int CHANNEL_SIDE_LEFT = 512; - const int CHANNEL_SIDE_RIGHT = 1024; - const int CHANNEL_TOP_CENTER = 2048; - const int CHANNEL_TOP_FRONT_LEFT = 4096; - const int CHANNEL_TOP_FRONT_CENTER = 8192; - const int CHANNEL_TOP_FRONT_RIGHT = 16384; - const int CHANNEL_TOP_BACK_LEFT = 32768; - const int CHANNEL_TOP_BACK_CENTER = 65536; - const int CHANNEL_TOP_BACK_RIGHT = 131072; - const int CHANNEL_TOP_SIDE_LEFT = 262144; - const int CHANNEL_TOP_SIDE_RIGHT = 524288; - const int CHANNEL_BOTTOM_FRONT_LEFT = 1048576; - const int CHANNEL_BOTTOM_FRONT_CENTER = 2097152; - const int CHANNEL_BOTTOM_FRONT_RIGHT = 4194304; - const int CHANNEL_LOW_FREQUENCY_2 = 8388608; - const int CHANNEL_FRONT_WIDE_LEFT = 16777216; - const int CHANNEL_FRONT_WIDE_RIGHT = 33554432; - const int CHANNEL_HAPTIC_B = 536870912; - const int CHANNEL_HAPTIC_A = 1073741824; - const int VOICE_UPLINK_MONO = 16384; - const int VOICE_DNLINK_MONO = 32768; - const int VOICE_CALL_MONO = 49152; - const int CHANNEL_VOICE_UPLINK = 16384; - const int CHANNEL_VOICE_DNLINK = 32768; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioConfig.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioConfig.aidl deleted file mode 100644 index 6b8686ce2c96..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioConfig.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioConfig { - android.media.audio.common.AudioConfigBase base; - android.media.audio.common.AudioOffloadInfo offloadInfo; - long frameCount; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioConfigBase.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioConfigBase.aidl deleted file mode 100644 index f3e716b1d3b4..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioConfigBase.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioConfigBase { - int sampleRate; - android.media.audio.common.AudioChannelLayout channelMask; - android.media.audio.common.AudioFormatDescription format; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioContentType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioContentType.aidl deleted file mode 100644 index f9ac61426fa3..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioContentType.aidl +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioContentType { - UNKNOWN = 0, - SPEECH = 1, - MUSIC = 2, - MOVIE = 3, - SONIFICATION = 4, - ULTRASOUND = 1997, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDevice.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDevice.aidl deleted file mode 100644 index fb5cb62281e2..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDevice.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioDevice { - android.media.audio.common.AudioDeviceDescription type; - android.media.audio.common.AudioDeviceAddress address; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceAddress.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceAddress.aidl deleted file mode 100644 index 905d3aa5fb0d..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceAddress.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioDeviceAddress { - @utf8InCpp String id; - byte[] mac; - byte[] ipv4; - int[] ipv6; - int[] alsa; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceDescription.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceDescription.aidl deleted file mode 100644 index 1c66a8f98b1e..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceDescription.aidl +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioDeviceDescription { - android.media.audio.common.AudioDeviceType type = android.media.audio.common.AudioDeviceType.NONE; - @utf8InCpp String connection; - const @utf8InCpp String CONNECTION_ANALOG = "analog"; - const @utf8InCpp String CONNECTION_BT_A2DP = "bt-a2dp"; - const @utf8InCpp String CONNECTION_BT_LE = "bt-le"; - const @utf8InCpp String CONNECTION_BT_SCO = "bt-sco"; - const @utf8InCpp String CONNECTION_BUS = "bus"; - const @utf8InCpp String CONNECTION_HDMI = "hdmi"; - const @utf8InCpp String CONNECTION_HDMI_ARC = "hdmi-arc"; - const @utf8InCpp String CONNECTION_HDMI_EARC = "hdmi-earc"; - const @utf8InCpp String CONNECTION_IP_V4 = "ip-v4"; - const @utf8InCpp String CONNECTION_SPDIF = "spdif"; - const @utf8InCpp String CONNECTION_WIRELESS = "wireless"; - const @utf8InCpp String CONNECTION_USB = "usb"; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceType.aidl deleted file mode 100644 index 6a7b6864b801..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioDeviceType.aidl +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioDeviceType { - NONE = 0, - IN_DEFAULT = 1, - IN_ACCESSORY = 2, - IN_AFE_PROXY = 3, - IN_DEVICE = 4, - IN_ECHO_REFERENCE = 5, - IN_FM_TUNER = 6, - IN_HEADSET = 7, - IN_LOOPBACK = 8, - IN_MICROPHONE = 9, - IN_MICROPHONE_BACK = 10, - IN_SUBMIX = 11, - IN_TELEPHONY_RX = 12, - IN_TV_TUNER = 13, - IN_DOCK = 14, - OUT_DEFAULT = 129, - OUT_ACCESSORY = 130, - OUT_AFE_PROXY = 131, - OUT_CARKIT = 132, - OUT_DEVICE = 133, - OUT_ECHO_CANCELLER = 134, - OUT_FM = 135, - OUT_HEADPHONE = 136, - OUT_HEADSET = 137, - OUT_HEARING_AID = 138, - OUT_LINE_AUX = 139, - OUT_SPEAKER = 140, - OUT_SPEAKER_EARPIECE = 141, - OUT_SPEAKER_SAFE = 142, - OUT_SUBMIX = 143, - OUT_TELEPHONY_TX = 144, - OUT_DOCK = 145, - OUT_BROADCAST = 146, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMetadataType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMetadataType.aidl deleted file mode 100644 index 0ee0dbb0d8c3..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMetadataType.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioEncapsulationMetadataType { - NONE = 0, - FRAMEWORK_TUNER = 1, - DVB_AD_DESCRIPTOR = 2, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMode.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMode.aidl deleted file mode 100644 index 0cf2f31217aa..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMode.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="byte") @VintfStability -enum AudioEncapsulationMode { - INVALID = -1, - NONE = 0, - ELEMENTARY_STREAM = 1, - HANDLE = 2, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationType.aidl deleted file mode 100644 index 8a31fc4eb61c..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationType.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioEncapsulationType { - NONE = 0, - IEC61937 = 1, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFlag.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFlag.aidl deleted file mode 100644 index 3138531d6545..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFlag.aidl +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -@Backing(type="int") @VintfStability -enum AudioFlag { - NONE = 0, - AUDIBILITY_ENFORCED = 1, - SCO = 4, - BEACON = 8, - HW_AV_SYNC = 16, - HW_HOTWORD = 32, - BYPASS_INTERRUPTION_POLICY = 64, - BYPASS_MUTE = 128, - LOW_LATENCY = 256, - DEEP_BUFFER = 512, - NO_MEDIA_PROJECTION = 1024, - MUTE_HAPTIC = 2048, - NO_SYSTEM_CAPTURE = 4096, - CAPTURE_PRIVATE = 8192, - CONTENT_SPATIALIZED = 16384, - NEVER_SPATIALIZE = 32768, - CALL_REDIRECTION = 65536, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatDescription.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatDescription.aidl deleted file mode 100644 index 58c75ebc1ae2..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatDescription.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioFormatDescription { - android.media.audio.common.AudioFormatType type = android.media.audio.common.AudioFormatType.DEFAULT; - android.media.audio.common.PcmType pcm = android.media.audio.common.PcmType.DEFAULT; - @utf8InCpp String encoding; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatType.aidl deleted file mode 100644 index 7f55abeeaf0c..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatType.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="byte") @VintfStability -enum AudioFormatType { - DEFAULT = 0, - NON_PCM = 0, - PCM = 1, - SYS_RESERVED_INVALID = -1, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioGain.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioGain.aidl deleted file mode 100644 index adc5b672eec9..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioGain.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioGain { - int mode; - android.media.audio.common.AudioChannelLayout channelMask; - int minValue; - int maxValue; - int defaultValue; - int stepValue; - int minRampMs; - int maxRampMs; - boolean useForVolume; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioGainConfig.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioGainConfig.aidl deleted file mode 100644 index 01877c78ede4..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioGainConfig.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioGainConfig { - int index; - int mode; - android.media.audio.common.AudioChannelLayout channelMask; - int[] values; - int rampDurationMs; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioGainMode.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioGainMode.aidl deleted file mode 100644 index fddc20c308d2..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioGainMode.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="byte") @VintfStability -enum AudioGainMode { - JOINT = 0, - CHANNELS = 1, - RAMP = 2, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioInputFlags.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioInputFlags.aidl deleted file mode 100644 index 37aa64ae4cee..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioInputFlags.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioInputFlags { - FAST = 0, - HW_HOTWORD = 1, - RAW = 2, - SYNC = 3, - MMAP_NOIRQ = 4, - VOIP_TX = 5, - HW_AV_SYNC = 6, - DIRECT = 7, - ULTRASOUND = 8, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioIoFlags.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioIoFlags.aidl deleted file mode 100644 index 4a4672506edb..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioIoFlags.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioIoFlags { - int input; - int output; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMMapPolicy.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMMapPolicy.aidl deleted file mode 100644 index 98bf0e5849e3..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMMapPolicy.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioMMapPolicy { - UNSPECIFIED = 0, - NEVER = 1, - AUTO = 2, - ALWAYS = 3, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMMapPolicyInfo.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMMapPolicyInfo.aidl deleted file mode 100644 index 7c4f75e9098a..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMMapPolicyInfo.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioMMapPolicyInfo { - android.media.audio.common.AudioDevice device; - android.media.audio.common.AudioMMapPolicy mmapPolicy = android.media.audio.common.AudioMMapPolicy.UNSPECIFIED; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMMapPolicyType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMMapPolicyType.aidl deleted file mode 100644 index efe8826bba44..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMMapPolicyType.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioMMapPolicyType { - DEFAULT = 1, - EXCLUSIVE = 2, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMode.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMode.aidl deleted file mode 100644 index 8256c1c81b77..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMode.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioMode { - SYS_RESERVED_INVALID = -2, - SYS_RESERVED_CURRENT = -1, - NORMAL = 0, - RINGTONE = 1, - IN_CALL = 2, - IN_COMMUNICATION = 3, - CALL_SCREEN = 4, - SYS_RESERVED_CALL_REDIRECT = 5, - SYS_RESERVED_COMMUNICATION_REDIRECT = 6, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOffloadInfo.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOffloadInfo.aidl deleted file mode 100644 index 40bd53b2eb31..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOffloadInfo.aidl +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioOffloadInfo { - android.media.audio.common.AudioConfigBase base; - android.media.audio.common.AudioStreamType streamType = android.media.audio.common.AudioStreamType.INVALID; - int bitRatePerSecond; - long durationUs; - boolean hasVideo; - boolean isStreaming; - int bitWidth = 16; - int offloadBufferSize; - android.media.audio.common.AudioUsage usage = android.media.audio.common.AudioUsage.INVALID; - android.media.audio.common.AudioEncapsulationMode encapsulationMode = android.media.audio.common.AudioEncapsulationMode.INVALID; - int contentId; - int syncId; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOutputFlags.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOutputFlags.aidl deleted file mode 100644 index 4a512a8049a2..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioOutputFlags.aidl +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioOutputFlags { - DIRECT = 0, - PRIMARY = 1, - FAST = 2, - DEEP_BUFFER = 3, - COMPRESS_OFFLOAD = 4, - NON_BLOCKING = 5, - HW_AV_SYNC = 6, - TTS = 7, - RAW = 8, - SYNC = 9, - IEC958_NONAUDIO = 10, - DIRECT_PCM = 11, - MMAP_NOIRQ = 12, - VOIP_RX = 13, - INCALL_MUSIC = 14, - GAPLESS_OFFLOAD = 15, - SPATIALIZER = 16, - ULTRASOUND = 17, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPort.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPort.aidl deleted file mode 100644 index 970bbc06890f..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPort.aidl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioPort { - int id; - @utf8InCpp String name; - android.media.audio.common.AudioProfile[] profiles; - android.media.audio.common.AudioIoFlags flags; - android.media.audio.common.ExtraAudioDescriptor[] extraAudioDescriptors; - android.media.audio.common.AudioGain[] gains; - android.media.audio.common.AudioPortExt ext; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortConfig.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortConfig.aidl deleted file mode 100644 index 18e6406117dc..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortConfig.aidl +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioPortConfig { - int id; - int portId; - @nullable android.media.audio.common.Int sampleRate; - @nullable android.media.audio.common.AudioChannelLayout channelMask; - @nullable android.media.audio.common.AudioFormatDescription format; - @nullable android.media.audio.common.AudioGainConfig gain; - @nullable android.media.audio.common.AudioIoFlags flags; - android.media.audio.common.AudioPortExt ext; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortDeviceExt.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortDeviceExt.aidl deleted file mode 100644 index 37d7041731bf..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortDeviceExt.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioPortDeviceExt { - android.media.audio.common.AudioDevice device; - int flags; - android.media.audio.common.AudioFormatDescription[] encodedFormats; - const int FLAG_INDEX_DEFAULT_DEVICE = 0; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortExt.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortExt.aidl deleted file mode 100644 index af9d9c4d5671..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortExt.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioPortExt { - boolean unspecified; - android.media.audio.common.AudioPortDeviceExt device; - android.media.audio.common.AudioPortMixExt mix; - int session; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortMixExt.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortMixExt.aidl deleted file mode 100644 index 5b74c0d9f7e4..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortMixExt.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioPortMixExt { - int handle; - android.media.audio.common.AudioPortMixExtUseCase usecase; - int maxOpenStreamCount; - int maxActiveStreamCount; - int recommendedMuteDurationMs; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortMixExtUseCase.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortMixExtUseCase.aidl deleted file mode 100644 index e9acb40a1ab1..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPortMixExtUseCase.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -union AudioPortMixExtUseCase { - boolean unspecified; - android.media.audio.common.AudioStreamType stream; - android.media.audio.common.AudioSource source; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioProfile.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioProfile.aidl deleted file mode 100644 index 134cdd98c418..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioProfile.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioProfile { - @utf8InCpp String name; - android.media.audio.common.AudioFormatDescription format; - android.media.audio.common.AudioChannelLayout[] channelMasks; - int[] sampleRates; - android.media.audio.common.AudioEncapsulationType encapsulationType = android.media.audio.common.AudioEncapsulationType.NONE; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioSource.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioSource.aidl deleted file mode 100644 index acf822e5e0a5..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioSource.aidl +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioSource { - SYS_RESERVED_INVALID = -1, - DEFAULT = 0, - MIC = 1, - VOICE_UPLINK = 2, - VOICE_DOWNLINK = 3, - VOICE_CALL = 4, - CAMCORDER = 5, - VOICE_RECOGNITION = 6, - VOICE_COMMUNICATION = 7, - REMOTE_SUBMIX = 8, - UNPROCESSED = 9, - VOICE_PERFORMANCE = 10, - ECHO_REFERENCE = 1997, - FM_TUNER = 1998, - HOTWORD = 1999, - ULTRASOUND = 2000, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStandard.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStandard.aidl deleted file mode 100644 index 6c4490f0a449..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStandard.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioStandard { - NONE = 0, - EDID = 1, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStreamType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStreamType.aidl deleted file mode 100644 index bcfd374cb204..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStreamType.aidl +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioStreamType { - INVALID = -2, - SYS_RESERVED_DEFAULT = -1, - VOICE_CALL = 0, - SYSTEM = 1, - RING = 2, - MUSIC = 3, - ALARM = 4, - NOTIFICATION = 5, - BLUETOOTH_SCO = 6, - ENFORCED_AUDIBLE = 7, - DTMF = 8, - TTS = 9, - ACCESSIBILITY = 10, - ASSISTANT = 11, - SYS_RESERVED_REROUTING = 12, - SYS_RESERVED_PATCH = 13, - CALL_ASSISTANT = 14, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl deleted file mode 100644 index 4c7245543cfd..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioUsage { - INVALID = -1, - UNKNOWN = 0, - MEDIA = 1, - VOICE_COMMUNICATION = 2, - VOICE_COMMUNICATION_SIGNALLING = 3, - ALARM = 4, - NOTIFICATION = 5, - NOTIFICATION_TELEPHONY_RINGTONE = 6, - SYS_RESERVED_NOTIFICATION_COMMUNICATION_REQUEST = 7, - SYS_RESERVED_NOTIFICATION_COMMUNICATION_INSTANT = 8, - SYS_RESERVED_NOTIFICATION_COMMUNICATION_DELAYED = 9, - NOTIFICATION_EVENT = 10, - ASSISTANCE_ACCESSIBILITY = 11, - ASSISTANCE_NAVIGATION_GUIDANCE = 12, - ASSISTANCE_SONIFICATION = 13, - GAME = 14, - VIRTUAL_SOURCE = 15, - ASSISTANT = 16, - CALL_ASSISTANT = 17, - EMERGENCY = 1000, - SAFETY = 1001, - VEHICLE_STATUS = 1002, - ANNOUNCEMENT = 1003, -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUuid.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUuid.aidl deleted file mode 100644 index af307dadf3a3..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUuid.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable AudioUuid { - int timeLow; - int timeMid; - int timeHiAndVersion; - int clockSeq; - byte[] node; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Boolean.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Boolean.aidl deleted file mode 100644 index bc996e441ba3..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Boolean.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Boolean { - boolean value; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Byte.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Byte.aidl deleted file mode 100644 index 604e74dbf560..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Byte.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Byte { - byte value; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Double.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Double.aidl deleted file mode 100644 index a525629f2753..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Double.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Double { - double value; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/ExtraAudioDescriptor.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/ExtraAudioDescriptor.aidl deleted file mode 100644 index 2ae2405f544e..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/ExtraAudioDescriptor.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable ExtraAudioDescriptor { - android.media.audio.common.AudioStandard standard = android.media.audio.common.AudioStandard.NONE; - byte[] audioDescriptor; - android.media.audio.common.AudioEncapsulationType encapsulationType = android.media.audio.common.AudioEncapsulationType.NONE; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Float.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Float.aidl deleted file mode 100644 index af98eab83dfd..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Float.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Float { - float value; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Int.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Int.aidl deleted file mode 100644 index b0d3c4922531..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Int.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Int { - int value; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Long.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Long.aidl deleted file mode 100644 index e403dd3fd4ea..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/Long.aidl +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Long { - long value; -} diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/PcmType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/PcmType.aidl deleted file mode 100644 index 79bfa625ba8e..000000000000 --- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/PcmType.aidl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.audio.common; -/* @hide */ -@Backing(type="byte") @VintfStability -enum PcmType { - DEFAULT = 0, - UINT_8_BIT = 0, - INT_16_BIT = 1, - INT_32_BIT = 2, - FIXED_Q_8_24 = 3, - FLOAT_32_BIT = 4, - INT_24_BIT = 5, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/.hash b/media/aidl_api/android.media.soundtrigger.types/1/.hash deleted file mode 100644 index 52fd9ff1c053..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/.hash +++ /dev/null @@ -1 +0,0 @@ -8c9bb119feca43f118028b89bd5d1077bc23bb39 diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/AudioCapabilities.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/AudioCapabilities.aidl deleted file mode 100644 index 5d88305484d0..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/AudioCapabilities.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioCapabilities { - ECHO_CANCELLATION = 1, - NOISE_SUPPRESSION = 2, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/ConfidenceLevel.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/ConfidenceLevel.aidl deleted file mode 100644 index 5127a110efc5..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/ConfidenceLevel.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable ConfidenceLevel { - int userId; - int levelPercent; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/ModelParameter.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/ModelParameter.aidl deleted file mode 100644 index aadbf80b4f96..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/ModelParameter.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum ModelParameter { - INVALID = -1, - THRESHOLD_FACTOR = 0, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/ModelParameterRange.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/ModelParameterRange.aidl deleted file mode 100644 index f29b7284a275..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/ModelParameterRange.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable ModelParameterRange { - int minInclusive; - int maxInclusive; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/Phrase.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/Phrase.aidl deleted file mode 100644 index 11029ba9d25f..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/Phrase.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Phrase { - int id; - int recognitionModes; - int[] users; - String locale; - String text; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/PhraseRecognitionEvent.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/PhraseRecognitionEvent.aidl deleted file mode 100644 index b75d1b83c72a..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/PhraseRecognitionEvent.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable PhraseRecognitionEvent { - android.media.soundtrigger.RecognitionEvent common; - android.media.soundtrigger.PhraseRecognitionExtra[] phraseExtras; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/PhraseRecognitionExtra.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/PhraseRecognitionExtra.aidl deleted file mode 100644 index e417c69454a5..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/PhraseRecognitionExtra.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable PhraseRecognitionExtra { - int id; - int recognitionModes; - int confidenceLevel; - android.media.soundtrigger.ConfidenceLevel[] levels; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/PhraseSoundModel.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/PhraseSoundModel.aidl deleted file mode 100644 index b4b3854d4926..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/PhraseSoundModel.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable PhraseSoundModel { - android.media.soundtrigger.SoundModel common; - android.media.soundtrigger.Phrase[] phrases; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/Properties.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/Properties.aidl deleted file mode 100644 index 068db52a2a6b..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/Properties.aidl +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Properties { - String implementor; - String description; - int version; - String uuid; - String supportedModelArch; - int maxSoundModels; - int maxKeyPhrases; - int maxUsers; - int recognitionModes; - boolean captureTransition; - int maxBufferMs; - boolean concurrentCapture; - boolean triggerInEvent; - int powerConsumptionMw; - int audioCapabilities; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionConfig.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionConfig.aidl deleted file mode 100644 index 63cd2cbbb797..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionConfig.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable RecognitionConfig { - boolean captureRequested; - android.media.soundtrigger.PhraseRecognitionExtra[] phraseRecognitionExtras; - int audioCapabilities; - byte[] data; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionEvent.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionEvent.aidl deleted file mode 100644 index 0209602a1535..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionEvent.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable RecognitionEvent { - android.media.soundtrigger.RecognitionStatus status = android.media.soundtrigger.RecognitionStatus.INVALID; - android.media.soundtrigger.SoundModelType type = android.media.soundtrigger.SoundModelType.INVALID; - boolean captureAvailable; - int captureDelayMs; - int capturePreambleMs; - boolean triggerInData; - @nullable android.media.audio.common.AudioConfig audioConfig; - byte[] data; - boolean recognitionStillActive; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionMode.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionMode.aidl deleted file mode 100644 index 588291084f4a..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionMode.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum RecognitionMode { - VOICE_TRIGGER = 1, - USER_IDENTIFICATION = 2, - USER_AUTHENTICATION = 4, - GENERIC_TRIGGER = 8, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionStatus.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionStatus.aidl deleted file mode 100644 index 7881c28c7ecf..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/RecognitionStatus.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum RecognitionStatus { - INVALID = -1, - SUCCESS = 0, - ABORTED = 1, - FAILURE = 2, - FORCED = 3, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/SoundModel.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/SoundModel.aidl deleted file mode 100644 index fe382643f3d2..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/SoundModel.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable SoundModel { - android.media.soundtrigger.SoundModelType type = android.media.soundtrigger.SoundModelType.INVALID; - String uuid; - String vendorUuid; - @nullable ParcelFileDescriptor data; - int dataSize; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/SoundModelType.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/SoundModelType.aidl deleted file mode 100644 index ac7864170535..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/SoundModelType.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum SoundModelType { - INVALID = -1, - KEYPHRASE = 0, - GENERIC = 1, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/Status.aidl b/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/Status.aidl deleted file mode 100644 index 29f3167ac196..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/1/android/media/soundtrigger/Status.aidl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum Status { - INVALID = -1, - SUCCESS = 0, - RESOURCE_CONTENTION = 1, - OPERATION_NOT_SUPPORTED = 2, - TEMPORARY_PERMISSION_DENIED = 3, - DEAD_OBJECT = 4, - INTERNAL_ERROR = 5, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/AudioCapabilities.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/AudioCapabilities.aidl deleted file mode 100644 index 5d88305484d0..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/AudioCapabilities.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum AudioCapabilities { - ECHO_CANCELLATION = 1, - NOISE_SUPPRESSION = 2, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/ConfidenceLevel.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/ConfidenceLevel.aidl deleted file mode 100644 index 5127a110efc5..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/ConfidenceLevel.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable ConfidenceLevel { - int userId; - int levelPercent; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/ModelParameter.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/ModelParameter.aidl deleted file mode 100644 index aadbf80b4f96..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/ModelParameter.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum ModelParameter { - INVALID = -1, - THRESHOLD_FACTOR = 0, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/ModelParameterRange.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/ModelParameterRange.aidl deleted file mode 100644 index f29b7284a275..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/ModelParameterRange.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable ModelParameterRange { - int minInclusive; - int maxInclusive; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/Phrase.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/Phrase.aidl deleted file mode 100644 index 11029ba9d25f..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/Phrase.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Phrase { - int id; - int recognitionModes; - int[] users; - String locale; - String text; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/PhraseRecognitionEvent.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/PhraseRecognitionEvent.aidl deleted file mode 100644 index b75d1b83c72a..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/PhraseRecognitionEvent.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable PhraseRecognitionEvent { - android.media.soundtrigger.RecognitionEvent common; - android.media.soundtrigger.PhraseRecognitionExtra[] phraseExtras; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/PhraseRecognitionExtra.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/PhraseRecognitionExtra.aidl deleted file mode 100644 index e417c69454a5..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/PhraseRecognitionExtra.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable PhraseRecognitionExtra { - int id; - int recognitionModes; - int confidenceLevel; - android.media.soundtrigger.ConfidenceLevel[] levels; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/PhraseSoundModel.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/PhraseSoundModel.aidl deleted file mode 100644 index b4b3854d4926..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/PhraseSoundModel.aidl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable PhraseSoundModel { - android.media.soundtrigger.SoundModel common; - android.media.soundtrigger.Phrase[] phrases; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/Properties.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/Properties.aidl deleted file mode 100644 index 068db52a2a6b..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/Properties.aidl +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable Properties { - String implementor; - String description; - int version; - String uuid; - String supportedModelArch; - int maxSoundModels; - int maxKeyPhrases; - int maxUsers; - int recognitionModes; - boolean captureTransition; - int maxBufferMs; - boolean concurrentCapture; - boolean triggerInEvent; - int powerConsumptionMw; - int audioCapabilities; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionConfig.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionConfig.aidl deleted file mode 100644 index 63cd2cbbb797..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionConfig.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable RecognitionConfig { - boolean captureRequested; - android.media.soundtrigger.PhraseRecognitionExtra[] phraseRecognitionExtras; - int audioCapabilities; - byte[] data; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionEvent.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionEvent.aidl deleted file mode 100644 index 0209602a1535..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionEvent.aidl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable RecognitionEvent { - android.media.soundtrigger.RecognitionStatus status = android.media.soundtrigger.RecognitionStatus.INVALID; - android.media.soundtrigger.SoundModelType type = android.media.soundtrigger.SoundModelType.INVALID; - boolean captureAvailable; - int captureDelayMs; - int capturePreambleMs; - boolean triggerInData; - @nullable android.media.audio.common.AudioConfig audioConfig; - byte[] data; - boolean recognitionStillActive; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionMode.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionMode.aidl deleted file mode 100644 index 588291084f4a..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionMode.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum RecognitionMode { - VOICE_TRIGGER = 1, - USER_IDENTIFICATION = 2, - USER_AUTHENTICATION = 4, - GENERIC_TRIGGER = 8, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionStatus.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionStatus.aidl deleted file mode 100644 index 7881c28c7ecf..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/RecognitionStatus.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum RecognitionStatus { - INVALID = -1, - SUCCESS = 0, - ABORTED = 1, - FAILURE = 2, - FORCED = 3, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/SoundModel.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/SoundModel.aidl deleted file mode 100644 index fe382643f3d2..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/SoundModel.aidl +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@JavaDerive(equals=true, toString=true) @VintfStability -parcelable SoundModel { - android.media.soundtrigger.SoundModelType type = android.media.soundtrigger.SoundModelType.INVALID; - String uuid; - String vendorUuid; - @nullable ParcelFileDescriptor data; - int dataSize; -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/SoundModelType.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/SoundModelType.aidl deleted file mode 100644 index ac7864170535..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/SoundModelType.aidl +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum SoundModelType { - INVALID = -1, - KEYPHRASE = 0, - GENERIC = 1, -} diff --git a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/Status.aidl b/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/Status.aidl deleted file mode 100644 index 29f3167ac196..000000000000 --- a/media/aidl_api/android.media.soundtrigger.types/current/android/media/soundtrigger/Status.aidl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/////////////////////////////////////////////////////////////////////////////// -// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // -/////////////////////////////////////////////////////////////////////////////// - -// This file is a snapshot of an AIDL file. Do not edit it manually. There are -// two cases: -// 1). this is a frozen version file - do not edit this in any case. -// 2). this is a 'current' file. If you make a backwards compatible change to -// the interface (from the latest frozen version), the build system will -// prompt you to update this file with `m <name>-update-api`. -// -// You must not make a backward incompatible change to any AIDL file built -// with the aidl_interface module type with versions property set. The module -// type is used to build AIDL files in a way that they can be used across -// independently updatable components of the system. If a device is shipped -// with such a backward incompatible change, it has a high risk of breaking -// later when a module using the interface is updated, e.g., Mainline modules. - -package android.media.soundtrigger; -/* @hide */ -@Backing(type="int") @VintfStability -enum Status { - INVALID = -1, - SUCCESS = 0, - RESOURCE_CONTENTION = 1, - OPERATION_NOT_SUPPORTED = 2, - TEMPORARY_PERMISSION_DENIED = 3, - DEAD_OBJECT = 4, - INTERNAL_ERROR = 5, -} diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java index b8e7930e1dca..ad4feecf7d3c 100644 --- a/media/java/android/media/MediaMuxer.java +++ b/media/java/android/media/MediaMuxer.java @@ -335,13 +335,13 @@ final public class MediaMuxer { } /** - * Constructor. * Creates a media muxer that writes to the specified path. + * <p>The caller must not use the file {@code path} before calling {@link #stop}. * @param path The path of the output media file. * @param format The format of the output media file. * @see android.media.MediaMuxer.OutputFormat * @throws IllegalArgumentException if path is invalid or format is not supported. - * @throws IOException if failed to open the file for write. + * @throws IOException if an error occurs while opening or creating the output file. */ public MediaMuxer(@NonNull String path, @Format int format) throws IOException { if (path == null) { @@ -363,16 +363,19 @@ final public class MediaMuxer { } /** - * Constructor. - * Creates a media muxer that writes to the specified FileDescriptor. File descriptor - * must be seekable and writable. Application should not use the file referenced - * by this file descriptor until {@link #stop}. It is the application's responsibility - * to close the file descriptor. It is safe to do so as soon as this call returns. - * @param fd The FileDescriptor of the output media file. + * Creates a media muxer that writes to the specified FileDescriptor. + * <p>The caller must not use the file referenced by the specified {@code fd} before calling + * {@link #stop}. + * <p>It is the caller's responsibility to close the file descriptor, which is safe to do so + * as soon as this call returns. + * @param fd The FileDescriptor of the output media file. If {@code format} is + * {@link OutputFormat#MUXER_OUTPUT_WEBM}, {@code fd} must be open in read-write mode. + * Otherwise, write mode is sufficient, but read-write is also accepted. * @param format The format of the output media file. * @see android.media.MediaMuxer.OutputFormat - * @throws IllegalArgumentException if fd is invalid or format is not supported. - * @throws IOException if failed to open the file for write. + * @throws IllegalArgumentException if {@code format} is not supported, or if {@code fd} is + * not open in the expected mode. + * @throws IOException if an error occurs while performing an IO operation. */ public MediaMuxer(@NonNull FileDescriptor fd, @Format int format) throws IOException { setUpMediaMuxer(fd, format); diff --git a/media/java/android/media/OWNERS b/media/java/android/media/OWNERS index 813dee3d3e71..1f9a51d0aa07 100644 --- a/media/java/android/media/OWNERS +++ b/media/java/android/media/OWNERS @@ -7,3 +7,5 @@ jmtrivi@google.com # go/android-fwk-media-solutions for info on areas of ownership. include platform/frameworks/av:/media/janitors/media_solutions_OWNERS + +per-file *Image* = file:/graphics/java/android/graphics/OWNERS
\ No newline at end of file diff --git a/media/jni/android_media_MediaMuxer.cpp b/media/jni/android_media_MediaMuxer.cpp index 267917653efb..b664325ab0d1 100644 --- a/media/jni/android_media_MediaMuxer.cpp +++ b/media/jni/android_media_MediaMuxer.cpp @@ -165,7 +165,11 @@ static jlong android_media_MediaMuxer_native_setup( MediaMuxer::OutputFormat fileFormat = static_cast<MediaMuxer::OutputFormat>(format); - sp<MediaMuxer> muxer = new MediaMuxer(fd, fileFormat); + sp<MediaMuxer> muxer = MediaMuxer::create(fd, fileFormat); + if (muxer == nullptr) { + jniThrowException(env, "java/lang/IllegalArgumentException", "Muxer creation failed"); + return 0; + } muxer->incStrong(clazz); return reinterpret_cast<jlong>(muxer.get()); } diff --git a/media/tests/EffectsTest/src/com/android/effectstest/BassBoostTest.java b/media/tests/EffectsTest/src/com/android/effectstest/BassBoostTest.java index a207bf1d5359..fa186c3dc0d3 100644 --- a/media/tests/EffectsTest/src/com/android/effectstest/BassBoostTest.java +++ b/media/tests/EffectsTest/src/com/android/effectstest/BassBoostTest.java @@ -304,13 +304,13 @@ public class BassBoostTest extends Activity implements OnCheckedChangeListener { for (int j = 0; j < NUM_EFFECTS; j++) { effects[j] = new BassBoost(0, mSession); effects[j].setControlStatusListener(mEffectListener); - yield(); + this.yield(); } for (int j = NUM_EFFECTS - 1; j >= 0; j--) { Log.w(TAG, "HammerReleaseTest releasing effect " + (Object) effects[j]); effects[j].release(); effects[j] = null; - yield(); + this.yield(); } } Log.w(TAG, "HammerReleaseTest ended"); diff --git a/media/tests/EffectsTest/src/com/android/effectstest/VisualizerTest.java b/media/tests/EffectsTest/src/com/android/effectstest/VisualizerTest.java index dcfe11a79ef9..5d91a2e99230 100644 --- a/media/tests/EffectsTest/src/com/android/effectstest/VisualizerTest.java +++ b/media/tests/EffectsTest/src/com/android/effectstest/VisualizerTest.java @@ -251,13 +251,13 @@ public class VisualizerTest extends Activity implements OnCheckedChangeListener for (int i = 0; i < NUM_ITERATIONS; i++) { for (int j = 0; j < NUM_EFFECTS; j++) { effects[j] = new Visualizer(mSession); - yield(); + this.yield(); } for (int j = NUM_EFFECTS - 1; j >= 0; j--) { Log.w(TAG, "HammerReleaseTest releasing effect " + (Object) effects[j]); effects[j].release(); effects[j] = null; - yield(); + this.yield(); } } Log.w(TAG, "HammerReleaseTest ended"); diff --git a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java index 988055e7d8db..9567a3b38896 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java @@ -41,8 +41,10 @@ public abstract class AbstractPreferenceController { setVisible(screen, prefKey, true /* visible */); if (this instanceof Preference.OnPreferenceChangeListener) { final Preference preference = screen.findPreference(prefKey); - preference.setOnPreferenceChangeListener( - (Preference.OnPreferenceChangeListener) this); + if (preference != null) { + preference.setOnPreferenceChangeListener( + (Preference.OnPreferenceChangeListener) this); + } } } else { setVisible(screen, prefKey, false /* visible */); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java index fe337d267f25..8e33ca338eb1 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java @@ -106,13 +106,20 @@ public class LicenseHtmlGeneratorFromXmlTest { + "license content #1\n" + "</pre><!-- license-text -->\n" + "</td></tr><!-- same-license -->\n" - + "</table></body></html>\n"; + + "</table>\n" + + "<div class=\"path-counts\"><table>\n" + + " <tr><th>Path prefix</th><th>Count</th></tr>\n\n" + + " <tr><td>file0</td><td>1</td></tr>\n" + + " <tr><td>file1</td><td>1</td></tr>\n" + + "</table></div>\n\n" + + "</body></html>\n"; private static final String HTML_NEW_BODY_STRING = "<strong>Libraries</strong>\n" + "<ul class=\"libraries\">\n" + "<li><a href=\"#id0\">libA</a></li>\n" + "<li><a href=\"#id1\">libB</a></li>\n" + + "<li><a href=\"#id0\">libC</a></li>\n" + "</ul>\n" + "<strong>Files</strong>\n" + "<ul class=\"files\">\n" @@ -146,7 +153,14 @@ public class LicenseHtmlGeneratorFromXmlTest { + "license content #1\n" + "</pre><!-- license-text -->\n" + "</td></tr><!-- same-license -->\n" - + "</table></body></html>\n"; + + "</table>\n" + + "<div class=\"path-counts\"><table>\n" + + " <tr><th>Path prefix</th><th>Count</th></tr>\n\n" + + " <tr><td>file0</td><td>1</td></tr>\n" + + " <tr><td>file1</td><td>1</td></tr>\n" + + " <tr><td>file2</td><td>1</td></tr>\n" + + "</table></div>\n\n" + + "</body></html>\n"; private static final String EXPECTED_OLD_HTML_STRING = HTML_HEAD_STRING + HTML_OLD_BODY_STRING; @@ -263,7 +277,7 @@ public class LicenseHtmlGeneratorFromXmlTest { Map<String, Set<String>> toOne = new HashMap<>(); toBoth.put("", new HashSet<String>(Arrays.asList("0", "1"))); - toOne.put("", new HashSet<String>(Arrays.asList("0", "1"))); + toOne.put("", new HashSet<String>(Arrays.asList("0"))); fileNameToLibraryToContentIdMap.put("/file0", toBoth); fileNameToLibraryToContentIdMap.put("/file1", toOne); diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index b971f7a70ca9..979e9eaa1e84 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -680,6 +680,9 @@ <!-- Permission required for CTS test - Notification test suite --> <uses-permission android:name="android.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL" /> + <!-- Permission required for test - CellBroadcastComplianceTest --> + <uses-permission android:name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" /> + <!-- Permission required for CTS test - CaptioningManagerTest --> <uses-permission android:name="android.permission.SET_SYSTEM_AUDIO_CAPTION" /> diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index 104998c53e09..0333b2d779df 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -228,7 +228,7 @@ android_library { "metrics-helper-lib", "hamcrest-library", "androidx.test.rules", - "androidx.test.uiautomator", + "androidx.test.uiautomator_uiautomator", "mockito-target-extended-minus-junit4", "testables", "truth-prebuilt", diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS index 9ef772ec95ec..3c02b880a871 100644 --- a/packages/SystemUI/OWNERS +++ b/packages/SystemUI/OWNERS @@ -5,16 +5,21 @@ set noparent dsandler@android.com aaliomer@google.com +aaronjli@google.com adamcohen@google.com alexflo@google.com asc@google.com awickham@google.com +ayepin@google.com +bbade@google.com beverlyt@google.com -brockman@google.com -brzezinski@google.com +bhnm@google.com brycelee@google.com +brzezinski@google.com caitlinshk@google.com +chandruis@google.com chrisgollner@google.com +cinek@google.com dupin@google.com ethibodeau@google.com evanlaird@google.com @@ -35,11 +40,16 @@ joshtrask@google.com juliacr@google.com juliatuttle@google.com justinkoh@google.com +justinweir@google.com kozynski@google.com kprevas@google.com +lusilva@google.com lynhan@google.com madym@google.com mankoff@google.com +mateuszc@google.com +michaelmikhil@google.com +michschn@google.com mkephart@google.com mpietal@google.com mrcasey@google.com @@ -47,6 +57,7 @@ mrenouf@google.com nickchameyev@google.com nicomazz@google.com ogunwale@google.com +patmanning@google.com peanutbutter@google.com peskal@google.com pinyaoting@google.com @@ -54,14 +65,14 @@ pixel@google.com pomini@google.com rahulbanerjee@google.com roosa@google.com +saff@google.com santie@google.com shanh@google.com snoeberger@google.com steell@google.com -sfufa@google.com stwu@google.com +syeonlee@google.com sunnygoyal@google.com -susikp@google.com thiruram@google.com tracyzhou@google.com tsuji@google.com @@ -70,10 +81,14 @@ vadimt@google.com victortulias@google.com winsonc@google.com wleshner@google.com +xilei@google.com xuqiu@google.com +yeinj@google.com yuandizhou@google.com yurilin@google.com zakcohen@google.com +zoepage@google.com #Android TV rgl@google.com + diff --git a/packages/SystemUI/tests/Android.bp b/packages/SystemUI/tests/Android.bp new file mode 100644 index 000000000000..3c418ed49adc --- /dev/null +++ b/packages/SystemUI/tests/Android.bp @@ -0,0 +1,50 @@ +// +// Copyright (C) 2022 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +package { + default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"], +} + +android_test { + name: "SystemUITests", + + dxflags: ["--multi-dex"], + platform_apis: true, + test_suites: ["device-tests"], + static_libs: ["SystemUI-tests"], + compile_multilib: "both", + + jni_libs: [ + "libdexmakerjvmtiagent", + "libmultiplejvmtiagentsinterferenceagent", + "libstaticjvmtiagent", + ], + libs: [ + "android.test.runner", + "telephony-common", + "android.test.base", + ], + aaptflags: [ + "--extra-packages com.android.systemui", + ], + + // sign this with platform cert, so this test is allowed to inject key events into + // UI it doesn't own. This is necessary to allow screenshots to be taken + certificate: "platform", + + additional_manifests: ["AndroidManifest.xml"], + manifest: "AndroidManifest-base.xml", +} diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk deleted file mode 100644 index ff5165d4e7cf..000000000000 --- a/packages/SystemUI/tests/Android.mk +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (C) 2011 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true -LOCAL_MODULE_TAGS := tests - -LOCAL_JACK_FLAGS := --multi-dex native -LOCAL_DX_FLAGS := --multi-dex - -LOCAL_PACKAGE_NAME := SystemUITests -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - SystemUI-tests - -LOCAL_MULTILIB := both - -LOCAL_JNI_SHARED_LIBRARIES := \ - libdexmakerjvmtiagent \ - libmultiplejvmtiagentsinterferenceagent \ - libstaticjvmtiagent - -LOCAL_JAVA_LIBRARIES := \ - android.test.runner \ - telephony-common \ - android.test.base \ - -LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui - -# sign this with platform cert, so this test is allowed to inject key events into -# UI it doesn't own. This is necessary to allow screenshots to be taken -LOCAL_CERTIFICATE := platform - -LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest.xml -LOCAL_MANIFEST_FILE := AndroidManifest-base.xml - -# Provide jack a list of classes to exclude from code coverage. -# This is needed because the SystemUITests compile SystemUI source directly, rather than using -# LOCAL_INSTRUMENTATION_FOR := SystemUI. -# -# We want to exclude the test classes from code coverage measurements, but they share the same -# package as the rest of SystemUI so they can't be easily filtered by package name. -# -# Generate a comma separated list of patterns based on the test source files under src/ -# SystemUI classes are in ../src/ so they won't be excluded. -# Example: -# Input files: src/com/android/systemui/Test.java src/com/android/systemui/AnotherTest.java -# Generated exclude list: com.android.systemui.Test*,com.android.systemui.AnotherTest* - -# Filter all src files under src/ to just java files -local_java_files := $(filter %.java,$(call all-java-files-under, src)) -# Transform java file names into full class names. -# This only works if the class name matches the file name and the directory structure -# matches the package. -local_classes := $(subst /,.,$(patsubst src/%.java,%,$(local_java_files))) -local_comma := , -local_empty := -local_space := $(local_empty) $(local_empty) -# Convert class name list to jacoco exclude list -# This appends a * to all classes and replace the space separators with commas. -jacoco_exclude := $(subst $(space),$(comma),$(patsubst %,%*,$(local_classes))) - -LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.systemui.*,com.android.keyguard.* -LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := $(jacoco_exclude) - -ifeq ($(EXCLUDE_SYSTEMUI_TESTS),) - include $(BUILD_PACKAGE) -endif - -# Reset variables -local_java_files := -local_classes := -local_comma := -local_space := -jacoco_exclude := diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java index bf4c02d83883..952e85a310bc 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java @@ -906,6 +906,9 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo mServiceDetectsGestures.put(displayId, mode); } + public void resetServiceDetectsGestures() { + mServiceDetectsGestures.clear(); + } public void requestTouchExploration(int displayId) { if (mTouchExplorer.contains(displayId)) { mTouchExplorer.get(displayId).requestTouchExploration(); diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 73793c7a8abe..cdfa0c0411e4 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -2304,6 +2304,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub if (userState.isTwoFingerPassthroughEnabledLocked()) { flags |= AccessibilityInputFilter.FLAG_REQUEST_2_FINGER_PASSTHROUGH; } + } if (userState.isFilterKeyEventsEnabledLocked()) { flags |= AccessibilityInputFilter.FLAG_FEATURE_FILTER_KEY_EVENTS; } @@ -2321,26 +2322,27 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub if (!mHasInputFilter) { mHasInputFilter = true; if (mInputFilter == null) { - mInputFilter = new AccessibilityInputFilter(mContext, - AccessibilityManagerService.this); + mInputFilter = + new AccessibilityInputFilter( + mContext, AccessibilityManagerService.this); } inputFilter = mInputFilter; setInputFilter = true; } mInputFilter.setUserAndEnabledFeatures(userState.mUserId, flags); } else { - if (mHasInputFilter) { - mHasInputFilter = false; - mInputFilter.setUserAndEnabledFeatures(userState.mUserId, 0); - if (userState.isTouchExplorationEnabledLocked()) { - // Service gesture detection is turned on and off on a per-display - // basis. - final ArrayList<Display> displays = getValidDisplayList(); - for (Display display : displays) { - int displayId = display.getDisplayId(); - boolean mode = userState.isServiceDetectsGesturesEnabled(displayId); - mInputFilter.setServiceDetectsGesturesEnabled(displayId, mode); - } + if (mHasInputFilter) { + mHasInputFilter = false; + mInputFilter.setUserAndEnabledFeatures(userState.mUserId, 0); + mInputFilter.resetServiceDetectsGestures(); + if (userState.isTouchExplorationEnabledLocked()) { + // Service gesture detection is turned on and off on a per-display + // basis. + final ArrayList<Display> displays = getValidDisplayList(); + for (Display display : displays) { + int displayId = display.getDisplayId(); + boolean mode = userState.isServiceDetectsGesturesEnabled(displayId); + mInputFilter.setServiceDetectsGesturesEnabled(displayId, mode); } } inputFilter = null; @@ -2658,6 +2660,18 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub Binder.restoreCallingIdentity(identity); } } + // Service gesture detection is turned on and off on a per-display + // basis. + userState.resetServiceDetectsGestures(); + final ArrayList<Display> displays = getValidDisplayList(); + for (AccessibilityServiceConnection service: userState.mBoundServices) { + for (Display display : displays) { + int displayId = display.getDisplayId(); + if (service.isServiceDetectsGesturesEnabled(displayId)) { + userState.setServiceDetectsGesturesEnabled(displayId, true); + } + } + } userState.setServiceHandlesDoubleTapLocked(serviceHandlesDoubleTapEnabled); userState.setMultiFingerGesturesLocked(requestMultiFingerGestures); userState.setTwoFingerPassthroughLocked(requestTwoFingerPassthrough); diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java index 0e8f3c0c0cbe..a0fc8d30f64c 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityUserState.java @@ -994,6 +994,9 @@ class AccessibilityUserState { mServiceDetectsGestures.put(displayId, mode); } + public void resetServiceDetectsGestures() { + mServiceDetectsGestures.clear(); + } public boolean isServiceDetectsGesturesEnabled(int displayId) { if (mServiceDetectsGestures.contains(displayId)) { return mServiceDetectsGestures.get(displayId); diff --git a/services/backup/OWNERS b/services/backup/OWNERS index 852c689ae020..79709a3319c8 100644 --- a/services/backup/OWNERS +++ b/services/backup/OWNERS @@ -1,10 +1,13 @@ -# Bug component: 656484 +# Bug component: 1193469 + +set noparent bryanmawhinney@google.com jstemmer@google.com +martinoh@google.com millmore@google.com -nathch@google.com -niagra@google.com niamhfw@google.com +piee@google.com philippov@google.com rthakohov@google.com +sarpm@google.com diff --git a/services/companion/java/com/android/server/companion/virtual/OWNERS b/services/companion/java/com/android/server/companion/virtual/OWNERS index b3c3a4d3a192..5e8291fe5587 100644 --- a/services/companion/java/com/android/server/companion/virtual/OWNERS +++ b/services/companion/java/com/android/server/companion/virtual/OWNERS @@ -2,3 +2,4 @@ set noparent ogunwale@google.com michaelwr@google.com +vladokom@google.com
\ No newline at end of file diff --git a/services/core/Android.bp b/services/core/Android.bp index b00d72b16372..d35c07f1962a 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -153,6 +153,8 @@ java_library_static { "android.hardware.health-translate-java", "android.hardware.light-V1-java", "android.hardware.tv.cec-V1.1-java", + "android.hardware.tv.cec-V1-java", + "android.hardware.tv.hdmi-V1-java", "android.hardware.weaver-V1.0-java", "android.hardware.biometrics.face-V1.0-java", "android.hardware.biometrics.fingerprint-V2.3-java", diff --git a/services/core/java/com/android/server/NetworkTimeUpdateService.java b/services/core/java/com/android/server/NetworkTimeUpdateService.java index 2015dc929a59..804d7f3b7d60 100644 --- a/services/core/java/com/android/server/NetworkTimeUpdateService.java +++ b/services/core/java/com/android/server/NetworkTimeUpdateService.java @@ -165,9 +165,14 @@ public class NetworkTimeUpdateService extends Binder { mContext.enforceCallingPermission( android.Manifest.permission.SET_TIME, "clear latest network time"); - mTime.clearCachedTimeResult(); + final long token = Binder.clearCallingIdentity(); + try { + mTime.clearCachedTimeResult(); - mLocalLog.log("clearTimeForTests"); + mLocalLog.log("clearTimeForTests"); + } finally { + Binder.restoreCallingIdentity(token); + } } /** @@ -181,15 +186,19 @@ public class NetworkTimeUpdateService extends Binder { mContext.enforceCallingPermission( android.Manifest.permission.SET_TIME, "force network time refresh"); - boolean success = mTime.forceRefresh(); - mLocalLog.log("forceRefreshForTests: success=" + success); + final long token = Binder.clearCallingIdentity(); + try { + boolean success = mTime.forceRefresh(); + mLocalLog.log("forceRefreshForTests: success=" + success); - if (success) { - makeNetworkTimeSuggestion(mTime.getCachedTimeResult(), - "Origin: NetworkTimeUpdateService: forceRefreshForTests"); + if (success) { + makeNetworkTimeSuggestion(mTime.getCachedTimeResult(), + "Origin: NetworkTimeUpdateService: forceRefreshForTests"); + } + return success; + } finally { + Binder.restoreCallingIdentity(token); } - - return success; } /** @@ -201,10 +210,15 @@ public class NetworkTimeUpdateService extends Binder { mContext.enforceCallingPermission( android.Manifest.permission.SET_TIME, "set NTP server config for tests"); - mLocalLog.log("Setting server config for tests: hostname=" + hostname - + ", port=" + port - + ", timeout=" + timeout); - mTime.setServerConfigForTests(hostname, port, timeout); + final long token = Binder.clearCallingIdentity(); + try { + mLocalLog.log("Setting server config for tests: hostname=" + hostname + + ", port=" + port + + ", timeout=" + timeout); + mTime.setServerConfigForTests(hostname, port, timeout); + } finally { + Binder.restoreCallingIdentity(token); + } } private void onPollNetworkTime(int event) { diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index b86fe7ec4c32..f7b05f2b895a 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -373,7 +373,7 @@ class StorageManagerService extends IStorageManager.Stub private volatile boolean mChargingRequired; private volatile int mMinGCSleepTime; private volatile int mTargetDirtyRatio; - private volatile boolean mNeedGC; + private volatile boolean mNeedGC = true; private volatile boolean mPassedLifetimeThresh; // Tracking storage write amounts in one period diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index 9a5171243864..8e179b942d1e 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -424,7 +424,7 @@ import java.util.concurrent.atomic.AtomicBoolean; AudioDeviceAttributes device = crc != null ? crc.getDevice() : null; if (AudioService.DEBUG_COMM_RTE) { Log.v(TAG, "requestedCommunicationDevice, device: " - + device + "mAudioModeOwner: " + mAudioModeOwner.toString()); + + device + " mAudioModeOwner: " + mAudioModeOwner.toString()); } return device; } diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 6a53978175af..6795b6b4158d 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -21,6 +21,7 @@ import static android.Manifest.permission.CONTROL_VPN; import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN; +import static android.net.NetworkCapabilities.TRANSPORT_VPN; import static android.net.RouteInfo.RTN_THROW; import static android.net.RouteInfo.RTN_UNREACHABLE; import static android.net.VpnManager.NOTIFICATION_CHANNEL_VPN; @@ -51,6 +52,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; +import android.net.ConnectivityDiagnosticsManager; import android.net.ConnectivityManager; import android.net.DnsResolver; import android.net.INetd; @@ -234,6 +236,7 @@ public class Vpn { private final Context mContext; private final ConnectivityManager mConnectivityManager; private final AppOpsManager mAppOpsManager; + private final ConnectivityDiagnosticsManager mConnectivityDiagnosticsManager; // The context is for specific user which is created from mUserId private final Context mUserIdContext; @VisibleForTesting final Dependencies mDeps; @@ -549,6 +552,8 @@ public class Vpn { mConnectivityManager = mContext.getSystemService(ConnectivityManager.class); mAppOpsManager = mContext.getSystemService(AppOpsManager.class); mUserIdContext = context.createContextAsUser(UserHandle.of(userId), 0 /* flags */); + mConnectivityDiagnosticsManager = + mContext.getSystemService(ConnectivityDiagnosticsManager.class); mDeps = deps; mNms = netService; mNetd = netd; @@ -2739,6 +2744,7 @@ public class Vpn { @Nullable private IkeSessionWrapper mSession; @Nullable private IkeSessionConnectionInfo mIkeConnectionInfo; + @Nullable private VpnConnectivityDiagnosticsCallback mDiagnosticsCallback; // mMobikeEnabled can only be updated after IKE AUTH is finished. private boolean mMobikeEnabled = false; @@ -2797,6 +2803,15 @@ public class Vpn { mConnectivityManager.registerSystemDefaultNetworkCallback(mNetworkCallback, new Handler(mLooper)); } + + // DiagnosticsCallback may return more than one alive VPNs, but VPN will filter based on + // Network object. + final NetworkRequest diagRequest = new NetworkRequest.Builder() + .addTransportType(TRANSPORT_VPN) + .removeCapability(NET_CAPABILITY_NOT_VPN).build(); + mDiagnosticsCallback = new VpnConnectivityDiagnosticsCallback(); + mConnectivityDiagnosticsManager.registerConnectivityDiagnosticsCallback( + diagRequest, mExecutor, mDiagnosticsCallback); } private boolean isActiveNetwork(@Nullable Network network) { @@ -3066,22 +3081,28 @@ public class Vpn { return; } - try { - if (mSession != null && mMobikeEnabled) { - // IKE session can schedule a migration event only when IKE AUTH is finished - // and mMobikeEnabled is true. - Log.d( - TAG, - "Migrate IKE Session with token " - + mCurrentToken - + " to network " - + underlyingNetwork); - mSession.setNetwork(underlyingNetwork); - return; - } + if (maybeMigrateIkeSession(underlyingNetwork)) return; + + startIkeSession(underlyingNetwork); + } - Log.d(TAG, "Start new IKE session on network " + underlyingNetwork); + boolean maybeMigrateIkeSession(@NonNull Network underlyingNetwork) { + if (mSession == null || !mMobikeEnabled) return false; + // IKE session can schedule a migration event only when IKE AUTH is finished + // and mMobikeEnabled is true. + Log.d(TAG, "Migrate IKE Session with token " + + mCurrentToken + + " to network " + + underlyingNetwork); + mSession.setNetwork(underlyingNetwork); + return true; + } + + private void startIkeSession(@NonNull Network underlyingNetwork) { + Log.d(TAG, "Start new IKE session on network " + underlyingNetwork); + + try { // Clear mInterface to prevent Ikev2VpnRunner being cleared when // interfaceRemoved() is called. synchronized (Vpn.this) { @@ -3169,6 +3190,28 @@ public class Vpn { mUnderlyingLinkProperties = lp; } + class VpnConnectivityDiagnosticsCallback + extends ConnectivityDiagnosticsManager.ConnectivityDiagnosticsCallback { + // The callback runs in the executor thread. + @Override + public void onDataStallSuspected( + ConnectivityDiagnosticsManager.DataStallReport report) { + synchronized (Vpn.this) { + // Ignore stale runner. + if (mVpnRunner != Vpn.IkeV2VpnRunner.this) return; + + // Handle the report only for current VPN network. + if (mNetworkAgent != null + && mNetworkAgent.getNetwork().equals(report.getNetwork())) { + Log.d(TAG, "Data stall suspected"); + + // Trigger MOBIKE. + maybeMigrateIkeSession(mActiveNetwork); + } + } + } + } + /** * Handles loss of the default underlying network * @@ -3463,6 +3506,8 @@ public class Vpn { resetIkeState(); mConnectivityManager.unregisterNetworkCallback(mNetworkCallback); + mConnectivityDiagnosticsManager.unregisterConnectivityDiagnosticsCallback( + mDiagnosticsCallback); mExecutor.shutdown(); } diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java index 1a568c30c899..bf0052d31826 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecController.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java @@ -19,20 +19,25 @@ package com.android.server.hdmi; import android.annotation.NonNull; import android.annotation.Nullable; import android.hardware.hdmi.HdmiPortInfo; -import android.hardware.tv.cec.V1_0.CecMessage; +import android.hardware.tv.cec.CecMessage; +import android.hardware.tv.cec.IHdmiCec; +import android.hardware.tv.cec.IHdmiCecCallback; import android.hardware.tv.cec.V1_0.HotplugEvent; -import android.hardware.tv.cec.V1_0.IHdmiCec; import android.hardware.tv.cec.V1_0.IHdmiCec.getPhysicalAddressCallback; -import android.hardware.tv.cec.V1_0.IHdmiCecCallback; +import android.hardware.tv.cec.V1_0.OptionKey; import android.hardware.tv.cec.V1_0.Result; import android.hardware.tv.cec.V1_0.SendMessageResult; +import android.hardware.tv.hdmi.IHdmi; +import android.hardware.tv.hdmi.IHdmiCallback; import android.icu.util.IllformedLocaleException; import android.icu.util.ULocale; import android.os.Binder; import android.os.Handler; +import android.os.IBinder; import android.os.IHwBinder; import android.os.Looper; import android.os.RemoteException; +import android.os.ServiceManager; import android.stats.hdmi.HdmiStatsEnums; import android.util.Slog; @@ -168,8 +173,14 @@ final class HdmiCecController { * returns {@code null}. */ static HdmiCecController create(HdmiControlService service, HdmiCecAtomWriter atomWriter) { - HdmiCecController controller = createWithNativeWrapper(service, new NativeWrapperImpl11(), - atomWriter); + HdmiCecController controller = + createWithNativeWrapper(service, new NativeWrapperImplAidl(), atomWriter); + if (controller != null) { + return controller; + } + HdmiLogger.warning("Unable to use CEC and HDMI AIDL HALs"); + + controller = createWithNativeWrapper(service, new NativeWrapperImpl11(), atomWriter); if (controller != null) { return controller; } @@ -360,16 +371,43 @@ final class HdmiCecController { } /** - * Set an option to CEC HAL. + * Configures the TV panel device wakeup behaviour in standby mode when it receives an OTP + * (One Touch Play) from a source device. + * + * @param value If true, the TV device will wake up when OTP is received and if false, the TV + * device will not wake up for an OTP. + */ + @ServiceThreadOnly + void enableWakeupByOtp(boolean enabled) { + assertRunOnServiceThread(); + HdmiLogger.debug("enableWakeupByOtp: %b", enabled); + mNativeWrapperImpl.enableWakeupByOtp(enabled); + } + + /** + * Switch to enable or disable CEC on the device. + * + * @param value If true, the device will have all CEC functionalities and if false, the device + * will not perform any CEC functions. + */ + @ServiceThreadOnly + void enableCec(boolean enabled) { + assertRunOnServiceThread(); + HdmiLogger.debug("enableCec: %b", enabled); + mNativeWrapperImpl.enableCec(enabled); + } + + /** + * Configures the module that processes CEC messages - the Android framework or the HAL. * - * @param flag key of option - * @param enabled whether to enable/disable the given option. + * @param value If true, the Android framework will actively process CEC messages and if false, + * only the HAL will process the CEC messages. */ @ServiceThreadOnly - void setOption(int flag, boolean enabled) { + void enableSystemCecControl(boolean enabled) { assertRunOnServiceThread(); - HdmiLogger.debug("setOption: [flag:%d, enabled:%b]", flag, enabled); - mNativeWrapperImpl.nativeSetOption(flag, enabled); + HdmiLogger.debug("enableSystemCecControl: %b", enabled); + mNativeWrapperImpl.enableSystemCecControl(enabled); } /** @@ -819,12 +857,233 @@ final class HdmiCecController { int nativeGetVersion(); int nativeGetVendorId(); HdmiPortInfo[] nativeGetPortInfos(); - void nativeSetOption(int flag, boolean enabled); + + void enableWakeupByOtp(boolean enabled); + + void enableCec(boolean enabled); + + void enableSystemCecControl(boolean enabled); + void nativeSetLanguage(String language); void nativeEnableAudioReturnChannel(int port, boolean flag); boolean nativeIsConnected(int port); } + private static final class NativeWrapperImplAidl + implements NativeWrapper, IBinder.DeathRecipient { + private IHdmiCec mHdmiCec; + private IHdmi mHdmi; + @Nullable private HdmiCecCallback mCallback; + + private final Object mLock = new Object(); + + @Override + public String nativeInit() { + return connectToHal() ? mHdmiCec.toString() + " " + mHdmi.toString() : null; + } + + boolean connectToHal() { + mHdmiCec = + IHdmiCec.Stub.asInterface( + ServiceManager.getService(IHdmiCec.DESCRIPTOR + "/default")); + if (mHdmiCec == null) { + HdmiLogger.error("Could not initialize HDMI CEC AIDL HAL"); + return false; + } + try { + mHdmiCec.asBinder().linkToDeath(this, 0); + } catch (RemoteException e) { + HdmiLogger.error("Couldn't link to death : ", e); + } + + mHdmi = + IHdmi.Stub.asInterface( + ServiceManager.getService(IHdmi.DESCRIPTOR + "/default")); + if (mHdmi == null) { + HdmiLogger.error("Could not initialize HDMI AIDL HAL"); + return false; + } + try { + mHdmi.asBinder().linkToDeath(this, 0); + } catch (RemoteException e) { + HdmiLogger.error("Couldn't link to death : ", e); + } + return true; + } + + @Override + public void binderDied() { + // One of the services died, try to reconnect to both. + mHdmiCec.asBinder().unlinkToDeath(this, 0); + mHdmi.asBinder().unlinkToDeath(this, 0); + HdmiLogger.error("HDMI or CEC service died, reconnecting"); + connectToHal(); + // Reconnect the callback + if (mCallback != null) { + setCallback(mCallback); + } + } + + @Override + public void setCallback(HdmiCecCallback callback) { + mCallback = callback; + try { + // Create an AIDL callback that can callback onCecMessage + mHdmiCec.setCallback(new HdmiCecCallbackAidl(callback)); + } catch (RemoteException e) { + HdmiLogger.error("Couldn't initialise tv.cec callback : ", e); + } + try { + // Create an AIDL callback that can callback onHotplugEvent + mHdmi.setCallback(new HdmiCallbackAidl(callback)); + } catch (RemoteException e) { + HdmiLogger.error("Couldn't initialise tv.hdmi callback : ", e); + } + } + + @Override + public int nativeSendCecCommand(int srcAddress, int dstAddress, byte[] body) { + CecMessage message = new CecMessage(); + message.initiator = (byte) (srcAddress & 0xF); + message.destination = (byte) (dstAddress & 0xF); + message.body = body; + try { + return mHdmiCec.sendMessage(message); + } catch (RemoteException e) { + HdmiLogger.error("Failed to send CEC message : ", e); + return SendMessageResult.FAIL; + } + } + + @Override + public int nativeAddLogicalAddress(int logicalAddress) { + try { + return mHdmiCec.addLogicalAddress((byte) logicalAddress); + } catch (RemoteException e) { + HdmiLogger.error("Failed to add a logical address : ", e); + return Result.FAILURE_INVALID_ARGS; + } + } + + @Override + public void nativeClearLogicalAddress() { + try { + mHdmiCec.clearLogicalAddress(); + } catch (RemoteException e) { + HdmiLogger.error("Failed to clear logical address : ", e); + } + } + + @Override + public int nativeGetPhysicalAddress() { + try { + return mHdmiCec.getPhysicalAddress(); + } catch (RemoteException e) { + HdmiLogger.error("Failed to get physical address : ", e); + return INVALID_PHYSICAL_ADDRESS; + } + } + + @Override + public int nativeGetVersion() { + try { + return mHdmiCec.getCecVersion(); + } catch (RemoteException e) { + HdmiLogger.error("Failed to get cec version : ", e); + return Result.FAILURE_UNKNOWN; + } + } + + @Override + public int nativeGetVendorId() { + try { + return mHdmiCec.getVendorId(); + } catch (RemoteException e) { + HdmiLogger.error("Failed to get vendor id : ", e); + return Result.FAILURE_UNKNOWN; + } + } + + @Override + public void enableWakeupByOtp(boolean enabled) { + try { + mHdmiCec.enableWakeupByOtp(enabled); + } catch (RemoteException e) { + HdmiLogger.error("Failed call to enableWakeupByOtp : ", e); + } + } + + @Override + public void enableCec(boolean enabled) { + try { + mHdmiCec.enableCec(enabled); + } catch (RemoteException e) { + HdmiLogger.error("Failed call to enableCec : ", e); + } + } + + @Override + public void enableSystemCecControl(boolean enabled) { + try { + mHdmiCec.enableSystemCecControl(enabled); + } catch (RemoteException e) { + HdmiLogger.error("Failed call to enableSystemCecControl : ", e); + } + } + + @Override + public void nativeSetLanguage(String language) { + try { + mHdmiCec.setLanguage(language); + } catch (RemoteException e) { + HdmiLogger.error("Failed to set language : ", e); + } + } + + @Override + public void nativeEnableAudioReturnChannel(int port, boolean flag) { + try { + mHdmiCec.enableAudioReturnChannel(port, flag); + } catch (RemoteException e) { + HdmiLogger.error("Failed to enable/disable ARC : ", e); + } + } + + @Override + public HdmiPortInfo[] nativeGetPortInfos() { + try { + android.hardware.tv.hdmi.HdmiPortInfo[] hdmiPortInfos = mHdmi.getPortInfo(); + HdmiPortInfo[] hdmiPortInfo = new HdmiPortInfo[hdmiPortInfos.length]; + int i = 0; + for (android.hardware.tv.hdmi.HdmiPortInfo portInfo : hdmiPortInfos) { + hdmiPortInfo[i] = + new HdmiPortInfo( + portInfo.portId, + portInfo.type, + portInfo.physicalAddress, + portInfo.cecSupported, + false, + portInfo.arcSupported); + i++; + } + return hdmiPortInfo; + } catch (RemoteException e) { + HdmiLogger.error("Failed to get port information : ", e); + return null; + } + } + + @Override + public boolean nativeIsConnected(int port) { + try { + return mHdmi.isConnected(port); + } catch (RemoteException e) { + HdmiLogger.error("Failed to get connection info : ", e); + return false; + } + } + } + private static final class NativeWrapperImpl11 implements NativeWrapper, IHwBinder.DeathRecipient, getPhysicalAddressCallback { private android.hardware.tv.cec.V1_1.IHdmiCec mHdmiCec; @@ -975,8 +1234,7 @@ final class HdmiCecController { } } - @Override - public void nativeSetOption(int flag, boolean enabled) { + private void nativeSetOption(int flag, boolean enabled) { try { mHdmiCec.setOption(flag, enabled); } catch (RemoteException e) { @@ -985,6 +1243,21 @@ final class HdmiCecController { } @Override + public void enableWakeupByOtp(boolean enabled) { + nativeSetOption(OptionKey.WAKEUP, enabled); + } + + @Override + public void enableCec(boolean enabled) { + nativeSetOption(OptionKey.ENABLE_CEC, enabled); + } + + @Override + public void enableSystemCecControl(boolean enabled) { + nativeSetOption(OptionKey.SYSTEM_CEC_CONTROL, enabled); + } + + @Override public void nativeSetLanguage(String language) { try { mHdmiCec.setLanguage(language); @@ -1028,7 +1301,7 @@ final class HdmiCecController { boolean connectToHal() { try { - mHdmiCec = IHdmiCec.getService(true); + mHdmiCec = android.hardware.tv.cec.V1_0.IHdmiCec.getService(true); try { mHdmiCec.linkToDeath(this, HDMI_CEC_HAL_DEATH_COOKIE); } catch (RemoteException e) { @@ -1053,7 +1326,8 @@ final class HdmiCecController { @Override public int nativeSendCecCommand(int srcAddress, int dstAddress, byte[] body) { - CecMessage message = new CecMessage(); + android.hardware.tv.cec.V1_0.CecMessage message = + new android.hardware.tv.cec.V1_0.CecMessage(); message.initiator = srcAddress; message.destination = dstAddress; message.body = new ArrayList<>(body.length); @@ -1141,8 +1415,7 @@ final class HdmiCecController { } } - @Override - public void nativeSetOption(int flag, boolean enabled) { + private void nativeSetOption(int flag, boolean enabled) { try { mHdmiCec.setOption(flag, enabled); } catch (RemoteException e) { @@ -1151,6 +1424,21 @@ final class HdmiCecController { } @Override + public void enableWakeupByOtp(boolean enabled) { + nativeSetOption(OptionKey.WAKEUP, enabled); + } + + @Override + public void enableCec(boolean enabled) { + nativeSetOption(OptionKey.ENABLE_CEC, enabled); + } + + @Override + public void enableSystemCecControl(boolean enabled) { + nativeSetOption(OptionKey.SYSTEM_CEC_CONTROL, enabled); + } + + @Override public void nativeSetLanguage(String language) { try { mHdmiCec.setLanguage(language); @@ -1211,7 +1499,8 @@ final class HdmiCecController { } } - private static final class HdmiCecCallback10 extends IHdmiCecCallback.Stub { + private static final class HdmiCecCallback10 + extends android.hardware.tv.cec.V1_0.IHdmiCecCallback.Stub { private final HdmiCecCallback mHdmiCecCallback; HdmiCecCallback10(HdmiCecCallback hdmiCecCallback) { @@ -1219,7 +1508,8 @@ final class HdmiCecController { } @Override - public void onCecMessage(CecMessage message) throws RemoteException { + public void onCecMessage(android.hardware.tv.cec.V1_0.CecMessage message) + throws RemoteException { byte[] body = new byte[message.body.size()]; for (int i = 0; i < message.body.size(); i++) { body[i] = message.body.get(i); @@ -1252,7 +1542,8 @@ final class HdmiCecController { } @Override - public void onCecMessage(CecMessage message) throws RemoteException { + public void onCecMessage(android.hardware.tv.cec.V1_0.CecMessage message) + throws RemoteException { byte[] body = new byte[message.body.size()]; for (int i = 0; i < message.body.size(); i++) { body[i] = message.body.get(i); @@ -1266,6 +1557,52 @@ final class HdmiCecController { } } + private static final class HdmiCecCallbackAidl extends IHdmiCecCallback.Stub { + private final HdmiCecCallback mHdmiCecCallback; + + HdmiCecCallbackAidl(HdmiCecCallback hdmiCecCallback) { + mHdmiCecCallback = hdmiCecCallback; + } + + @Override + public void onCecMessage(CecMessage message) throws RemoteException { + mHdmiCecCallback.onCecMessage(message.initiator, message.destination, message.body); + } + + @Override + public synchronized String getInterfaceHash() throws android.os.RemoteException { + return IHdmiCecCallback.Stub.HASH; + } + + @Override + public int getInterfaceVersion() throws android.os.RemoteException { + return IHdmiCecCallback.Stub.VERSION; + } + } + + private static final class HdmiCallbackAidl extends IHdmiCallback.Stub { + private final HdmiCecCallback mHdmiCecCallback; + + HdmiCallbackAidl(HdmiCecCallback hdmiCecCallback) { + mHdmiCecCallback = hdmiCecCallback; + } + + @Override + public void onHotplugEvent(boolean connected, int portId) throws RemoteException { + mHdmiCecCallback.onHotplugEvent(portId, connected); + } + + @Override + public synchronized String getInterfaceHash() throws android.os.RemoteException { + return IHdmiCallback.Stub.HASH; + } + + @Override + public int getInterfaceVersion() throws android.os.RemoteException { + return IHdmiCallback.Stub.VERSION; + } + } + public abstract static class Dumpable { protected final long mTime; diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index f8a74f4f3f55..3256b49c0f4f 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -56,7 +56,6 @@ import android.hardware.hdmi.IHdmiMhlVendorCommandListener; import android.hardware.hdmi.IHdmiRecordListener; import android.hardware.hdmi.IHdmiSystemAudioModeChangeListener; import android.hardware.hdmi.IHdmiVendorCommandListener; -import android.hardware.tv.cec.V1_0.OptionKey; import android.hardware.tv.cec.V1_0.SendMessageResult; import android.media.AudioAttributes; import android.media.AudioDeviceAttributes; @@ -656,7 +655,7 @@ public class HdmiControlService extends SystemService { if (mHdmiControlEnabled == HdmiControlManager.HDMI_CEC_CONTROL_ENABLED) { initializeCec(INITIATED_BY_BOOT_UP); } else { - mCecController.setOption(OptionKey.ENABLE_CEC, false); + mCecController.enableCec(false); } mMhlDevices = Collections.emptyList(); @@ -730,10 +729,11 @@ public class HdmiControlService extends SystemService { @Override public void onChange(String setting) { if (isTvDeviceEnabled()) { - setCecOption(OptionKey.WAKEUP, tv().getAutoWakeup()); + mCecController.enableWakeupByOtp(tv().getAutoWakeup()); } } - }, mServiceThreadExecutor); + }, + mServiceThreadExecutor); } /** Returns true if the device screen is off */ @@ -854,7 +854,7 @@ public class HdmiControlService extends SystemService { mWakeUpMessageReceived = false; if (isTvDeviceEnabled()) { - mCecController.setOption(OptionKey.WAKEUP, tv().getAutoWakeup()); + mCecController.enableWakeupByOtp(tv().getAutoWakeup()); } int reason = -1; switch (initiatedBy) { @@ -988,7 +988,7 @@ public class HdmiControlService extends SystemService { mCecVersion = Math.max(HdmiControlManager.HDMI_CEC_VERSION_1_4_B, Math.min(settingsCecVersion, supportedCecVersion)); - mCecController.setOption(OptionKey.SYSTEM_CEC_CONTROL, true); + mCecController.enableSystemCecControl(true); mCecController.setLanguage(mMenuLanguage); initializeLocalDevices(initiatedBy); } @@ -3422,7 +3422,7 @@ public class HdmiControlService extends SystemService { device.onStandby(mStandbyMessageReceived, standbyAction); } if (!isAudioSystemDevice()) { - mCecController.setOption(OptionKey.SYSTEM_CEC_CONTROL, false); + mCecController.enableSystemCecControl(false); mMhlController.setOption(OPTION_MHL_SERVICE_CONTROL, DISABLED); } } @@ -3571,12 +3571,6 @@ public class HdmiControlService extends SystemService { } @ServiceThreadOnly - void setCecOption(int key, boolean value) { - assertRunOnServiceThread(); - mCecController.setOption(key, value); - } - - @ServiceThreadOnly void setControlEnabled(@HdmiControlManager.HdmiCecControl int enabled) { assertRunOnServiceThread(); @@ -3610,8 +3604,8 @@ public class HdmiControlService extends SystemService { @ServiceThreadOnly private void enableHdmiControlService() { - mCecController.setOption(OptionKey.ENABLE_CEC, true); - mCecController.setOption(OptionKey.SYSTEM_CEC_CONTROL, true); + mCecController.enableCec(true); + mCecController.enableSystemCecControl(true); mMhlController.setOption(OPTION_MHL_ENABLE, ENABLED); initializeCec(INITIATED_BY_ENABLE_CEC); @@ -3619,21 +3613,23 @@ public class HdmiControlService extends SystemService { @ServiceThreadOnly private void disableHdmiControlService() { - disableDevices(new PendingActionClearedCallback() { - @Override - public void onCleared(HdmiCecLocalDevice device) { - assertRunOnServiceThread(); - mCecController.flush(new Runnable() { + disableDevices( + new PendingActionClearedCallback() { @Override - public void run() { - mCecController.setOption(OptionKey.ENABLE_CEC, false); - mCecController.setOption(OptionKey.SYSTEM_CEC_CONTROL, false); - mMhlController.setOption(OPTION_MHL_ENABLE, DISABLED); - clearLocalDevices(); + public void onCleared(HdmiCecLocalDevice device) { + assertRunOnServiceThread(); + mCecController.flush( + new Runnable() { + @Override + public void run() { + mCecController.enableCec(false); + mCecController.enableSystemCecControl(false); + mMhlController.setOption(OPTION_MHL_ENABLE, DISABLED); + clearLocalDevices(); + } + }); } }); - } - }); } @ServiceThreadOnly diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java index 0e46b0f42a91..9ebef3b41ad4 100644 --- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java +++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java @@ -339,6 +339,11 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub { String classpath = String.join(":", Os.getenv("BOOTCLASSPATH"), Os.getenv("SYSTEMSERVERCLASSPATH")); + final String standaloneSystemServerJars = Os.getenv("STANDALONE_SYSTEMSERVER_JARS"); + if (standaloneSystemServerJars != null) { + classpath = String.join(":", classpath, standaloneSystemServerJars); + } + // Create the snapshot. createProfileSnapshot(BOOT_IMAGE_ANDROID_PACKAGE, BOOT_IMAGE_PROFILE_NAME, classpath, /*appId*/ -1, callback); diff --git a/services/core/jni/com_android_server_SystemServer.cpp b/services/core/jni/com_android_server_SystemServer.cpp index bfd80054ffd2..b171a075578c 100644 --- a/services/core/jni/com_android_server_SystemServer.cpp +++ b/services/core/jni/com_android_server_SystemServer.cpp @@ -109,8 +109,13 @@ static void android_server_SystemServer_startHidlServices(JNIEnv* env, jobject / LOG_ALWAYS_FATAL_IF(env->GetJavaVM(&vm) != JNI_OK, "Cannot get Java VM"); sp<ISensorManager> sensorService = new SensorManager(vm); - err = sensorService->registerAsService(); - LOG_ALWAYS_FATAL_IF(err != OK, "Cannot register %s: %d", ISensorManager::descriptor, err); + if (IServiceManager::Transport::HWBINDER == + hardware::defaultServiceManager1_2()->getTransport(ISensorManager::descriptor, "default")) { + err = sensorService->registerAsService(); + LOG_ALWAYS_FATAL_IF(err != OK, "Cannot register %s: %d", ISensorManager::descriptor, err); + } else { + ALOGW("%s is deprecated. Skipping registration.", ISensorManager::descriptor); + } sp<ISchedulingPolicyService> schedulingService = new SchedulingPolicyService(); if (IServiceManager::Transport::HWBINDER == diff --git a/services/tests/servicestests/src/com/android/server/hdmi/FakeNativeWrapper.java b/services/tests/servicestests/src/com/android/server/hdmi/FakeNativeWrapper.java index 559a2c0d6a09..29eccd46650e 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/FakeNativeWrapper.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/FakeNativeWrapper.java @@ -118,7 +118,13 @@ final class FakeNativeWrapper implements NativeWrapper { } @Override - public void nativeSetOption(int flag, boolean enabled) {} + public void enableWakeupByOtp(boolean enabled) {} + + @Override + public void enableCec(boolean enabled) {} + + @Override + public void enableSystemCecControl(boolean enabled) {} @Override public void nativeSetLanguage(String language) {} diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index fd738d2b531c..70d82701da66 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -8995,7 +8995,8 @@ public class TelephonyManager { * <p>Requires Permission: * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling * app has carrier privileges (see {@link #hasCarrierPrivileges}) - * and {@link android.Manifest.permission#ACCESS_FINE_LOCATION}. + * and {@link android.Manifest.permission#ACCESS_FINE_LOCATION} if includeLocationData is + * set to {@link #INCLUDE_LOCATION_DATA_FINE}. * * If the system-wide location switch is off, apps may still call this API, with the * following constraints: @@ -9009,7 +9010,10 @@ public class TelephonyManager { * </ol> * * @param includeLocationData Specifies if the caller would like to receive - * location related information. + * location related information. If this parameter is set to + * {@link #INCLUDE_LOCATION_DATA_FINE} then the application will be checked for + * {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission and available + * location related information received during network scan will be sent to the caller. * @param request Contains all the RAT with bands/channels that need to be scanned. * @param executor The executor through which the callback should be invoked. Since the scan * request may trigger multiple callbacks and they must be invoked in the same order as @@ -9020,8 +9024,7 @@ public class TelephonyManager { */ @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @RequiresPermission(allOf = { - android.Manifest.permission.MODIFY_PHONE_STATE, - Manifest.permission.ACCESS_FINE_LOCATION + android.Manifest.permission.MODIFY_PHONE_STATE }) public @Nullable NetworkScan requestNetworkScan( @IncludeLocationData int includeLocationData, diff --git a/tests/TrustTests/Android.bp b/tests/TrustTests/Android.bp index 77f98e88f1eb..a1b888aef934 100644 --- a/tests/TrustTests/Android.bp +++ b/tests/TrustTests/Android.bp @@ -24,7 +24,7 @@ android_test { static_libs: [ "androidx.test.rules", "androidx.test.ext.junit", - "androidx.test.uiautomator", + "androidx.test.uiautomator_uiautomator", "mockito-target-minus-junit4", "servicestests-utils", "truth-prebuilt", diff --git a/tools/aapt2/cmd/Link.h b/tools/aapt2/cmd/Link.h index d8c76e297ec5..0170c4a4c54b 100644 --- a/tools/aapt2/cmd/Link.h +++ b/tools/aapt2/cmd/Link.h @@ -270,6 +270,8 @@ class LinkCommand : public Command { "Changes the name of the target package for overlay. Most useful\n" "when used in conjunction with --rename-manifest-package.", &options_.manifest_fixer_options.rename_overlay_target_package); + AddOptionalFlag("--rename-overlay-category", "Changes the category for the overlay.", + &options_.manifest_fixer_options.rename_overlay_category); AddOptionalFlagList("-0", "File suffix not to compress.", &options_.extensions_to_not_compress); AddOptionalSwitch("--no-compress", "Do not compress any resources.", diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp index d432341a8cde..efa42a2ee1dc 100644 --- a/tools/aapt2/link/ManifestFixer.cpp +++ b/tools/aapt2/link/ManifestFixer.cpp @@ -449,13 +449,18 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, manifest_action["attribution"]["inherit-from"]; manifest_action["original-package"]; manifest_action["overlay"].Action([&](xml::Element* el) -> bool { - if (!options_.rename_overlay_target_package) { - return true; + if (options_.rename_overlay_target_package) { + if (xml::Attribute* attr = el->FindAttribute(xml::kSchemaAndroid, "targetPackage")) { + attr->value = options_.rename_overlay_target_package.value(); + } } - - if (xml::Attribute* attr = - el->FindAttribute(xml::kSchemaAndroid, "targetPackage")) { - attr->value = options_.rename_overlay_target_package.value(); + if (options_.rename_overlay_category) { + if (xml::Attribute* attr = el->FindAttribute(xml::kSchemaAndroid, "category")) { + attr->value = options_.rename_overlay_category.value(); + } else { + el->attributes.push_back(xml::Attribute{xml::kSchemaAndroid, "category", + options_.rename_overlay_category.value()}); + } } return true; }); diff --git a/tools/aapt2/link/ManifestFixer.h b/tools/aapt2/link/ManifestFixer.h index d5d1d1770e1c..a8707d9d8623 100644 --- a/tools/aapt2/link/ManifestFixer.h +++ b/tools/aapt2/link/ManifestFixer.h @@ -48,6 +48,9 @@ struct ManifestFixerOptions { // <overlay>. std::optional<std::string> rename_overlay_target_package; + // The category to use instead of the one defined in 'android:category' in <overlay>. + std::optional<std::string> rename_overlay_category; + // The version name to set if 'android:versionName' is not defined in <manifest> or if // replace_version is set. std::optional<std::string> version_name_default; diff --git a/tools/aapt2/link/ManifestFixer_test.cpp b/tools/aapt2/link/ManifestFixer_test.cpp index 432f10bdab97..098d0be7f87d 100644 --- a/tools/aapt2/link/ManifestFixer_test.cpp +++ b/tools/aapt2/link/ManifestFixer_test.cpp @@ -351,6 +351,54 @@ TEST_F(ManifestFixerTest, EXPECT_THAT(attr->value, StrEq("com.android")); } +TEST_F(ManifestFixerTest, AddOverlayCategory) { + ManifestFixerOptions options; + options.rename_overlay_category = std::string("category"); + + std::unique_ptr<xml::XmlResource> doc = VerifyWithOptions(R"EOF( + <manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="android"> + <overlay android:targetName="Customization" android:targetPackage="android" /> + </manifest>)EOF", + options); + ASSERT_THAT(doc, NotNull()); + + xml::Element* manifest_el = doc->root.get(); + ASSERT_THAT(manifest_el, NotNull()); + + xml::Element* overlay_el = manifest_el->FindChild({}, "overlay"); + ASSERT_THAT(overlay_el, NotNull()); + + xml::Attribute* attr = overlay_el->FindAttribute(xml::kSchemaAndroid, "category"); + ASSERT_THAT(attr, NotNull()); + EXPECT_THAT(attr->value, StrEq("category")); +} + +TEST_F(ManifestFixerTest, OverrideOverlayCategory) { + ManifestFixerOptions options; + options.rename_overlay_category = std::string("category"); + + std::unique_ptr<xml::XmlResource> doc = VerifyWithOptions(R"EOF( + <manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="android"> + <overlay android:targetName="Customization" + android:targetPackage="android" + android:category="yrogetac"/> + </manifest>)EOF", + options); + ASSERT_THAT(doc, NotNull()); + + xml::Element* manifest_el = doc->root.get(); + ASSERT_THAT(manifest_el, NotNull()); + + xml::Element* overlay_el = manifest_el->FindChild({}, "overlay"); + ASSERT_THAT(overlay_el, NotNull()); + + xml::Attribute* attr = overlay_el->FindAttribute(xml::kSchemaAndroid, "category"); + ASSERT_THAT(attr, NotNull()); + EXPECT_THAT(attr->value, StrEq("category")); +} + TEST_F(ManifestFixerTest, UseDefaultVersionNameAndCode) { ManifestFixerOptions options; options.version_name_default = std::string("Beta"); diff --git a/tools/preload/loadclass/LoadClass.java b/tools/preload/loadclass/LoadClass.java index a71b6a8b145e..3f6658ab8c65 100644 --- a/tools/preload/loadclass/LoadClass.java +++ b/tools/preload/loadclass/LoadClass.java @@ -14,8 +14,8 @@ * limitations under the License. */ -import android.util.Log; import android.os.Debug; +import android.util.Log; /** * Loads a class, runs the garbage collector, and prints showmap output. @@ -28,7 +28,7 @@ class LoadClass { System.loadLibrary("android_runtime"); if (registerNatives() < 0) { - throw new RuntimeException("Error registering natives."); + throw new RuntimeException("Error registering natives."); } Debug.startAllocCounting(); @@ -46,7 +46,7 @@ class LoadClass { } } - System.gc(); + Runtime.getRuntime().gc(); int allocCount = Debug.getGlobalAllocCount(); int allocSize = Debug.getGlobalAllocSize(); @@ -73,7 +73,7 @@ class LoadClass { response.append(',').append(freedCount); response.append(',').append(freedSize); response.append(',').append(nativeHeapSize); - + System.out.println(response.toString()); } diff --git a/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt b/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt index 0fb062f280e3..0b619488c49c 100644 --- a/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt +++ b/tools/sdkparcelables/src/com/android/sdkparcelables/Main.kt @@ -39,7 +39,7 @@ fun main(args: Array<String>) { kotlin.system.exitProcess(2) } - val ancestorCollector = AncestorCollector(Opcodes.ASM7, null) + val ancestorCollector = AncestorCollector(Opcodes.ASM9, null) for (entry in zipFile.entries()) { if (entry.name.endsWith(".class")) { diff --git a/tools/traceinjection/src/com/android/traceinjection/TraceInjectionClassVisitor.java b/tools/traceinjection/src/com/android/traceinjection/TraceInjectionClassVisitor.java index 863f976b8aff..67c5561f348d 100644 --- a/tools/traceinjection/src/com/android/traceinjection/TraceInjectionClassVisitor.java +++ b/tools/traceinjection/src/com/android/traceinjection/TraceInjectionClassVisitor.java @@ -28,7 +28,7 @@ public class TraceInjectionClassVisitor extends ClassVisitor { private final TraceInjectionConfiguration mParams; public TraceInjectionClassVisitor(ClassVisitor classVisitor, TraceInjectionConfiguration params) { - super(Opcodes.ASM7, classVisitor); + super(Opcodes.ASM9, classVisitor); mParams = params; } diff --git a/tools/traceinjection/src/com/android/traceinjection/TraceInjectionMethodAdapter.java b/tools/traceinjection/src/com/android/traceinjection/TraceInjectionMethodAdapter.java index c2bbddcb5668..91e987dc72ee 100644 --- a/tools/traceinjection/src/com/android/traceinjection/TraceInjectionMethodAdapter.java +++ b/tools/traceinjection/src/com/android/traceinjection/TraceInjectionMethodAdapter.java @@ -61,7 +61,7 @@ public class TraceInjectionMethodAdapter extends AdviceAdapter { public TraceInjectionMethodAdapter(MethodVisitor methodVisitor, int access, String name, String descriptor, TraceInjectionConfiguration params) { - super(Opcodes.ASM7, methodVisitor, access, name, descriptor); + super(Opcodes.ASM9, methodVisitor, access, name, descriptor); mParams = params; mIsConstructor = "<init>".equals(name); } @@ -157,7 +157,7 @@ public class TraceInjectionMethodAdapter extends AdviceAdapter { class TracingAnnotationVisitor extends AnnotationVisitor { TracingAnnotationVisitor(AnnotationVisitor annotationVisitor) { - super(Opcodes.ASM7, annotationVisitor); + super(Opcodes.ASM9, annotationVisitor); } @Override |