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

Merge "Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE" into lmp-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2014-07-20 22:28:38 +00:00
committed by Android (Google) Code Review
parent 818c88fe0a 89c3b29a9b
commit 89435ce612
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -14000,7 +14000,7 @@ package android.media {
field public static final int USAGE_NOTIFICATION_COMMUNICATION_INSTANT = 8; // 0x8
field public static final int USAGE_NOTIFICATION_COMMUNICATION_REQUEST = 7; // 0x7
field public static final int USAGE_NOTIFICATION_EVENT = 10; // 0xa
field public static final int USAGE_NOTIFICATION_TELEPHONY_RINGTONE = 6; // 0x6
field public static final int USAGE_NOTIFICATION_RINGTONE = 6; // 0x6
field public static final int USAGE_UNKNOWN = 0; // 0x0
field public static final int USAGE_VOICE_COMMUNICATION = 2; // 0x2
field public static final int USAGE_VOICE_COMMUNICATION_SIGNALLING = 3; // 0x3

4
core/java/android/os/Vibrator.java
View File

@@ -73,7 +73,7 @@ public abstract class Vibrator {
* @param milliseconds The number of milliseconds to vibrate.
* @param attributes {@link AudioAttributes} corresponding to the vibration. For example,
* specify {@link AudioAttributes#USAGE_ALARM} for alarm vibrations or
* {@link AudioAttributes#USAGE_NOTIFICATION_TELEPHONY_RINGTONE} for
* {@link AudioAttributes#USAGE_NOTIFICATION_RINGTONE} for
* vibrations associated with incoming calls.
*/
public void vibrate(long milliseconds, AudioAttributes attributes) {
@@ -125,7 +125,7 @@ public abstract class Vibrator {
* you don't want to repeat.
* @param attributes {@link AudioAttributes} corresponding to the vibration. For example,
* specify {@link AudioAttributes#USAGE_ALARM} for alarm vibrations or
* {@link AudioAttributes#USAGE_NOTIFICATION_TELEPHONY_RINGTONE} for
* {@link AudioAttributes#USAGE_NOTIFICATION_RINGTONE} for
* vibrations associated with incoming calls.
*/
public void vibrate(long[] pattern, int repeat, AudioAttributes attributes) {

19
media/java/android/media/AudioAttributes.java
View File

@@ -91,7 +91,12 @@ public final class AudioAttributes implements Parcelable {
/**
* Usage value to use when the usage is telephony ringtone.
*/
public final static int USAGE_NOTIFICATION_TELEPHONY_RINGTONE = 6;
public final static int USAGE_NOTIFICATION_RINGTONE = 6;
/**
* @hide
* TEMPORARY TO PREVENT BUILD BREAKAGES DURING RENAME - DO NOT SHIP
*/
public final static int USAGE_NOTIFICATION_TELEPHONY_RINGTONE = USAGE_NOTIFICATION_RINGTONE;
/**
* Usage value to use when the usage is a request to enter/end a
* communication, such as a VoIP communication or video-conference.
@@ -260,7 +265,7 @@ public final class AudioAttributes implements Parcelable {
* {@link AudioAttributes#USAGE_VOICE_COMMUNICATION},
* {@link AudioAttributes#USAGE_VOICE_COMMUNICATION_SIGNALLING},
* {@link AudioAttributes#USAGE_ALARM}, {@link AudioAttributes#USAGE_NOTIFICATION},
* {@link AudioAttributes#USAGE_NOTIFICATION_TELEPHONY_RINGTONE},
* {@link AudioAttributes#USAGE_NOTIFICATION_RINGTONE},
* {@link AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_REQUEST},
* {@link AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_INSTANT},
* {@link AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_DELAYED},
@@ -279,7 +284,7 @@ public final class AudioAttributes implements Parcelable {
case USAGE_VOICE_COMMUNICATION_SIGNALLING:
case USAGE_ALARM:
case USAGE_NOTIFICATION:
case USAGE_NOTIFICATION_TELEPHONY_RINGTONE:
case USAGE_NOTIFICATION_RINGTONE:
case USAGE_NOTIFICATION_COMMUNICATION_REQUEST:
case USAGE_NOTIFICATION_COMMUNICATION_INSTANT:
case USAGE_NOTIFICATION_COMMUNICATION_DELAYED:
@@ -498,7 +503,7 @@ public final class AudioAttributes implements Parcelable {
return new String("USAGE_ALARM");
case USAGE_NOTIFICATION:
return new String("USAGE_NOTIFICATION");
case USAGE_NOTIFICATION_TELEPHONY_RINGTONE:
case USAGE_NOTIFICATION_RINGTONE:
return new String("USAGE_NOTIFICATION");
case USAGE_NOTIFICATION_COMMUNICATION_REQUEST:
return new String("USAGE_NOTIFICATION");
@@ -530,7 +535,7 @@ public final class AudioAttributes implements Parcelable {
case AudioSystem.STREAM_SYSTEM:
return USAGE_ASSISTANCE_SONIFICATION;
case AudioSystem.STREAM_RING:
return USAGE_NOTIFICATION_TELEPHONY_RINGTONE;
return USAGE_NOTIFICATION_RINGTONE;
case AudioSystem.STREAM_MUSIC:
return USAGE_MEDIA;
case AudioSystem.STREAM_ALARM:
@@ -573,7 +578,7 @@ public final class AudioAttributes implements Parcelable {
return AudioSystem.STREAM_DTMF;
case USAGE_ALARM:
return AudioSystem.STREAM_ALARM;
case USAGE_NOTIFICATION_TELEPHONY_RINGTONE:
case USAGE_NOTIFICATION_RINGTONE:
return AudioSystem.STREAM_RING;
case USAGE_NOTIFICATION:
case USAGE_NOTIFICATION_COMMUNICATION_REQUEST:
@@ -595,7 +600,7 @@ public final class AudioAttributes implements Parcelable {
USAGE_VOICE_COMMUNICATION_SIGNALLING,
USAGE_ALARM,
USAGE_NOTIFICATION,
USAGE_NOTIFICATION_TELEPHONY_RINGTONE,
USAGE_NOTIFICATION_RINGTONE,
USAGE_NOTIFICATION_COMMUNICATION_REQUEST,
USAGE_NOTIFICATION_COMMUNICATION_INSTANT,
USAGE_NOTIFICATION_COMMUNICATION_DELAYED,

2
services/core/java/com/android/server/VibratorService.java
View File

@@ -373,7 +373,7 @@ public class VibratorService extends IVibratorService.Stub
private void startVibrationLocked(final Vibration vib) {
try {
if (mLowPowerMode
&& vib.mUsageHint != AudioAttributes.USAGE_NOTIFICATION_TELEPHONY_RINGTONE) {
&& vib.mUsageHint != AudioAttributes.USAGE_NOTIFICATION_RINGTONE) {
return;
}

6
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -17,7 +17,7 @@
package com.android.server.notification;
import static android.media.AudioAttributes.USAGE_ALARM;
import static android.media.AudioAttributes.USAGE_NOTIFICATION_TELEPHONY_RINGTONE;
import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;
import static android.media.AudioAttributes.USAGE_UNKNOWN;
import android.app.AlarmManager;
@@ -197,10 +197,10 @@ public class ZenModeHelper {
// call restrictions
final boolean muteCalls = zen && !mConfig.allowCalls;
mAppOps.setRestriction(AppOpsManager.OP_VIBRATE, USAGE_NOTIFICATION_TELEPHONY_RINGTONE,
mAppOps.setRestriction(AppOpsManager.OP_VIBRATE, USAGE_NOTIFICATION_RINGTONE,
muteCalls ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED,
exceptionPackages);
mAppOps.setRestriction(AppOpsManager.OP_PLAY_AUDIO, USAGE_NOTIFICATION_TELEPHONY_RINGTONE,
mAppOps.setRestriction(AppOpsManager.OP_PLAY_AUDIO, USAGE_NOTIFICATION_RINGTONE,
muteCalls ? AppOpsManager.MODE_IGNORED : AppOpsManager.MODE_ALLOWED,
exceptionPackages);