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

Commit 47455642 authored by David Su's avatar David Su
Browse files

getWifiActivityEnergyInfoAsync: throw NPE instead of IAE 

Null check should throw NullPointerException
instead of IllegalArgumentException.

Bug: 149015294
Test: atest WifiManagerTest
Change-Id: I6d6f495a1e2e56d02c0709e1b7160e7b1ffb5737
parent ddd7be3a

wifi/java/android/net/wifi/WifiManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -2625,8 +2625,8 @@ public class WifiManager { 
    public void getWifiActivityEnergyInfoAsync(

    public void getWifiActivityEnergyInfoAsync(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull OnWifiActivityEnergyInfoListener listener) {

            @NonNull OnWifiActivityEnergyInfoListener listener) {

        if (executor == null) throw new IllegalArgumentException("executor cannot be null");

        Objects.requireNonNull(executor, "executor cannot be null");

        if (listener == null) throw new IllegalArgumentException("listener cannot be null");

        Objects.requireNonNull(listener, "listener cannot be null");

        try {

        try {

            mService.getWifiActivityEnergyInfoAsync(

            mService.getWifiActivityEnergyInfoAsync(

                    new OnWifiActivityEnergyInfoProxy(executor, listener));

                    new OnWifiActivityEnergyInfoProxy(executor, listener));

wifi/tests/src/android/net/wifi/WifiManagerTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1867,7 +1867,7 @@ public class WifiManagerTest { 
     * Tests that passing a null Executor to {@link WifiManager#getWifiActivityEnergyInfoAsync}

     * Tests that passing a null Executor to {@link WifiManager#getWifiActivityEnergyInfoAsync}

     * throws an exception.

     * throws an exception.

     */

     */

    @Test(expected = IllegalArgumentException.class)

    @Test(expected = NullPointerException.class)

    public void testGetWifiActivityInfoNullExecutor() throws Exception {

    public void testGetWifiActivityInfoNullExecutor() throws Exception {

        mWifiManager.getWifiActivityEnergyInfoAsync(null, mOnWifiActivityEnergyInfoListener);

        mWifiManager.getWifiActivityEnergyInfoAsync(null, mOnWifiActivityEnergyInfoListener);

    }

    }
@@ -1876,7 +1876,7 @@ public class WifiManagerTest { 
     * Tests that passing a null listener to {@link WifiManager#getWifiActivityEnergyInfoAsync}

     * Tests that passing a null listener to {@link WifiManager#getWifiActivityEnergyInfoAsync}

     * throws an exception.

     * throws an exception.

     */

     */

    @Test(expected = IllegalArgumentException.class)

    @Test(expected = NullPointerException.class)

    public void testGetWifiActivityInfoNullListener() throws Exception {

    public void testGetWifiActivityInfoNullListener() throws Exception {

        mWifiManager.getWifiActivityEnergyInfoAsync(mExecutor, null);

        mWifiManager.getWifiActivityEnergyInfoAsync(mExecutor, null);

    }

    }