Merge Android10 QPR1 into AOSP master am: c6765102db am: 73ef60476a
Change-Id: I03446c2475165752b6ff9048d5d7da715c72db11
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index f0f5ffa..6963473 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="3836152623003881586">"অবরুদ্ধ নম্বরগুলির সঞ্চয়স্থান"</string>
+ <string name="app_label" msgid="3836152623003881586">"ব্লক করা নম্বরগুলির স্টোরেজ"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 85f4998..ec0fdaa 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="3836152623003881586">"अवरोधित नंबरों का संग्रहण"</string>
+ <string name="app_label" msgid="3836152623003881586">"ब्लॉक नंबरों की स्टोरेज"</string>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 374c7c5..2abbb76 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="3836152623003881586">"Արգելափակված համարների պահեստ"</string>
+ <string name="app_label" msgid="3836152623003881586">"Արգելափակված համարների պահոց"</string>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 23dd405..ee2ced3 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="3836152623003881586">"अवरोधित केलेल्या नंबरचा स्टोरेज"</string>
+ <string name="app_label" msgid="3836152623003881586">"ब्लॉक केलेल्या नंबरचा स्टोरेज"</string>
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 5dea283..0bb1812 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="3836152623003881586">"ଅବରୋଧିତ ସଂଖ୍ୟାର ଷ୍ଟୋରେଜ୍"</string>
+ <string name="app_label" msgid="3836152623003881586">"ବ୍ଲକ୍ ହୋଇଥିବା ସଂଖ୍ୟାର ଷ୍ଟୋରେଜ୍"</string>
</resources>
diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
index 4d6a284..eb3d992 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -39,6 +39,7 @@
import android.os.CancellationSignal;
import android.os.PersistableBundle;
import android.os.Process;
+import android.os.UserHandle;
import android.os.UserManager;
import android.provider.BlockedNumberContract;
import android.provider.BlockedNumberContract.SystemContract;
@@ -326,17 +327,17 @@
res.putInt(BlockedNumberContract.RES_NUM_ROWS_DELETED, unblock(arg));
break;
- case SystemContract.METHOD_NOTIFY_EMERGENCY_CONTACT:
+ case BlockedNumberContract.METHOD_NOTIFY_EMERGENCY_CONTACT:
enforceSystemWritePermissionAndPrimaryUser();
notifyEmergencyContact();
break;
- case SystemContract.METHOD_END_BLOCK_SUPPRESSION:
+ case BlockedNumberContract.METHOD_END_BLOCK_SUPPRESSION:
enforceSystemWritePermissionAndPrimaryUser();
endBlockSuppression();
break;
- case SystemContract.METHOD_GET_BLOCK_SUPPRESSION_STATUS:
+ case BlockedNumberContract.METHOD_GET_BLOCK_SUPPRESSION_STATUS:
enforceSystemReadPermissionAndPrimaryUser();
SystemContract.BlockSuppressionStatus status = getBlockSuppressionStatus();
@@ -344,19 +345,19 @@
res.putLong(SystemContract.RES_BLOCKING_SUPPRESSED_UNTIL_TIMESTAMP,
status.untilTimestampMillis);
break;
- case SystemContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER:
+ case BlockedNumberContract.METHOD_SHOULD_SYSTEM_BLOCK_NUMBER:
enforceSystemReadPermissionAndPrimaryUser();
int blockReason = shouldSystemBlockNumber(arg, extras);
res.putBoolean(BlockedNumberContract.RES_NUMBER_IS_BLOCKED,
blockReason != BlockedNumberContract.STATUS_NOT_BLOCKED);
res.putInt(BlockedNumberContract.RES_BLOCK_STATUS, blockReason);
break;
- case SystemContract.METHOD_SHOULD_SHOW_EMERGENCY_CALL_NOTIFICATION:
+ case BlockedNumberContract.METHOD_SHOULD_SHOW_EMERGENCY_CALL_NOTIFICATION:
enforceSystemReadPermissionAndPrimaryUser();
res.putBoolean(BlockedNumberContract.RES_SHOW_EMERGENCY_CALL_NOTIFICATION,
shouldShowEmergencyCallNotification());
break;
- case SystemContract.METHOD_GET_ENHANCED_BLOCK_SETTING:
+ case BlockedNumberContract.METHOD_GET_ENHANCED_BLOCK_SETTING:
enforceSystemReadPermissionAndPrimaryUser();
if (extras != null) {
String key = extras.getString(BlockedNumberContract.EXTRA_ENHANCED_SETTING_KEY);
@@ -364,7 +365,7 @@
res.putBoolean(BlockedNumberContract.RES_ENHANCED_SETTING_IS_ENABLED, value);
}
break;
- case SystemContract.METHOD_SET_ENHANCED_BLOCK_SETTING:
+ case BlockedNumberContract.METHOD_SET_ENHANCED_BLOCK_SETTING:
enforceSystemWritePermissionAndPrimaryUser();
if (extras != null) {
String key = extras.getString(BlockedNumberContract.EXTRA_ENHANCED_SETTING_KEY);
@@ -451,8 +452,7 @@
}
private boolean canCurrentUserBlockUsers() {
- UserManager userManager = getContext().getSystemService(UserManager.class);
- return userManager.isPrimaryUser();
+ return getContext().getUserId() == UserHandle.USER_SYSTEM;
}
private void notifyEmergencyContact() {