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

Commit da59389f authored by Jaewan Kim's avatar Jaewan Kim
Browse files

ControllerLink: Remove unused parameter asSystemService 

Bug: 123485698
Test: Build, flash and injected some key events
Change-Id: I1d90169221842fc1c986e40c3a2790c73af260f4
parent 8be71c0f

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3584,7 +3584,7 @@ package android.media.session { 














  public abstract static class ControllerLink.ControllerStub {















    ctor public ControllerLink.ControllerStub();













    method public void adjustVolume(@NonNull String, @NonNull String, @NonNull android.media.session.ControllerCallbackLink, boolean, int, int);













    method public void adjustVolume(@NonNull String, @NonNull String, @NonNull android.media.session.ControllerCallbackLink, int, int);















    method public void fastForward(@NonNull String, @NonNull android.media.session.ControllerCallbackLink);















    method @Nullable public android.os.Bundle getExtras();















    method public long getFlags();










@@ -3614,7 +3614,7 @@ package android.media.session {













    method public void seekTo(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, long);















    method public void sendCommand(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, @NonNull String, @Nullable android.os.Bundle, @Nullable android.os.ResultReceiver);















    method public void sendCustomAction(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, @NonNull String, @Nullable android.os.Bundle);













    method public boolean sendMediaButton(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, boolean, @NonNull android.view.KeyEvent);













    method public boolean sendMediaButton(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, @NonNull android.view.KeyEvent);















    method public void setVolumeTo(@NonNull String, @NonNull String, @NonNull android.media.session.ControllerCallbackLink, int, int);















    method public void skipToQueueItem(@NonNull String, @NonNull android.media.session.ControllerCallbackLink, long);















    method public void stop(@NonNull String, @NonNull android.media.session.ControllerCallbackLink);

































media/apex/java/android/media/session/ControllerLink.java



+10
−20




























Original line number
Diff line number
Diff line








@@ -97,15 +97,12 @@ public final class ControllerLink implements Parcelable {













     *















     * @param packageName the package name of the controller















     * @param caller the {@link ControllerCallbackLink} of the controller













     * @param asSystemService whether this event should be considered as from system service















     * @param mediaButton the media button key event















     */















    boolean sendMediaButton(@NonNull String packageName,













            @NonNull ControllerCallbackLink caller, boolean asSystemService,













            @NonNull KeyEvent mediaButton) {













            @NonNull ControllerCallbackLink caller, @NonNull KeyEvent mediaButton) {















        try {













            return mISessionController.sendMediaButton(packageName, caller, asSystemService,













                    mediaButton);













            return mISessionController.sendMediaButton(packageName, caller, mediaButton);















        } catch (RemoteException e) {















            throw new RuntimeException(e);















        }










@@ -203,16 +200,14 @@ public final class ControllerLink implements Parcelable {













     * @param packageName the package name of the controller















     * @param opPackageName the op package name of this request















     * @param caller the {@link ControllerCallbackLink} of the controller













     * @param asSystemService whether this event should be considered as from system service















     * @param direction the direction to adjust the volume in















     * @param flags the flags with this volume change request















     */















    void adjustVolume(@NonNull String packageName, @NonNull String opPackageName,













            @NonNull ControllerCallbackLink caller, boolean asSystemService, int direction,













            @NonNull ControllerCallbackLink caller, int direction,















            int flags) {















        try {













            mISessionController.adjustVolume(packageName, opPackageName, caller, asSystemService,













                    direction, flags);













            mISessionController.adjustVolume(packageName, opPackageName, caller, direction, flags);















        } catch (RemoteException e) {















            throw new RuntimeException(e);















        }










@@ -632,8 +627,7 @@ public final class ControllerLink implements Parcelable {





























        /** Stub method for ISessionController.sendMediaButton */















        public boolean sendMediaButton(@NonNull String packageName,













                @NonNull ControllerCallbackLink caller, boolean asSystemService,













                @NonNull KeyEvent mediaButton) {













                @NonNull ControllerCallbackLink caller, @NonNull KeyEvent mediaButton) {















            return false;















        }


























@@ -677,8 +671,7 @@ public final class ControllerLink implements Parcelable {





























        /** Stub method for ISessionController.adjustVolume */















        public void adjustVolume(@NonNull String packageName, @NonNull String opPackageName,













                @NonNull ControllerCallbackLink caller, boolean asSystemService, int direction,













                int flags) {













                @NonNull ControllerCallbackLink caller, int direction, int flags) {















        }































        /** Stub method for ISessionController.setVolumeTo */










@@ -819,9 +812,8 @@ public final class ControllerLink implements Parcelable {





























        @Override















        public boolean sendMediaButton(String packageName, ControllerCallbackLink caller,













                boolean asSystemService, KeyEvent mediaButton) {













            return mControllerStub.sendMediaButton(packageName, caller, asSystemService,













                    mediaButton);













                KeyEvent mediaButton) {













            return mControllerStub.sendMediaButton(packageName, caller, mediaButton);















        }































        @Override










@@ -861,10 +853,8 @@ public final class ControllerLink implements Parcelable {





























        @Override















        public void adjustVolume(String packageName, String opPackageName,













                ControllerCallbackLink caller, boolean asSystemService, int direction,













                int flags) {













            mControllerStub.adjustVolume(packageName, opPackageName, caller, asSystemService,













                    direction, flags);













                ControllerCallbackLink caller, int direction, int flags) {













            mControllerStub.adjustVolume(packageName, opPackageName, caller, direction, flags);















        }































        @Override

































media/apex/java/android/media/session/ISessionController.aidl



+2
−3




























Original line number
Diff line number
Diff line








@@ -39,7 +39,7 @@ interface ISessionController {













    void sendCommand(String packageName, in ControllerCallbackLink caller,















            String command, in Bundle args, in ResultReceiver cb);















    boolean sendMediaButton(String packageName, in ControllerCallbackLink caller,













            boolean asSystemService, in KeyEvent mediaButton);













            in KeyEvent mediaButton);















    void registerCallback(String packageName, in ControllerCallbackLink cb);















    void unregisterCallback(in ControllerCallbackLink cb);















    String getPackageName();









@@ -48,8 +48,7 @@ interface ISessionController {













    long getFlags();















    MediaController.PlaybackInfo getVolumeAttributes();















    void adjustVolume(String packageName, String opPackageName,













            in ControllerCallbackLink caller, boolean asSystemService, int direction,













            int flags);













            in ControllerCallbackLink caller, int direction, int flags);















    void setVolumeTo(String packageName, String opPackageName, in ControllerCallbackLink caller,















            int value, int flags);

















































media/apex/java/android/media/session/MediaController.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -130,8 +130,7 @@ public final class MediaController {













            return false;















        }















        try {













            return mSessionBinder.sendMediaButton(mContext.getPackageName(), mCbStub,













                    false /* asSystemService */, keyEvent);













            return mSessionBinder.sendMediaButton(mContext.getPackageName(), mCbStub, keyEvent);















        } catch (RuntimeException e) {















            // System is dead. =(















        }










@@ -322,7 +321,7 @@ public final class MediaController {













            //       RemoteUserInfo, and OP package name is used for AudioService's internal















            //       AppOpsManager usages.















            mSessionBinder.adjustVolume(mContext.getPackageName(), mContext.getOpPackageName(),













                    mCbStub, false /* asSystemService */, direction, flags);













                    mCbStub, direction, flags);















        } catch (RuntimeException e) {















            Log.wtf(TAG, "Error calling adjustVolumeBy.", e);















        }

































services/core/java/com/android/server/media/MediaSessionRecord.java



+4
−5




























Original line number
Diff line number
Diff line








@@ -1247,9 +1247,9 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {





























        @Override















        public boolean sendMediaButton(String packageName, ControllerCallbackLink cb,













                boolean asSystemService, KeyEvent keyEvent) {













                KeyEvent keyEvent) {















            return mSessionCb.sendMediaButton(packageName, Binder.getCallingPid(),













                    Binder.getCallingUid(), cb, asSystemService, keyEvent);













                    Binder.getCallingUid(), cb, false, keyEvent);















        }































        @Override










@@ -1316,14 +1316,13 @@ public class MediaSessionRecord implements IBinder.DeathRecipient {





























        @Override















        public void adjustVolume(String packageName, String opPackageName,













                ControllerCallbackLink caller, boolean asSystemService, int direction,













                int flags) {













                ControllerCallbackLink caller, int direction, int flags) {















            int pid = Binder.getCallingPid();















            int uid = Binder.getCallingUid();















            final long token = Binder.clearCallingIdentity();















            try {















                MediaSessionRecord.this.adjustVolume(packageName, opPackageName, pid, uid, caller,













                        asSystemService, direction, flags, false /* useSuggested */);













                        false, direction, flags, false /* useSuggested */);















            } finally {















                Binder.restoreCallingIdentity(token);















            }