From 4f1ebfdc55d85b02a2ef549370ccbb06b4a535b3 Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Mon, 21 Jun 2021 15:37:43 +0800
Subject: [PATCH] Rollback the See More Intent for non-provider model design

Bug: 191055897
Test: manual test
atest -c InternetConnectivityPanelTest
atest \
CtsProviderTestCases:android.provider.cts.SettingsPanelTest#internetPanel_seeMoreButton_launchesIntoSettings -- --abi arm64-v8a

Change-Id: Iad57dd6a9cdbc4b33f80255bdb4758f80f9f2151
---
 .../android/settings/panel/InternetConnectivityPanel.java   | 6 +++++-
 .../settings/panel/InternetConnectivityPanelTest.java       | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/panel/InternetConnectivityPanel.java b/src/com/android/settings/panel/InternetConnectivityPanel.java
index 0fa1e46ad39..53c0f20ad19 100644
--- a/src/com/android/settings/panel/InternetConnectivityPanel.java
+++ b/src/com/android/settings/panel/InternetConnectivityPanel.java
@@ -30,6 +30,7 @@ import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.os.HandlerExecutor;
 import android.os.Looper;
+import android.provider.Settings;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyCallback;
@@ -235,7 +236,10 @@ public class InternetConnectivityPanel implements PanelContent, LifecycleObserve
 
     @Override
     public Intent getSeeMoreIntent() {
-        return null;
+        // Don't remove the see more intent for non-provider model design. This intent will be
+        // used when isCustomizedButtonUsed() returns false.
+        return new Intent(Settings.ACTION_WIRELESS_SETTINGS)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     }
 
     @Override
diff --git a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
index 837cf7af547..c13d368d2f7 100644
--- a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
+++ b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
@@ -255,8 +255,8 @@ public class InternetConnectivityPanelTest {
     }
 
     @Test
-    public void getSeeMoreIntent_shouldBeNull() {
-        assertThat(mPanel.getSeeMoreIntent()).isNull();
+    public void getSeeMoreIntent_shouldNotNull() {
+        assertThat(mPanel.getSeeMoreIntent()).isNotNull();
     }
 
     @Test