commit 7e763845242955fbe7935078eb17ee6758763a10
author Hall Liu <hallliu@google.com> Tue Jul 23 21:10:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 23 21:10:17 2019 -0700
tree 0ec6dac076f6ccca91b7b22722952d076d02d863
parent ea51c2efbd917d5893c2bb1649bf9ec8eda0d277
parent 7ed308ef9e05cdf99efbb9c69674a2712c8b7dee

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

Change-Id: I9659dc1a15c2d9c1489019e33df436502ea81c0d

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 8ff9121..5ff0294 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -2514,15 +2514,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) {