commit 6c8f216d28c4e77200e5061bcc77bb33fe229a47
author Hall Liu <hallliu@google.com> Tue Jul 23 20:45:40 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 23 20:45:40 2019 -0700
tree a0db427239f0f2e26fe985792fa3be003d530450
parent 0f8d9fb37d7fee659e0c8d5e79cf6ad563276161
parent 0a027a8023c058bb534bfdec224b0800f839e15a

[automerger] Examine sort field for sensitive fields am: 1e324464f3 am: 195ef28686 am: 61828d1bf3 am: 86945cfad3 am: ee13143bf9
am: 0a027a8023

Change-Id: Ic67f14f8c222db7432e4e57849499d88e4693ac5

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 73d62e7..50761af 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -2031,15 +2031,16 @@
 
         if (match != URL_SIMINFO) {
             // Determine if we need to do a check for fields in the selection
-            boolean selectionContainsSensitiveFields;
+            boolean selectionOrSortContainsSensitiveFields;
             try {
-                selectionContainsSensitiveFields = containsSensitiveFields(selection);
+                selectionOrSortContainsSensitiveFields = containsSensitiveFields(selection);
+                selectionOrSortContainsSensitiveFields |= containsSensitiveFields(sort);
             } catch (Exception e) {
                 // Malformed sql, check permission anyway.
-                selectionContainsSensitiveFields = true;
+                selectionOrSortContainsSensitiveFields = true;
             }
 
-            if (selectionContainsSensitiveFields) {
+            if (selectionOrSortContainsSensitiveFields) {
                 try {
                     checkPermission();
                 } catch (SecurityException e) {