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

Commit 65ce3ed9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "IMS-VT: Modification of data usage aidl""

parents 143889bb 6f55bea1

telecomm/java/android/telecom/Connection.java

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ public abstract class Connection implements IConferenceable { 
         *

         * @param dataUsage The updated data usage.

         */

        public void changeCallDataUsage(long dataUsage) {

        public void changeCallDataUsage(int dataUsage) {

            if (mVideoCallback != null) {

                try {

                    mVideoCallback.changeCallDataUsage(dataUsage);

telecomm/java/android/telecom/InCallService.java

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ public abstract class InCallService extends Service { 
             *

             * @param dataUsage The updated data usage.

             */

            public abstract void onCallDataUsageChanged(long dataUsage);

            public abstract void onCallDataUsageChanged(int dataUsage);



            /**

             * Handles a change in camera capabilities.

telecomm/java/android/telecom/RemoteConnection.java

+2 −2
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ public final class RemoteConnection { 


            public void onPeerDimensionsChanged(VideoProvider videoProvider, int width, int height) {}



            public void onCallDataUsageChanged(VideoProvider videoProvider, long dataUsage) {}

            public void onCallDataUsageChanged(VideoProvider videoProvider, int dataUsage) {}



            public void onCameraCapabilitiesChanged(

                    VideoProvider videoProvider,
@@ -293,7 +293,7 @@ public final class RemoteConnection { 
            }



            @Override

            public void changeCallDataUsage(long dataUsage) {

            public void changeCallDataUsage(int dataUsage) {

                for (Listener l : mListeners) {

                    l.onCallDataUsageChanged(VideoProvider.this, dataUsage);

                }

telecomm/java/android/telecom/VideoCallImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class VideoCallImpl extends VideoCall { 
        }



        @Override

        public void changeCallDataUsage(long dataUsage) {

        public void changeCallDataUsage(int dataUsage) {

            mHandler.obtainMessage(MSG_CHANGE_CALL_DATA_USAGE, dataUsage).sendToTarget();

        }
@@ -145,7 +145,7 @@ public class VideoCallImpl extends VideoCall { 
                    }

                    break;

                case MSG_CHANGE_CALL_DATA_USAGE:

                    mVideoCallListener.onCallDataUsageChanged((long) msg.obj);

                    mVideoCallListener.onCallDataUsageChanged(msg.arg1);

                    break;

                case MSG_CHANGE_CAMERA_CAPABILITIES:

                    mVideoCallListener.onCameraCapabilitiesChanged(

telecomm/java/android/telecom/VideoCallbackServant.java

+3 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ final class VideoCallbackServant { 
                case MSG_CHANGE_CALL_DATA_USAGE: {

                    SomeArgs args = (SomeArgs) msg.obj;

                    try {

                        mDelegate.changeCallDataUsage((long) args.arg1);

                        mDelegate.changeCallDataUsage(args.argi1);

                    } finally {

                        args.recycle();

                    }
@@ -141,9 +141,9 @@ final class VideoCallbackServant { 
        }



        @Override

        public void changeCallDataUsage(long dataUsage) throws RemoteException {

        public void changeCallDataUsage(int dataUsage) throws RemoteException {

            SomeArgs args = SomeArgs.obtain();

            args.arg1 = dataUsage;

            args.argi1 = dataUsage;

            mHandler.obtainMessage(MSG_CHANGE_CALL_DATA_USAGE, args).sendToTarget();

        }