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

Commit d67d073b authored by Christoph Studer's avatar Christoph Studer Committed by Android (Google) Code Review
Browse files

Merge "Rename basePkg to opPkg"

parents fe08369d 8fd7f1ed

core/java/android/app/INotificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ interface INotificationManager 


    void enqueueToast(String pkg, ITransientNotification callback, int duration);

    void cancelToast(String pkg, ITransientNotification callback);

    void enqueueNotificationWithTag(String pkg, String basePkg, String tag, int id,

    void enqueueNotificationWithTag(String pkg, String opPkg, String tag, int id,

            in Notification notification, inout int[] idReceived, int userId);

    void cancelNotificationWithTag(String pkg, String tag, int id, int userId);

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

+2 −2
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ public final class InputManager { 
         * @hide

         */

        @Override

        public void vibrate(int owningUid, String owningPackage, long milliseconds,

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

                int streamHint) {

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

        }
@@ -866,7 +866,7 @@ public final class InputManager { 
         * @hide

         */

        @Override

        public void vibrate(int owningUid, String owningPackage, long[] pattern, int repeat,

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

                int streamHint) {

            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 packageName, long milliseconds, int streamHint, IBinder token);

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

    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 cancelVibrate(IBinder token);

}

core/java/android/os/NullVibrator.java

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class NullVibrator extends Vibrator { 
     * @hide

     */

    @Override

    public void vibrate(int owningUid, String owningPackage, long milliseconds, int streamHint) {

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

        vibrate(milliseconds);

    }
@@ -48,7 +48,7 @@ public class NullVibrator extends Vibrator { 
     * @hide

     */

    @Override

    public void vibrate(int owningUid, String owningPackage, long[] pattern, int repeat,

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

            int streamHint) {

        if (repeat >= pattern.length) {

            throw new ArrayIndexOutOfBoundsException();

core/java/android/os/SystemVibrator.java

+4 −4
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ public class SystemVibrator extends Vibrator { 
     * @hide

     */

    @Override

    public void vibrate(int owningUid, String owningPackage, long milliseconds, int streamHint) {

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

        if (mService == null) {

            Log.w(TAG, "Failed to vibrate; no vibrator service.");

            return;

        }

        try {

            mService.vibrate(owningUid, owningPackage, milliseconds, streamHint, mToken);

            mService.vibrate(uid, opPkg, milliseconds, streamHint, mToken);

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to vibrate.", e);

        }
@@ -74,7 +74,7 @@ public class SystemVibrator extends Vibrator { 
     * @hide

     */

    @Override

    public void vibrate(int owningUid, String owningPackage, long[] pattern, int repeat,

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

            int streamHint) {

        if (mService == null) {

            Log.w(TAG, "Failed to vibrate; no vibrator service.");
@@ -85,7 +85,7 @@ public class SystemVibrator extends Vibrator { 
        // anyway

        if (repeat < pattern.length) {

            try {

                mService.vibratePattern(owningUid, owningPackage, pattern, repeat, streamHint,

                mService.vibratePattern(uid, opPkg, pattern, repeat, streamHint,

                        mToken);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed to vibrate.", e);