Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev

Browse Source 
am: a2266f7a0f

Change-Id: I6ae2457bd8bd9f53b35373fb1be7eb66f80f1510
This commit is contained in:
Eric Laurent
2016-07-07 20:46:20 +00:00
committed by android-build-merger
parent fc7cc27a35 a2266f7a0f
commit a165d12737
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
media/java/android/media/SoundPool.java
View File

@@ -133,6 +133,8 @@ public class SoundPool {
private final IAppOpsService mAppOps;
private final IAppOpsCallback mAppOpsCallback;
private static IAudioService sService;
/**
* Constructor. Constructs a SoundPool object with the following
* characteristics:
@@ -492,7 +494,34 @@ public class SoundPool {
}
}
private static IAudioService getService()
{
if (sService != null) {
return sService;
}
IBinder b = ServiceManager.getService(Context.AUDIO_SERVICE);
sService = IAudioService.Stub.asInterface(b);
return sService;
}
private boolean isRestricted() {
IAudioService service = getService();
boolean cameraSoundForced = false;
try {
cameraSoundForced = service.isCameraSoundForced();
} catch (RemoteException e) {
Log.e(TAG, "Cannot access AudioService in isRestricted()");
}
if (cameraSoundForced &&
((mAttributes.getAllFlags() & AudioAttributes.FLAG_AUDIBILITY_ENFORCED) != 0)
// FIXME: should also check usage when set properly by camera app
// && (mAttributes.getUsage() == AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
) {
return false;
}
if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {
return false;
}