Snap for 7316203 from 12d54eaa6857b6b0c9ac578eeb79dfbbb7ce06a5 to rvc-platform-release
Change-Id: I2f0e374b9119de9dc8f847177cb5c58dc230840c
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index be62fc1..6cb5337 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,6 +20,7 @@
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.USE_RESERVED_DISK" />
<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
+ <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
<permission
android:name="android.permission.SEND_CALL_LOG_CHANGE"
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index cb75f20..5924656 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -28,7 +28,7 @@
<string name="debug_dump_title" msgid="4916885724165570279">"संपर्क डेटाबेस कॉपी करा"</string>
<string name="debug_dump_database_message" msgid="406438635002392290">"तुम्ही 1) आपल्‍या डेटाबेसची प्रत बनवणार आहात जिच्‍यामध्‍ये सर्व संपर्कांसंबंधी माहिती आणि अंतर्गत संचयनावरील कॉल लॉग समाविष्‍ट असतात आणि 2) ती ईमेल करणार आहात. तुम्ही डिव्‍हाइसवरून यशस्‍वीरित्‍या प्रत कॉपी केल्‍यानंतर किंवा ईमेल प्राप्त केल्‍यानंतर लगेच ती हटविण्‍याचे लक्षात ठेवा."</string>
<string name="debug_dump_delete_button" msgid="7832879421132026435">"आता हटवा"</string>
- <string name="debug_dump_start_button" msgid="2837506913757600001">"प्रारंभ करा"</string>
+ <string name="debug_dump_start_button" msgid="2837506913757600001">"सुरू करा"</string>
<string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"तुमची फाइल पाठविण्‍यासाठी एक प्रोग्राम निवडा"</string>
<string name="debug_dump_email_subject" msgid="108188398416385976">"संपर्क Db संलग्‍न केला"</string>
<string name="debug_dump_email_body" msgid="4577749800871444318">"संलग्‍न केलेला माझ्‍या सर्व संपर्क माहितीसह माझा संपर्क डेटाबेस आहे. काळजीपूर्वक हाताळणी करा."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index d6cbf41..bb60c01 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/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="sharedUserLabel" msgid="8024311725474286801">"Android ప్రధాన అనువర్తనాలు"</string>
+ <string name="sharedUserLabel" msgid="8024311725474286801">"Android ప్రధాన యాప్లు"</string>
<string name="app_label" msgid="3389954322874982620">"పరిచయాల నిల్వ"</string>
<string name="provider_label" msgid="6012150850819899907">"పరిచయాలు"</string>
<string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"పరిచయాల అప్గ్రేడ్కు మరింత మెమరీ అవసరం."</string>
diff --git a/src/com/android/providers/contacts/debug/ContactsDumpActivity.java b/src/com/android/providers/contacts/debug/ContactsDumpActivity.java
index 359f3f8..725b5bf 100644
--- a/src/com/android/providers/contacts/debug/ContactsDumpActivity.java
+++ b/src/com/android/providers/contacts/debug/ContactsDumpActivity.java
@@ -66,6 +66,13 @@
}
@Override
+ protected void onStart() {
+ super.onStart();
+ getWindow().addSystemFlags(android.view.WindowManager.LayoutParams
+ .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ }
+
+ @Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.confirm:
diff --git a/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java b/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java
index b15d01a..fca00af 100644
--- a/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java
+++ b/tests/src/com/android/providers/contacts/ContactDirectoryManagerTest.java
@@ -624,7 +624,7 @@
*/
public void testGetDirectoryProviderPackages() {
final PackageManager pm = getContext().getPackageManager();
- final String googleSync = "com.google.android.syncadapters.contacts";
+ final String googleSync = "com.google.android.gms";
// Skip if the package is not installed.
try {
