commit 88bedac544f275dfb5ff3bde6cffd9d16ab3bfd2
author Marcus Hagerott <mhagerott@google.com> Thu Aug 19 15:40:35 2021 -0700
committer Marcus Hagerott <mhagerott@google.com> Thu Aug 19 15:50:15 2021 -0700
tree 186ddeaf82ddb76cb183f4bbf3d7496a9eeff561
parent bc7271af44f907d74309e4bbaf4fab6cfef24ed5

Validate projection for SimPhonebookContract.SimRecords queries

Test: atest TeleServiceTests:SimPhonebookProviderTest
Bug: 197150770
Change-Id: I63138f81c58df3c2c2a1fd86da2a3ef0fe89a93d

src/com/android/phone/SimPhonebookProvider.java

diff --git a/src/com/android/phone/SimPhonebookProvider.java b/src/com/android/phone/SimPhonebookProvider.java
index 5188d96..04c4f48 100644
--- a/src/com/android/phone/SimPhonebookProvider.java
+++ b/src/com/android/phone/SimPhonebookProvider.java
@@ -97,6 +97,8 @@
     private static final String TAG = "SimPhonebookProvider";
     private static final Set<String> ELEMENTARY_FILES_COLUMNS_SET =
             ImmutableSet.copyOf(ELEMENTARY_FILES_ALL_COLUMNS);
+    private static final Set<String> SIM_RECORDS_COLUMNS_SET =
+            ImmutableSet.copyOf(SIM_RECORDS_ALL_COLUMNS);
     private static final Set<String> SIM_RECORDS_WRITABLE_COLUMNS = ImmutableSet.of(
             SimRecords.NAME, SimRecords.PHONE_NUMBER
     );
@@ -355,6 +357,7 @@
     }
 
     private Cursor querySimRecords(PhonebookArgs args, String[] projection) {
+        validateProjection(SIM_RECORDS_COLUMNS_SET, projection);
         validateSubscriptionAndEf(args);
         if (projection == null) {
             projection = SIM_RECORDS_ALL_COLUMNS;
@@ -409,6 +412,7 @@
     }
 
     private Cursor querySimRecordsItem(PhonebookArgs args, String[] projection) {
+        validateProjection(SIM_RECORDS_COLUMNS_SET, projection);
         if (projection == null) {
             projection = SIM_RECORDS_ALL_COLUMNS;
         }