From 15765a97fe1ff4b5520acaab215220f26e5d4d2f Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Tue, 19 Dec 2017 14:09:29 -0800
Subject: [PATCH 1/2] Fix bug in SummaryLoader

It should use msg.obj to detect whether to start listening, not
msg.arg1.

Bug: 70607303
Test: Build
Change-Id: I55c4d988f0ebb35f4be9039055eba7803c0b082f
---
 src/com/android/settings/dashboard/SummaryLoader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index 5af276c1343..c91882df23e 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -306,7 +306,7 @@ public class SummaryLoader {
                     makeProviderW(tile);
                     break;
                 case MSG_SET_LISTENING:
-                    boolean listening = msg.arg1 != 0;
+                    boolean listening = msg.obj != null && msg.obj.equals(1);
                     setListeningW(listening);
                     break;
             }

From 28fcc97d1bdca0c4f0810c421394b89d702fbaee Mon Sep 17 00:00:00 2001
From: Akiya Utsumi <akiya.x.utsumi@sony.com>
Date: Tue, 31 Oct 2017 11:11:15 +0900
Subject: [PATCH 2/2] Fix the format of wifi_carrier_content string

Carrier name is not displayed on the dialog due to the
incorrect format "%1%s". This should be "%1$s".

Test: String change, manually verified
Bug: 70814622
Change-Id: Ie30b8d1eb85d390e4023e0a251e1f1c7fa6deec0
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9cbb85eed8f..788c1ac91bb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1928,7 +1928,7 @@
     <!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=40] -->
     <string name="wifi_carrier_connect">Carrier Wi\u2011Fi network</string>
     <!-- Message in dialog when the user tries to connect to a carrier network[CHAR_LIMIT=60] -->
-    <string name="wifi_carrier_content">Connect via <xliff:g id="name">%1%s</xliff:g></string>
+    <string name="wifi_carrier_content">Connect via <xliff:g id="name">%1$s</xliff:g></string>
 
     <string name="wifi_scan_always_turnon_message">To improve location accuracy and for other purposes, <xliff:g id="app_name">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?</string>
     <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->