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

Commit 1a63caed authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Automerger Merge Worker
Browse files

Merge "Create returns null when resource strings are empty" into udc-dev am:... 

Merge "Create returns null when resource strings are empty" into udc-dev am: 2a5d645b am: 26f53540

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22537831



Change-Id: Id876620fe3e8b167b36fc1cddb5f1dc3d57e076b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2da1668f 26f53540

wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.Binder; 
import android.os.IBinder;

import android.os.IBinder;

import android.os.IInterface;

import android.os.IInterface;

import android.os.RemoteException;

import android.os.RemoteException;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;





import com.android.internal.R;

import com.android.internal.R;
@@ -173,10 +174,15 @@ public class SharedConnectivityManager { 
                    R.string.config_sharedConnectivityServicePackage);

                    R.string.config_sharedConnectivityServicePackage);

            String serviceIntentAction = resources.getString(

            String serviceIntentAction = resources.getString(

                    R.string.config_sharedConnectivityServiceIntentAction);

                    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);

            return new SharedConnectivityManager(context, servicePackageName, serviceIntentAction);

        } catch (Resources.NotFoundException e) {

        } catch (Resources.NotFoundException e) {

            Log.e(TAG, "To support shared connectivity service on this device, the service's"

            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;

        return null;

    }

    }

wifi/tests/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManagerTest.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,13 @@ public class SharedConnectivityManagerTest { 
        assertThat(SharedConnectivityManager.create(mContext)).isNull();

        assertThat(SharedConnectivityManager.create(mContext)).isNull();

    }

    }





    @Test

    public void resourceStringsAreEmpty_createShouldReturnNull() {

        when(mResources.getString(anyInt())).thenReturn("");



        assertThat(SharedConnectivityManager.create(mContext)).isNull();

    }



    @Test

    @Test

    public void bindingToServiceOnFirstCallbackRegistration() {

    public void bindingToServiceOnFirstCallbackRegistration() {

        SharedConnectivityManager manager = SharedConnectivityManager.create(mContext);

        SharedConnectivityManager manager = SharedConnectivityManager.create(mContext);