Merge "Check for nearby component in config" into tm-qpr-dev am: 75637203ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21608540

Change-Id: I11e19685695ea9dd4a37c3c82928d45c5098ee11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4 files changed, 111 insertions, 5 deletions

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index 32b10f23..4cfda0a9 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -403,7 +403,7 @@ public class ChooserActivity extends ResolverActivity implements
 
     @VisibleForTesting
     protected ChooserIntegratedDeviceComponents getIntegratedDeviceComponents() {
-        return ChooserIntegratedDeviceComponents.get(this);
+        return ChooserIntegratedDeviceComponents.get(this, new SecureSettings());
     }
 
     @Override
diff --git a/java/src/com/android/intentresolver/ChooserIntegratedDeviceComponents.java b/java/src/com/android/intentresolver/ChooserIntegratedDeviceComponents.java
index 14255ca0..5fbf03a0 100644
--- a/java/src/com/android/intentresolver/ChooserIntegratedDeviceComponents.java
+++ b/java/src/com/android/intentresolver/ChooserIntegratedDeviceComponents.java
@@ -40,10 +40,12 @@ public class ChooserIntegratedDeviceComponents {
     private final ComponentName mNearbySharingComponent;
 
     /** Look up the integrated components available on this device. */
-    public static ChooserIntegratedDeviceComponents get(Context context) {
+    public static ChooserIntegratedDeviceComponents get(
+            Context context,
+            SecureSettings secureSettings) {
         return new ChooserIntegratedDeviceComponents(
                 getEditSharingComponent(context),
-                getNearbySharingComponent(context));
+                getNearbySharingComponent(context, secureSettings));
     }
 
     @VisibleForTesting
@@ -68,9 +70,13 @@ public class ChooserIntegratedDeviceComponents {
                 ? null : ComponentName.unflattenFromString(editorComponent);
     }
 
-    private static ComponentName getNearbySharingComponent(Context context) {
-        String nearbyComponent = Settings.Secure.getString(
+    private static ComponentName getNearbySharingComponent(Context context,
+            SecureSettings secureSettings) {
+        String nearbyComponent = secureSettings.getString(
                 context.getContentResolver(), Settings.Secure.NEARBY_SHARING_COMPONENT);
+        if (TextUtils.isEmpty(nearbyComponent)) {
+            nearbyComponent = context.getString(R.string.config_defaultNearbySharingComponent);
+        }
         return TextUtils.isEmpty(nearbyComponent)
                 ? null : ComponentName.unflattenFromString(nearbyComponent);
     }
diff --git a/java/src/com/android/intentresolver/SecureSettings.kt b/java/src/com/android/intentresolver/SecureSettings.kt
new file mode 100644
index 00000000..a4853fd8
--- /dev/null
+++ b/java/src/com/android/intentresolver/SecureSettings.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver
+
+import android.content.ContentResolver
+import android.provider.Settings
+
+/**
+ * A proxy class for secure settings, for easier testing.
+ */
+open class SecureSettings {
+    open fun getString(resolver: ContentResolver, name: String): String? {
+        return Settings.Secure.getString(resolver, name)
+    }
+}
diff --git a/java/tests/src/com/android/intentresolver/ChooserIntegratedDeviceComponentsTest.kt b/java/tests/src/com/android/intentresolver/ChooserIntegratedDeviceComponentsTest.kt
new file mode 100644
index 00000000..9a5dabdb
--- /dev/null
+++ b/java/tests/src/com/android/intentresolver/ChooserIntegratedDeviceComponentsTest.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver
+
+import android.content.ComponentName
+import android.provider.Settings
+import android.testing.TestableContext
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ChooserIntegratedDeviceComponentsTest {
+    private val secureSettings = mock<SecureSettings>()
+    private val testableContext =
+        TestableContext(InstrumentationRegistry.getInstrumentation().getContext())
+
+    @Test
+    fun testEditorAndNearby() {
+        val resources = testableContext.getOrCreateTestableResources()
+
+        resources.addOverride(R.string.config_systemImageEditor, "")
+        resources.addOverride(R.string.config_defaultNearbySharingComponent, "")
+
+        var components = ChooserIntegratedDeviceComponents.get(testableContext, secureSettings)
+
+        assertThat(components.editSharingComponent).isNull()
+        assertThat(components.nearbySharingComponent).isNull()
+
+        val editor = ComponentName.unflattenFromString("com.android/com.android.Editor")
+        val nearby = ComponentName.unflattenFromString("com.android/com.android.nearby")
+
+        resources.addOverride(R.string.config_systemImageEditor, editor?.flattenToString())
+        resources.addOverride(
+            R.string.config_defaultNearbySharingComponent, nearby?.flattenToString())
+
+        components = ChooserIntegratedDeviceComponents.get(testableContext, secureSettings)
+
+        assertThat(components.editSharingComponent).isEqualTo(editor)
+        assertThat(components.nearbySharingComponent).isEqualTo(nearby)
+
+        val anotherNearby =
+            ComponentName.unflattenFromString("com.android/com.android.another_nearby")
+        whenever(
+            secureSettings.getString(
+                any(),
+                eq(Settings.Secure.NEARBY_SHARING_COMPONENT)
+            )
+        ).thenReturn(anotherNearby?.flattenToString())
+
+        components = ChooserIntegratedDeviceComponents.get(testableContext, secureSettings)
+
+        assertThat(components.nearbySharingComponent).isEqualTo(anotherNearby)
+    }
+}