Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I731ca03e919698dd4228cffd9ced4511e5de9927
Change-Id: I2238071d6bef76834283aaa13ac42c1eb421137f
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index fc19c26..377ed88 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -52,7 +52,7 @@
<string name="wifi_direct_printing" msgid="8423811041563144048">"Wi-Fi Direct 列印"</string>
<string name="wifi_direct_printers" msgid="541168032444693191">"Wi-Fi Direct 打印機"</string>
<string name="searching" msgid="2114018057619514587">"正在搜尋…"</string>
- <string name="connect_hint_text" msgid="587112503851044234">"你可能需要在打印機的前置面板上核准此連線"</string>
+ <string name="connect_hint_text" msgid="587112503851044234">"您可能需要在打印機的前置面板上核准此連線"</string>
<string name="connecting_to" msgid="2665161014972086194">"正在連接 <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
<string name="failed_printer_connection" msgid="4196305972749960362">"無法連接打印機"</string>
<string name="failed_connection" msgid="8068661997318286575">"無法連接 <xliff:g id="PRINTER">%1$s</xliff:g>"</string>
diff --git a/src/com/android/bips/util/BroadcastMonitor.java b/src/com/android/bips/util/BroadcastMonitor.java
index 37d53fd..8a68dbf 100644
--- a/src/com/android/bips/util/BroadcastMonitor.java
+++ b/src/com/android/bips/util/BroadcastMonitor.java
@@ -41,7 +41,7 @@
}
mContext = context;
mReceiver = receiver;
- mContext.registerReceiver(this, filter);
+ mContext.registerReceiver(this, filter, Context.RECEIVER_EXPORTED/*UNAUDITED*/);
}
/** Stop monitoring for broadcast intents */
