Diff - e78bddb354dc719b8efe437030e4e5869e5cae60^! - platform/frameworks/base - Git at Googleandroid/platform/frameworks/base/e78bddb354dc719b8efe437030e4e5869e5cae60^!/.<br>commite78bddb354dc719b8efe437030e4e5869e5cae60<br>[log]

authorAllen Su<br>Wed Apr 08 05:11:09 2026 +0000

committerAndroid Build Coastguard Worker<br>Thu Apr 09 22:20:15 2026 -0700

tree1e819bd411c393970d53cc73bbc8ac966464ff4f

parent82b9191de2ab4e6ea0a239f3ad4767cad345244d [diff]

Revert camera sound implementation in 26Q2

revert ag/35009043<br>Reason: This feature targets Pixel-2026 and AOSP-26Q3. To prevent leak, we have to revert it in AOSP-26Q2 release

Bug: 500350850<br>Test: manual<br>Flag: EXEMPT BUGFIX<br>Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:21a8c52cb86f7099016654f38486609f79ba3218<br>Merged-In: I764510b994141dcd3c79d200270701b87c50bb03<br>Change-Id: I764510b994141dcd3c79d200270701b87c50bb03<br>diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml<br>index 7fc51e9e..60d91ff 100644<br>--- a/core/res/res/values/config.xml<br>+++ b/core/res/res/values/config.xml<br>@@ -7969,12 +7969,6 @@

false

- ja<br>- ko

com.android.systemui/.locationbutton.LocationButtonRenderService

diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml<br>index f0f91a4..f20a2b6 100644<br>--- a/core/res/res/values/symbols.xml<br>+++ b/core/res/res/values/symbols.xml<br>@@ -6549,9 +6549,6 @@

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java<br>index 2cc973d..5d40922 100644<br>--- a/services/core/java/com/android/server/audio/AudioService.java<br>+++ b/services/core/java/com/android/server/audio/AudioService.java<br>@@ -329,7 +329,6 @@<br>import java.util.Iterator;<br>import java.util.LinkedHashMap;<br>import java.util.List;<br>-import java.util.Locale;<br>import java.util.Map;<br>import java.util.NoSuchElementException;<br>import java.util.Objects;<br>@@ -13850,35 +13849,17 @@<br>return true;

- boolean hasActiveSims = false;<br>SubscriptionManager subscriptionManager = mContext.getSystemService(<br>SubscriptionManager.class);<br>- if (subscriptionManager != null) {<br>- int[] subscriptionIds = subscriptionManager.getActiveSubscriptionIdList(false);<br>- if (subscriptionIds != null && subscriptionIds.length > 0) {<br>- hasActiveSims = true;<br>- for (int subId : subscriptionIds) {<br>- if (SubscriptionManager.getResourcesForSubId(mContext, subId).getBoolean(<br>- com.android.internal.R.bool.config_camera_sound_forced)) {<br>- return true;<br>- }<br>- }<br>- }<br>- } else {<br>- Log.e(TAG, "fails to get SubscriptionManager.");<br>+ if (subscriptionManager == null) {<br>+ Log.e(TAG, "readCameraSoundForced cannot create SubscriptionManager!");<br>+ return false;<br>- if (cameraShutterSound()) {<br>- if (SystemProperties.getBoolean("audio.camerasound.locale.enabled", false)<br>- && !hasActiveSims) {<br>- String language = Locale.getDefault().getLanguage();<br>- String[] languageList = mContext.getResources()<br>- .getStringArray(<br>- com.android.internal.R.array.config_cameraSoundForcedLanguage);<br>- if (Arrays.asList(languageList).contains(language)) {<br>- Log.i(TAG, "force camera sound in case of no SIM");<br>- return true;<br>- }<br>+ int[] subscriptionIds = subscriptionManager.getActiveSubscriptionIdList(false);<br>+ for (int subId : subscriptionIds) {<br>+ if (SubscriptionManager.getResourcesForSubId(mContext, subId).getBoolean(<br>+ com.android.internal.R.bool.config_camera_sound_forced)) {<br>+ return true;<br>return false;