Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "getWifiActivityEnergyInfoAsync: throw NPE instead of IAE"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-06 22:17:11 +00:00
committed by Android (Google) Code Review
parent d40bc7afea 4745564251
commit 6867d35756
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -2625,8 +2625,8 @@ public class WifiManager {
public void getWifiActivityEnergyInfoAsync(
@NonNull @CallbackExecutor Executor executor,
@NonNull OnWifiActivityEnergyInfoListener listener) {
if (executor == null) throw new IllegalArgumentException("executor cannot be null");
if (listener == null) throw new IllegalArgumentException("listener cannot be null");
Objects.requireNonNull(executor, "executor cannot be null");
Objects.requireNonNull(listener, "listener cannot be null");
try {
mService.getWifiActivityEnergyInfoAsync(
new OnWifiActivityEnergyInfoProxy(executor, listener));

4
wifi/tests/src/android/net/wifi/WifiManagerTest.java
View File

@@ -1867,7 +1867,7 @@ public class WifiManagerTest {
* Tests that passing a null Executor to {@link WifiManager#getWifiActivityEnergyInfoAsync}
* throws an exception.
*/
@Test(expected = IllegalArgumentException.class)
@Test(expected = NullPointerException.class)
public void testGetWifiActivityInfoNullExecutor() throws Exception {
mWifiManager.getWifiActivityEnergyInfoAsync(null, mOnWifiActivityEnergyInfoListener);
}
@@ -1876,7 +1876,7 @@ public class WifiManagerTest {
* Tests that passing a null listener to {@link WifiManager#getWifiActivityEnergyInfoAsync}
* throws an exception.
*/
@Test(expected = IllegalArgumentException.class)
@Test(expected = NullPointerException.class)
public void testGetWifiActivityInfoNullListener() throws Exception {
mWifiManager.getWifiActivityEnergyInfoAsync(mExecutor, null);
}