Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b414677 authored by John Spurlock's avatar John Spurlock
Browse files

Zen mode filtering should use new usage constants. 

Refactor stream-based calls to usage-based calls.

Bug:15279516
Change-Id: I3f7757d8123c14670e2ad5f8e6aa4e9803efe7ec
parent ad8f1673

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -22577,9 +22577,9 @@ package android.os { 
    method public abstract void cancel();

    method public abstract boolean hasVibrator();

    method public void vibrate(long);

    method public void vibrate(long, int);

    method public void vibrate(long, android.media.AudioAttributes);

    method public void vibrate(long[], int);

    method public void vibrate(long[], int, int);

    method public void vibrate(long[], int, android.media.AudioAttributes);

  }















  public class WorkSource implements android.os.Parcelable {

























core/java/android/app/AppOpsManager.java



+6
−3






























Original line number
Diff line number
Diff line








@@ -17,10 +17,12 @@













package android.app;































import android.Manifest;













import android.media.AudioAttributes.AttributeUsage;















import android.os.Binder;















import android.os.IBinder;















import android.os.UserManager;















import android.util.ArrayMap;





























import com.android.internal.app.IAppOpsService;















import com.android.internal.app.IAppOpsCallback;


























@@ -954,15 +956,16 @@ public class AppOpsManager {













     * defined by {@link #setMode}.















     *















     * @param code The operation to restrict.













     * @param stream The {@link android.media.AudioManager} stream type.













     * @param usage The {@link android.media.AudioAttributes} usage value.















     * @param mode The restriction mode (MODE_IGNORED,MODE_ERRORED) or MODE_ALLOWED to unrestrict.















     * @param exceptionPackages Optional list of packages to exclude from the restriction.















     * @hide















     */













    public void setRestriction(int code, int stream, int mode, String[] exceptionPackages) {













    public void setRestriction(int code, @AttributeUsage int usage, int mode,













            String[] exceptionPackages) {















        try {















            final int uid = Binder.getCallingUid();













            mService.setAudioRestriction(code, stream, uid, mode, exceptionPackages);













            mService.setAudioRestriction(code, usage, uid, mode, exceptionPackages);















        } catch (RemoteException e) {















        }















    }

































core/java/android/hardware/input/InputManager.java



+3
−3






























Original line number
Diff line number
Diff line








@@ -21,6 +21,7 @@ import com.android.internal.util.ArrayUtils;













import android.annotation.SdkConstant;















import android.annotation.SdkConstant.SdkConstantType;















import android.content.Context;













import android.media.AudioAttributes;















import android.os.Binder;















import android.os.Handler;















import android.os.IBinder;










@@ -857,8 +858,7 @@ public final class InputManager {













         * @hide















         */















        @Override













        public void vibrate(int uid, String opPkg, long milliseconds,













                int streamHint) {













        public void vibrate(int uid, String opPkg, long milliseconds, AudioAttributes attributes) {















            vibrate(new long[] { 0, milliseconds}, -1);















        }

























@@ -867,7 +867,7 @@ public final class InputManager {













         */















        @Override















        public void vibrate(int uid, String opPkg, long[] pattern, int repeat,













                int streamHint) {













                AudioAttributes attributes) {















            if (repeat >= pattern.length) {















                throw new ArrayIndexOutOfBoundsException();















            }

































core/java/android/os/IVibratorService.aidl



+2
−2






























Original line number
Diff line number
Diff line








@@ -20,8 +20,8 @@ package android.os;













interface IVibratorService















{















    boolean hasVibrator();













    void vibrate(int uid, String opPkg, long milliseconds, int streamHint, IBinder token);













    void vibratePattern(int uid, String opPkg, in long[] pattern, int repeat, int streamHint, IBinder token);













    void vibrate(int uid, String opPkg, long milliseconds, int usageHint, IBinder token);













    void vibratePattern(int uid, String opPkg, in long[] pattern, int repeat, int usageHint, IBinder token);















    void cancelVibrate(IBinder token);















}







































core/java/android/os/NullVibrator.java



+4
−2






























Original line number
Diff line number
Diff line








@@ -16,6 +16,8 @@





























package android.os;





























import android.media.AudioAttributes;





























/**















 * Vibrator implementation that does nothing.















 *









@@ -40,7 +42,7 @@ public class NullVibrator extends Vibrator {













     * @hide















     */















    @Override













    public void vibrate(int uid, String opPkg, long milliseconds, int streamHint) {













    public void vibrate(int uid, String opPkg, long milliseconds, AudioAttributes attributes) {















        vibrate(milliseconds);















    }

























@@ -49,7 +51,7 @@ public class NullVibrator extends Vibrator {













     */















    @Override















    public void vibrate(int uid, String opPkg, long[] pattern, int repeat,













            int streamHint) {













            AudioAttributes attributes) {















        if (repeat >= pattern.length) {















            throw new ArrayIndexOutOfBoundsException();















        }