Merge branch android10-qpr3-releaseandroid10-gsi

Change-Id: I3fc73b221520c7d63c58c4046f95919eb1bdf3d3

3 files changed, 15 insertions, 1 deletions

diff --git a/api/proc/KernelProcFileTestBase.py b/api/proc/KernelProcFileTestBase.py
index aeaac702..472961c9 100644
--- a/api/proc/KernelProcFileTestBase.py
+++ b/api/proc/KernelProcFileTestBase.py
@@ -137,6 +137,9 @@ class KernelProcFileTestBase(object):
         self.parser = yacc.yacc(module=self, write_tables=False, \
                 errorlog=yacc.PlyLogger(sys.stderr)) #open(os.devnull, 'w')))
 
+    def set_api_level(self, dut):
+        self.api_level = dut.getLaunchApiLevel(strict=False)
+
     def parse_line(self, rule, line, custom={}):
         """Parse a line of text with the parse library.
 
diff --git a/api/proc/ProcSimpleFileTests.py b/api/proc/ProcSimpleFileTests.py
index e19600d5..5bc9678d 100644
--- a/api/proc/ProcSimpleFileTests.py
+++ b/api/proc/ProcSimpleFileTests.py
@@ -18,6 +18,7 @@ import math
 
 from parse import with_pattern
 from vts.testcases.kernel.api.proc import KernelProcFileTestBase
+from vts.utils.python.android import api
 from vts.utils.python.file import target_file_utils
 
 # Test for /proc/sys/kernel/*.
@@ -439,9 +440,18 @@ class ProcDropCaches(KernelProcFileTestBase.KernelProcFileTestBase):
     def get_path(self):
         return "/proc/sys/vm/drop_caches"
 
+    def IsReadWriteOrWriteOnly(self, permission_bits):
+        return (target_file_utils.IsReadWrite(permission_bits) or
+                target_file_utils.IsWriteOnly(permission_bits))
+
     def get_permission_checker(self):
-        return target_file_utils.IsReadWrite
+        if self.api_level > api.PLATFORM_API_LEVEL_Q:
+            return target_file_utils.IsWriteOnly
+        else:
+            return self.IsReadWriteOrWriteOnly
 
+    def test_format(self):
+        return False
 
 class ProcExtraFreeKbytes(KernelProcFileTestBase.KernelProcFileTestBase):
     '''/proc/sys/vm/extra_free_kbytes tells the VM to keep extra free memory
diff --git a/api/proc/VtsKernelProcFileApiTest.py b/api/proc/VtsKernelProcFileApiTest.py
index 3451f5c8..5a2b3240 100644
--- a/api/proc/VtsKernelProcFileApiTest.py
+++ b/api/proc/VtsKernelProcFileApiTest.py
@@ -141,6 +141,7 @@ class VtsKernelProcFileApiTest(base_test.BaseTestClass):
         """
         asserts.skipIf(test_object in TEST_OBJECTS_64 and not self.dut.is64Bit,
                        "Skip test for 64-bit kernel.")
+        test_object.set_api_level(self.dut)
         filepath = test_object.get_path()
         asserts.skipIf(not target_file_utils.Exists(filepath, self.shell) and
                        test_object.file_optional(shell=self.shell, dut=self.dut),