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

Merge \"Optimize audio playback restriction check\" into nyc-mr1-dev

Browse Source 
am: 69c6166684

Change-Id: If626176f014e65f0248c5ae80d9196dd27076ec4
This commit is contained in:
Jean-Michel Trivi
2016-07-13 21:57:24 +00:00
committed by android-build-merger
parent f1d5c81aa0 69c6166684
commit 96a8ee3aec
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/PlayerBase.java
View File

@@ -181,10 +181,15 @@ public abstract class PlayerBase {
* @return * @return
*/ */
boolean isRestricted_sync() { boolean isRestricted_sync() {
// check app ops
if (mHasAppOpsPlayAudio) {
return false;
}
// check bypass flag
if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) { if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {
return false; return false;
} }
return !mHasAppOpsPlayAudio; return true;
} }
// Abstract methods a subclass needs to implement // Abstract methods a subclass needs to implement

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

@@ -505,27 +505,31 @@ public class SoundPool {
} }
private boolean isRestricted() { private boolean isRestricted() {
IAudioService service = getService(); // check app ops
boolean cameraSoundForced = false; if (mHasAppOpsPlayAudio) {
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; return false;
} }
// check bypass flag
if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) { if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY) != 0) {
return false; return false;
} }
return !mHasAppOpsPlayAudio; // check force audibility flag and camera restriction
if ((mAttributes.getAllFlags() & AudioAttributes.FLAG_AUDIBILITY_ENFORCED) != 0) {
// FIXME: should also check usage when set properly by camera app
// && (mAttributes.getUsage() == AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
boolean cameraSoundForced = false;
try {
cameraSoundForced = getService().isCameraSoundForced();
} catch (RemoteException e) {
Log.e(TAG, "Cannot access AudioService in isRestricted()");
} catch (NullPointerException e) {
Log.e(TAG, "Null AudioService in isRestricted()");
}
if (cameraSoundForced) {
return false;
}
}
return true;
} }
private void updateAppOpsPlayAudio() { private void updateAppOpsPlayAudio() {