Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1

Android 5.1.0 release 1

5 files changed, 6 insertions, 6 deletions

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0034f93..60604fe 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -21,7 +21,7 @@
     <string name="title_select_cert" msgid="3588447616418041699">"प्रमाणपत्र चुनें"</string>
     <string name="requesting_application" msgid="1589142627467598421">"%s ऐप्स ने प्रमाणपत्र का अनुरोध किया है. प्रमाणपत्र चुनने से ऐप्स इस पहचान का उपयोग अभी और भविष्‍य में सर्वर के साथ कर सकेगा."</string>
     <string name="requesting_server" msgid="5832565605998634370">"ऐप्स ने अनुरोध करने वाले सर्वर को %s के रूप में पहचाना है, लेकिन आपको ऐप्स  को प्रमाणपत्र पर केवल तब ही पहुंच देना चाहिए जब आप ऐप्स पर विश्वास करते हों."</string>
-    <string name="install_new_cert_message" msgid="4451971501142085495">"आप बाहरी मेमोरी में मौजूद %1$s या %2$s एक्‍सटेंशन वाली PKCS#12 फ़ाइल से प्रमाणपत्र इंस्‍टॉल कर सकते हैं."</string>
+    <string name="install_new_cert_message" msgid="4451971501142085495">"आप बाहरी संग्रहण में मौजूद %1$s या %2$s एक्‍सटेंशन वाली PKCS#12 फ़ाइल से प्रमाणपत्र इंस्‍टॉल कर सकते हैं."</string>
     <string name="install_new_cert_button_label" msgid="510732745267546907">"इंस्टॉल करें"</string>
     <string name="allow_button" msgid="5340501035618157678">"अनुमति दें"</string>
     <string name="deny_button" msgid="3766539809121892584">"अस्वीकार करें"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4db4d20..fa660e9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -19,8 +19,8 @@
     <string name="app_name" msgid="170210454004696382">"Chaveiro"</string>
     <string name="title_no_certs" msgid="8350009443064722873">"Nenhum certificado encontrado"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"Escolher certificado"</string>
-    <string name="requesting_application" msgid="1589142627467598421">"O app %s solicitou um certificado. A escolha de um certificado permitirá que o app use esta identidade com os servidores de agora em diante."</string>
-    <string name="requesting_server" msgid="5832565605998634370">"O app identificou o servidor da solicitação como %s, mas você só deve permitir o acesso ao certificado caso confie no app."</string>
+    <string name="requesting_application" msgid="1589142627467598421">"O aplicativo %s solicitou um certificado. A escolha de um certificado permitirá que o aplicativo use esta identidade com os servidores de agora em diante."</string>
+    <string name="requesting_server" msgid="5832565605998634370">"O aplicativo identificou o servidor da solicitação como %s, mas você só deve permitir o acesso ao certificado caso confie no aplicativo."</string>
     <string name="install_new_cert_message" msgid="4451971501142085495">"Você pode instalar certificados a partir de um arquivo PKCS#12 com a extensão %1$s ou %2$s armazenado externamente."</string>
     <string name="install_new_cert_button_label" msgid="510732745267546907">"Instalar"</string>
     <string name="allow_button" msgid="5340501035618157678">"Permitir"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index be18ddf..f9aea02 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="170210454004696382">"Shramba poverilnic"</string>
+    <string name="app_name" msgid="170210454004696382">"Key Chain"</string>
     <string name="title_no_certs" msgid="8350009443064722873">"Potrdil ni mogoče najti"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"Izberite potrdilo"</string>
     <string name="requesting_application" msgid="1589142627467598421">"Aplikacija %s je zahtevala potrdilo. Če izberete potrdilo, boste aplikaciji omogočili uporabo te identitete s strežniki zdaj in v prihodnosti."</string>
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 994fb12..73bb029 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -127,7 +127,7 @@ public class KeyChainActivity extends Activity {
             case UNLOCK_CANCELED:
                 // User wanted to cancel the request, so exit.
                 mState = State.INITIAL;
-                finish();
+                finish(null);
                 return;
             default:
                 throw new AssertionError();
diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 6923a40..f67b25f 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -427,7 +427,7 @@ public class KeyChainService extends IntentService {
 
     private void broadcastStorageChange() {
         Intent intent = new Intent(KeyChain.ACTION_STORAGE_CHANGED);
-        sendBroadcast(intent);
+        sendBroadcastAsUser(intent, new UserHandle(UserHandle.myUserId()));
     }
 
 }