commit b497f2616f3a6a2653c96f7c62c163914607c383
author Sahana Rao <sahanas@google.com> Thu Sep 26 21:29:08 2019 +0100
committer Sahana Rao <sahanas@google.com> Thu Oct 03 11:02:51 2019 +0100
tree 8dfc8ec40c1e6dd25be8b1121b728da463957a82
parent 29bff330cbc7f0fe73e44c7d59b0f429e6c3f6a1

Check ACCESS_MEDIA_LOCATION split permission in CTS test

Q splits ACCESS_MEDIA_LOCATION from READ_EXTERNAL_STORAGE. CTS test
checks for the correctness of this split permission but does not check
for the existence of ACCESS_MEDIA_LOCATION split permission.

Bug: 141667187
Test: atest SplitPermissionsSystemTest
Change-Id: Iab34ac96452160d6cb4ee69ad7f7d035a73c2c5b
Merged-In: Iab34ac96452160d6cb4ee69ad7f7d035a73c2c5b

tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java

diff --git a/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java b/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java
index 4670928..c15b7a4 100755
--- a/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java
+++ b/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java
@@ -19,6 +19,7 @@
 import static android.Manifest.permission.ACCESS_BACKGROUND_LOCATION;
 import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static android.Manifest.permission.ACCESS_MEDIA_LOCATION;
 import static android.Manifest.permission.READ_CALL_LOG;
 import static android.Manifest.permission.READ_CONTACTS;
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
@@ -104,6 +105,13 @@
                 case ACCESS_COARSE_LOCATION:
                     assertSplit(split, ACCESS_BACKGROUND_LOCATION, Build.VERSION_CODES.Q);
                     break;
+                case READ_EXTERNAL_STORAGE:
+                    assertSplit(split, ACCESS_MEDIA_LOCATION, Build.VERSION_CODES.Q);
+                    // Remove this split permission from seenSplits, ACCESS_MEDIA_LOCATION is not
+                    // always available hence removing this permission from seenSplits will
+                    // avoid seenSplits size check fail.
+                    seenSplits.remove(split);
+                    break;
             }
         }