From 03f7571303427a52db33eff985a83e3733b02141 Mon Sep 17 00:00:00 2001
From: Isaac Katzenelson <isaackatz@google.com>
Date: Thu, 9 Mar 2023 17:26:39 +0000
Subject: Validate NetworkDeviceInfo is not null in HotspotNetwork

Bug: 272512345
Test: atest HotspotNetworkTest
Change-Id: Ib9e7360629f77effa7ff3de2ea0bc20e72d63bdc
---
 .../android/net/wifi/sharedconnectivity/app/HotspotNetwork.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'wifi/java')

diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/HotspotNetwork.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/HotspotNetwork.java
index d3b7b12e5387..9bfeb6308d13 100644
--- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/HotspotNetwork.java
+++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/HotspotNetwork.java
@@ -207,10 +207,14 @@ public final class HotspotNetwork implements Parcelable {
         }
     }
 
-    private static void validate(long deviceId, @NetworkType int networkType, String networkName) {
+    private static void validate(long deviceId, @NetworkType int networkType, String networkName,
+            NetworkProviderInfo networkProviderInfo) {
         if (deviceId < 0) {
             throw new IllegalArgumentException("DeviceId must be set");
         }
+        if (Objects.isNull(networkProviderInfo)) {
+            throw new IllegalArgumentException("NetworkProviderInfo must be set");
+        }
         if (networkType != NETWORK_TYPE_CELLULAR && networkType != NETWORK_TYPE_WIFI
                 && networkType != NETWORK_TYPE_ETHERNET && networkType != NETWORK_TYPE_UNKNOWN) {
             throw new IllegalArgumentException("Illegal network type");
@@ -230,7 +234,8 @@ public final class HotspotNetwork implements Parcelable {
             @Nullable @SecurityType ArraySet<Integer> hotspotSecurityTypes) {
         validate(deviceId,
                 networkType,
-                networkName);
+                networkName,
+                networkProviderInfo);
         mDeviceId = deviceId;
         mNetworkProviderInfo = networkProviderInfo;
         mNetworkType = networkType;
-- 
cgit v1.2.3-59-g8ed1b