From 6547db707a817c76b8d78a341515661b0cd7de65 Mon Sep 17 00:00:00 2001
From: Isaac Katzenelson <isaackatz@google.com>
Date: Fri, 7 Apr 2023 22:46:40 +0000
Subject: [PATCH] Create returns null when resource strings are empty

When resource string for the shared connectivity service or intent
are empty, the create method now returns null instead of creating
the manager.

Bug: 277383431
Test: atest SharedConnectivityManagerTest
Change-Id: Ib192821ed2311fb80689cef3c9adc31bf2c21f5b
---
 .../sharedconnectivity/app/SharedConnectivityManager.java | 8 +++++++-
 .../app/SharedConnectivityManagerTest.java                | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java
index e5ef62b16dfde..feef0497c152b 100644
--- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java
+++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java
@@ -35,6 +35,7 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.os.IInterface;
 import android.os.RemoteException;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.R;
@@ -173,10 +174,15 @@ public class SharedConnectivityManager {
                     R.string.config_sharedConnectivityServicePackage);
             String serviceIntentAction = resources.getString(
                     R.string.config_sharedConnectivityServiceIntentAction);
+            if (TextUtils.isEmpty(servicePackageName) || TextUtils.isEmpty(serviceIntentAction)) {
+                Log.e(TAG, "To support shared connectivity service on this device, the"
+                        + " service's package name and intent action strings must not be empty");
+                return null;
+            }
             return new SharedConnectivityManager(context, servicePackageName, serviceIntentAction);
         } catch (Resources.NotFoundException e) {
             Log.e(TAG, "To support shared connectivity service on this device, the service's"
-                    + " package name and intent action string must be defined");
+                    + " package name and intent action strings must be defined");
         }
         return null;
     }
diff --git a/wifi/tests/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManagerTest.java b/wifi/tests/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManagerTest.java
index b585bd5cfd7b2..a03a6c2fc6736 100644
--- a/wifi/tests/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManagerTest.java
+++ b/wifi/tests/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManagerTest.java
@@ -104,6 +104,13 @@ public class SharedConnectivityManagerTest {
         assertThat(SharedConnectivityManager.create(mContext)).isNull();
     }
 
+    @Test
+    public void resourceStringsAreEmpty_createShouldReturnNull() {
+        when(mResources.getString(anyInt())).thenReturn("");
+
+        assertThat(SharedConnectivityManager.create(mContext)).isNull();
+    }
+
     @Test
     public void bindingToServiceOnFirstCallbackRegistration() {
         SharedConnectivityManager manager = SharedConnectivityManager.create(mContext);