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

Commit e2e5d259 authored by James.cf Lin's avatar James.cf Lin Committed by Automerger Merge Worker
Browse files

[RCS UCE] The callback CapabilitiesCallback#onError is updated. Update the... 

[RCS UCE] The callback CapabilitiesCallback#onError is updated. Update the methods who call this callback method am: 2f669888 am: 46e2356e am: 56ed84de

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1510951

Change-Id: I7f554b7a58976b1c200a9f3ed67d9b7d9061c508
parents 3f2e8734 56ed84de

src/java/com/android/ims/rcs/uce/UceController.java

+4 −4
Original line number Diff line number Diff line
@@ -366,14 +366,14 @@ public class UceController { 
        if (uriList == null || c == null) {

            logw("requestCapabilities: parameter is empty");

            if (c != null) {

                c.onError(RcsUceAdapter.ERROR_GENERIC_FAILURE);

                c.onError(RcsUceAdapter.ERROR_GENERIC_FAILURE, 0L);

            }

            return;

        }



        if (isUnavailable()) {

            logw("requestCapabilities: controller is unavailable");

            c.onError(RcsUceAdapter.ERROR_GENERIC_FAILURE);

            c.onError(RcsUceAdapter.ERROR_GENERIC_FAILURE, 0L);

            return;

        }
@@ -392,14 +392,14 @@ public class UceController { 
        if (uri == null || c == null) {

            logw("requestCapabilities: parameter is empty");

            if (c != null) {

                c.onError(RcsUceAdapter.ERROR_GENERIC_FAILURE);

                c.onError(RcsUceAdapter.ERROR_GENERIC_FAILURE, 0L);

            }

            return;

        }



        if (isUnavailable()) {

            logw("requestAvailability: controller is unavailable");

            c.onError(RcsUceAdapter.ERROR_GENERIC_FAILURE);

            c.onError(RcsUceAdapter.ERROR_GENERIC_FAILURE, 0L);

            return;

        }

tests/src/com/android/ims/rcs/uce/UceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public class UceControllerTest extends ImsTestBase { 
        List<Uri> uriList = new ArrayList<>();

        uceController.requestCapabilities(uriList, mCapabilitiesCallback);



        verify(mCapabilitiesCallback).onError(RcsUceAdapter.ERROR_GENERIC_FAILURE);

        verify(mCapabilitiesCallback).onError(RcsUceAdapter.ERROR_GENERIC_FAILURE, 0L);

        verify(mTaskManager, never()).triggerCapabilityRequestTask(any(), any(), any());

    }
@@ -161,7 +161,7 @@ public class UceControllerTest extends ImsTestBase { 
        Uri contact = Uri.fromParts("sip", "test", null);

        uceController.requestAvailability(contact, mCapabilitiesCallback);



        verify(mCapabilitiesCallback).onError(RcsUceAdapter.ERROR_GENERIC_FAILURE);

        verify(mCapabilitiesCallback).onError(RcsUceAdapter.ERROR_GENERIC_FAILURE, 0L);

        verify(mTaskManager, never()).triggerAvailabilityRequestTask(any(), any(), any());

    }