[automerger skipped] Merge Android 14 QPR1 am: 4890f88a66 -s ours am: d05a3e5075 -s ours am: 4f8a72e048 -s ours
am skip reason: Merged-In I26db5a1f196272ee725e0193de3d07dcc09d42c7 with SHA-1 e5548d9965 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/MusicFX/+/2866387
Change-Id: I8ec57f28c2a85106204cb5421ed0e28dbbf48da0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4642aa7..e0fd477 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,6 +81,7 @@
</intent-filter>
</receiver>
<service android:name="Compatibility$Service" android:exported="false" />
+ <service android:name="KeepAliveService" android:exported="true" />
<activity
android:name="Compatibility$Redirector"
android:exported="true">
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 29db2f3..046d151 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -28,7 +28,7 @@
<string name="dance" msgid="212617702657103572">"Dantza"</string>
<string name="flat" msgid="2844441946717126606">"Laua"</string>
<string name="folk" msgid="5648693824262941979">"Folka"</string>
- <string name="heavy_metal" msgid="3885222304402494034">"Heavy metal-a"</string>
+ <string name="heavy_metal" msgid="3885222304402494034">"Heavy metala"</string>
<string name="hip_hop" msgid="4147534012796302488">"Hip-hopa"</string>
<string name="jazz" msgid="556328727821095055">"Jazza"</string>
<string name="pop" msgid="8568493898002509539">"Popa"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index d32dbde..47f5fb9 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="2227320688818248940">"MusicFX"</string>
<string name="no_effects" msgid="9023408561505030260">"इफेक्टहरू उपलब्ध छैनन्।"</string>
- <string name="eq_dialog_title" msgid="3237402214371962070">"इक्विलाइजर"</string>
+ <string name="eq_dialog_title" msgid="3237402214371962070">"इक्वलाइजर"</string>
<string name="headset_plug" msgid="1774198554148807517">"यी इफेक्टहरू सुन्नका लागि हेडफोन जोड्नुहोस्।"</string>
<string name="bass_boost_strength" msgid="8643071340166812205">"बेस बुस्ट"</string>
<string name="virtualizer_strength" msgid="2139410708760989842">"वरपरको साउन्ड"</string>
diff --git a/src/com/android/musicfx/KeepAliveService.java b/src/com/android/musicfx/KeepAliveService.java
new file mode 100644
index 0000000..5771619
--- /dev/null
+++ b/src/com/android/musicfx/KeepAliveService.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 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 com.android.musicfx;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+import android.util.Log;
+
+/**
+ * This Service provides a way for client to bind to MusicFx, so that MusicFx can run at same
+ * Process State (see @ProcessStateEnum) as the client.
+ *
+ * Currently, MusicFx does not run in a high priority state (often in CACHED_EMPTY) and can be
+ * easily killed by the LowMemoryKiller. However, its users (music apps, for example) are usually
+ * in a higher priority state, which means they are less likely to be killed. This can lead to
+ * MusicFx and its users being out of sync. To avoid this, framework side will keep record of all
+ * active MusicFx audio sessions, promote the procstate of MusicFx to foreground with the first
+ * audio session open, and remove the foreground procstate delegate with the last audio session
+ * close, or the last user of MusicFx is gone.
+ *
+ * MusicFx user APPs do not need to do anything.
+ *
+ */
+public class KeepAliveService extends Service {
+ private final String TAG = "MusicFxKeepAliveService";
+
+ // Binder given to clients with onBind() callback, the client app receive it as IBinder
+ // parameter of onServiceConnected which can not be used.
+ private final IBinder mBinder = new Binder();
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ Log.i(TAG, "onBind with intent " + intent);
+ return mBinder;
+ }
+}
