From 705716fc60c62d9036e8c8e804c4110231c804d9 Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Wed, 6 Jul 2016 13:32:16 -0700 Subject: cmsdk: Broker out CMAudioService Change-Id: Ia1205ad67d524ebf379085a6287993b8b82bc76f Signed-off-by: Roman Birg --- .../platform/internal/CMAudioService.java | 161 --------------------- .../platform/internal/CMAudioServiceBroker.java | 130 +++++++++++++++++ 2 files changed, 130 insertions(+), 161 deletions(-) delete mode 100644 cm/lib/main/java/org/cyanogenmod/platform/internal/CMAudioService.java create mode 100644 cm/lib/main/java/org/cyanogenmod/platform/internal/CMAudioServiceBroker.java (limited to 'cm/lib/main') diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMAudioService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMAudioService.java deleted file mode 100644 index 6cebb8e..0000000 --- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMAudioService.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (C) 2016 The CyanogenMod 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 org.cyanogenmod.platform.internal; - -import android.content.Context; -import android.content.Intent; -import android.os.Binder; -import android.os.IBinder; -import android.os.RemoteException; -import android.os.UserHandle; -import android.util.Log; - -import com.android.server.SystemService; - -import java.io.FileDescriptor; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; - -import cyanogenmod.app.CMContextConstants; -import cyanogenmod.media.AudioSessionInfo; -import cyanogenmod.media.CMAudioManager; -import cyanogenmod.media.ICMAudioService; -import cyanogenmod.platform.Manifest; - -public class CMAudioService extends CMSystemService { - - private static final String TAG = "CMAudioService"; - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - - private final Context mContext; - - private static final int AUDIO_STATUS_OK = 0; - - //keep in sync with include/media/AudioPolicy.h - private final static int AUDIO_OUTPUT_SESSION_EFFECTS_UPDATE = 10; - - public CMAudioService(Context context) { - super(context); - - mContext = context; - } - - @Override - public String getFeatureDeclaration() { - return CMContextConstants.Features.AUDIO; - } - - @Override - public void onStart() { - if (!NativeHelper.isNativeLibraryAvailable()) { - Log.wtf(TAG, "CM Audio service started by system server by native library is" + - "unavailable. Service will be unavailable."); - return; - } - publishBinderService(CMContextConstants.CM_AUDIO_SERVICE, mBinder); - } - - @Override - public void onBootPhase(int phase) { - if (phase == PHASE_BOOT_COMPLETED) { - if (NativeHelper.isNativeLibraryAvailable()) { - native_registerAudioSessionCallback(true); - } - } - } - - private final IBinder mBinder = new ICMAudioService.Stub() { - - @Override - public List listAudioSessions(int streamType) throws RemoteException { - final ArrayList sessions = new ArrayList(); - if (!NativeHelper.isNativeLibraryAvailable()) { - // no sessions for u - return sessions; - } - - int status = native_listAudioSessions(streamType, sessions); - if (status != AUDIO_STATUS_OK) { - Log.e(TAG, "Error retrieving audio sessions! status=" + status); - } - - return sessions; - } - - @Override - public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { - mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG); - - pw.println(); - pw.println("CMAudio Service State:"); - try { - List sessions = listAudioSessions(-1); - if (sessions.size() > 0) { - pw.println(" Audio sessions:"); - for (AudioSessionInfo info : sessions) { - pw.println(" " + info.toString()); - } - } else { - pw.println(" No active audio sessions"); - } - } catch (RemoteException e) { - // nothing - } - } - }; - - private void broadcastSessionChanged(boolean added, AudioSessionInfo sessionInfo) { - Intent i = new Intent(CMAudioManager.ACTION_AUDIO_SESSIONS_CHANGED); - i.putExtra(CMAudioManager.EXTRA_SESSION_INFO, sessionInfo); - i.putExtra(CMAudioManager.EXTRA_SESSION_ADDED, added); - - sendBroadcastToAll(i, Manifest.permission.OBSERVE_AUDIO_SESSIONS); - } - - private void sendBroadcastToAll(Intent intent, String receiverPermission) { - intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); - - final long ident = Binder.clearCallingIdentity(); - try { - if (DEBUG) Log.d(TAG, "Sending broadcast: " + intent.toString()); - - mContext.sendBroadcastAsUser(intent, UserHandle.ALL, receiverPermission); - } finally { - Binder.restoreCallingIdentity(ident); - } - } - - /* - * Handles events from JNI - */ - private synchronized void audioSessionCallbackFromNative(int event, - AudioSessionInfo sessionInfo, boolean added) { - - switch (event) { - case AUDIO_OUTPUT_SESSION_EFFECTS_UPDATE: - broadcastSessionChanged(added, sessionInfo); - break; - default: - Log.e(TAG, "Unknown event " + event); - } - } - - private native final void native_registerAudioSessionCallback(boolean enabled); - - private native final int native_listAudioSessions( - int stream, ArrayList sessions); -} diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMAudioServiceBroker.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMAudioServiceBroker.java new file mode 100644 index 0000000..65ee040 --- /dev/null +++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMAudioServiceBroker.java @@ -0,0 +1,130 @@ +/** + * Copyright (C) 2016 The CyanogenMod 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 org.cyanogenmod.platform.internal; + +import org.cyanogenmod.platform.internal.common.BrokeredServiceConnection; + +import android.annotation.NonNull; +import android.annotation.SdkConstant; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.os.IBinder; +import android.os.RemoteException; +import android.util.Log; +import android.util.Slog; + +import java.io.FileDescriptor; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import cyanogenmod.app.CMContextConstants; +import cyanogenmod.media.AudioSessionInfo; +import cyanogenmod.media.ICMAudioService; + +public class CMAudioServiceBroker extends BrokerableCMSystemService { + + private static final String TAG = "CMAudioServiceBroker"; + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + + private final Context mContext; + + private static final ComponentName TARGET_IMPLEMENTATION_COMPONENT = + new ComponentName("org.cyanogenmod.cmaudio.service", + "org.cyanogenmod.cmaudio.service.CMAudioService"); + + public CMAudioServiceBroker(Context context) { + super(context); + mContext = context; + } + + @Override + public void onBootPhase(int phase) { + super.onBootPhase(phase); + if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) { + publishBinderService(CMContextConstants.CM_AUDIO_SERVICE, new BinderService()); + } + } + + @Override + public void onStart() { + if (DEBUG) Slog.d(TAG, "service started"); + } + + @Override + protected ICMAudioService getIBinderAsIInterface(@NonNull IBinder service) { + return ICMAudioService.Stub.asInterface(service); + } + + @Override + protected ICMAudioService getDefaultImplementation() { + return mServiceStubForFailure; + } + + @Override + protected ComponentName getServiceComponent() { + return TARGET_IMPLEMENTATION_COMPONENT; + } + + private void checkPermission() { + mContext.enforceCallingOrSelfPermission( + cyanogenmod.platform.Manifest.permission.OBSERVE_AUDIO_SESSIONS, null); + } + + @Override + public String getFeatureDeclaration() { + return CMContextConstants.Features.AUDIO; + } + + private final ICMAudioService mServiceStubForFailure = new ICMAudioService.Stub() { + @Override + public List listAudioSessions(int streamType) throws RemoteException { + checkPermission(); + return Collections.emptyList(); + } + }; + + private final class BinderService extends ICMAudioService.Stub { + @Override + public List listAudioSessions(int streamType) throws RemoteException { + checkPermission(); + return getBrokeredService().listAudioSessions(streamType); + } + + @Override + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG); + + pw.println(); + pw.println("CMAudio Service State:"); + try { + List sessions = listAudioSessions(-1); + if (sessions.size() > 0) { + pw.println(" Audio sessions:"); + for (AudioSessionInfo info : sessions) { + pw.println(" " + info.toString()); + } + } else { + pw.println(" No active audio sessions"); + } + } catch (RemoteException e) { + // nothing + } + } + } +} -- cgit v1.1