Revert "DO NOT MERGE Examine sort field for sensitive fields"
This reverts commit ecf038d6ffb92810ba087da6e0cc81e095e083b2.
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index b2d5487..7f3e463 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -138,6 +138,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import java.util.function.Consumer;
import java.util.zip.CRC32;
public class TelephonyProvider extends ContentProvider
@@ -2803,7 +2804,7 @@
List<String> constraints = new ArrayList<String>();
int match = s_urlMatcher.match(url);
- checkQueryPermission(match, projectionIn, selection, sort);
+ checkQueryPermission(match, projectionIn, selection);
switch (match) {
case URL_TELEPHONY_USING_SUBID: {
subIdString = url.getLastPathSegment();
@@ -3012,21 +3013,19 @@
return ret;
}
- private void checkQueryPermission(int match, String[] projectionIn, String selection,
- String sort) {
+ private void checkQueryPermission(int match, String[] projectionIn, String selection) {
if (match != URL_SIMINFO && match != URL_SIMINFO_USING_SUBID) {
// Determine if we need to do a check for fields in the selection
- boolean selectionOrSortContainsSensitiveFields;
+ boolean selectionContainsSensitiveFields;
try {
- selectionOrSortContainsSensitiveFields = containsSensitiveFields(selection);
- selectionOrSortContainsSensitiveFields |= containsSensitiveFields(sort);
+ selectionContainsSensitiveFields = containsSensitiveFields(selection);
} catch (IllegalArgumentException e) {
// Malformed sql, check permission anyway and return.
checkPermission();
return;
}
- if (selectionOrSortContainsSensitiveFields) {
+ if (selectionContainsSensitiveFields) {
try {
checkPermission();
} catch (SecurityException e) {