Merge "Total Silence vs VoIP" into oc-dr1-dev

am: 92e1d0ab44

Change-Id: I7a1123ed362d884dfbbee21c8e04595e55844ecd
This commit is contained in:
Jean-Michel Trivi
2017-06-24 05:09:51 +00:00
committed by android-build-merger

View File

@@ -218,6 +218,7 @@ public final class AudioAttributes implements Parcelable {
SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_COMMUNICATION_DELAYED,SUPPRESSIBLE_NOTIFICATION);
SUPPRESSIBLE_USAGES.put(USAGE_NOTIFICATION_EVENT, SUPPRESSIBLE_NOTIFICATION);
SUPPRESSIBLE_USAGES.put(USAGE_ASSISTANCE_ACCESSIBILITY, SUPPRESSIBLE_NEVER);
SUPPRESSIBLE_USAGES.put(USAGE_VOICE_COMMUNICATION, SUPPRESSIBLE_NEVER);
}
/**