From 4076bae93046b4d4b8792fad9d6357957d9b0e7c Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Fri, 1 Dec 2017 14:57:41 -0800
Subject: [PATCH] Disable ConnectedDeviceConnectedActivity

Only one connected device activity could be enabled at one time. This
cl disbale the new version but keep old version enabled in
AndroidMainfest.xml.

In this case tile could find correct activity at any time.

Bug: 69810208
Test: Build
Change-Id: I0175b968cc26e38d0549fe2302b762fe0bc65c20
---
 AndroidManifest.xml                           |  1 +
 .../ConnectedDeviceActivityTest.java          | 67 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 tests/unit/src/com/android/settings/connecteddevice/ConnectedDeviceActivityTest.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 05c5075b42f..07908e5d32c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -178,6 +178,7 @@
         </activity>
 
         <activity android:name=".Settings$ConnectedDeviceDashboardActivity"
+            android:enabled="false"
             android:taskAffinity="com.android.settings"
             android:label="@string/connected_devices_dashboard_title"
             android:icon="@drawable/ic_devices_other"
diff --git a/tests/unit/src/com/android/settings/connecteddevice/ConnectedDeviceActivityTest.java b/tests/unit/src/com/android/settings/connecteddevice/ConnectedDeviceActivityTest.java
new file mode 100644
index 00000000000..4be8a394a05
--- /dev/null
+++ b/tests/unit/src/com/android/settings/connecteddevice/ConnectedDeviceActivityTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2017 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.settings.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class ConnectedDeviceActivityTest {
+    private static final String INTENT_ACTION = "android.intent.action.MAIN";
+    private static final String CONNECTED_DEVICE_TITLE = "Connected devices";
+
+    private Instrumentation mInstrumentation;
+
+    @Before
+    public void setUp() throws Exception {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    }
+
+    @Test
+    public void queryConnectedDeviceActivity_onlyOneResponse() {
+        final PackageManager packageManager = mInstrumentation.getContext().getPackageManager();
+        final Intent intent = new Intent(INTENT_ACTION);
+
+        int count = 0;
+        final List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent,
+                PackageManager.GET_META_DATA);
+        for (ResolveInfo info : resolveInfoList) {
+            if (TextUtils.equals(info.activityInfo.loadLabel(packageManager).toString(),
+                    CONNECTED_DEVICE_TITLE)) {
+                count++;
+            }
+        }
+
+        assertThat(count).isEqualTo(1);
+    }
+
+}