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

Commit 833ba23f authored by RD Babiera's avatar RD Babiera
Browse files

Change registerDisplayPortAltModeInfoListener to void method 

Removes return values from registerDisplayPortAltModeInfoListener,
old false returns now throw exceptions if a listener was previously
registered.

Test: atest CtsUsbManagerTestCases
Bug: 265900671
Change-Id: I02801377b159bb8fc858a2c373df3beb4da1898b
parent 394faf00

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5836,7 +5836,7 @@ package android.hardware.usb { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_USB) public java.util.List<android.hardware.usb.UsbPort> getPorts();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public void grantPermission(android.hardware.usb.UsbDevice, String);

    method public static boolean isUvcSupportEnabled();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public boolean registerDisplayPortAltModeInfoListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.usb.UsbManager.DisplayPortAltModeInfoListener);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public void registerDisplayPortAltModeInfoListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.usb.UsbManager.DisplayPortAltModeInfoListener);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public void resetUsbGadget();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public void setCurrentFunctions(long);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public void unregisterDisplayPortAltModeInfoListener(@NonNull android.hardware.usb.UsbManager.DisplayPortAltModeInfoListener);

core/java/android/hardware/usb/UsbManager.java

+7 −7
Original line number Diff line number Diff line
@@ -1647,7 +1647,7 @@ public class UsbManager { 
    /**

     * Registers the given listener to listen for DisplayPort Alt Mode changes.

     * <p>

     * If this method returns true, the caller should ensure to call

     * If this method returns without Exceptions, the caller should ensure to call

     * {@link #unregisterDisplayPortAltModeListener} when it no longer requires updates.

     *

     * @param executor          Executor on which to run the listener.
@@ -1655,14 +1655,14 @@ public class UsbManager { 
     *                          changes. See {@link #DisplayPortAltModeInfoListener} for listener

     *                          details.

     *

     * @return true on successful register, false on failed register due to listener already being

     *         registered or an internal error.

     * @throws IllegalStateException if listener has already been registered previously but not

     * unregistered or an unexpected system failure occurs.

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.MANAGE_USB)

    public boolean registerDisplayPortAltModeInfoListener(

    public void registerDisplayPortAltModeInfoListener(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull DisplayPortAltModeInfoListener listener) {

        Objects.requireNonNull(executor, "registerDisplayPortAltModeInfoListener: "
@@ -1678,15 +1678,15 @@ public class UsbManager { 


            if (mDisplayPortServiceListener == null) {

                if (!registerDisplayPortAltModeEventsIfNeededLocked()) {

                    return false;

                    throw new IllegalStateException("Unexpected failure registering service "

                            + "listener");

                }

            }

            if (mDisplayPortListeners.containsKey(listener)) {

                return false;

                throw new IllegalStateException("Listener has already been registered.");

            }



            mDisplayPortListeners.put(listener, executor);

            return true;

        }

    }