Make SharedPrefs apply package's security context on commit

devil/devil/android/sdk/shared_prefs_test.py

Index: devil/devil/android/sdk/shared_prefs_test.py
diff --git a/devil/devil/android/sdk/shared_prefs_test.py b/devil/devil/android/sdk/shared_prefs_test.py
index ff3b9a139f195976998a2005d3c798df970a1d24..4c31c569fd744d7e90c50b710c65f37a74ce7d1f 100755
--- a/devil/devil/android/sdk/shared_prefs_test.py
+++ b/devil/devil/android/sdk/shared_prefs_test.py
@@ -13,6 +13,7 @@ import unittest
 from devil import devil_env
 from devil.android import device_utils
 from devil.android.sdk import shared_prefs
+from devil.android.sdk import version_codes
 
 with devil_env.SysPath(devil_env.PYMOCK_PATH):
   import mock  # pylint: disable=import-error
@@ -97,6 +98,8 @@ class SharedPrefsTest(unittest.TestCase):
     self.assertTrue(prefs.changed)
 
   def testCommit(self):
+    type(self.device).build_version_sdk = mock.PropertyMock(

[jbudorick, 2017/03/11 00:29:27]

Does this mock get torn down?

[bsheedy, 2017/03/11 00:37:25]

It looks like it does, as self.device.build_version_sdk returns <MagicMock
name='mock.build_version_sdk' id='<<some number>>'> in all tests except the ones
with that mock, in which case it returns 22.

+        return_value=version_codes.LOLLIPOP_MR1)
     prefs = shared_prefs.SharedPrefs(
         self.device, 'com.some.package', 'other_prefs.xml')
     self.assertFalse(self.device.FileExists(prefs.path))  # file does not exist
@@ -131,6 +134,8 @@ class SharedPrefsTest(unittest.TestCase):
     self.assertEquals(self.device.WriteFile.call_args_list, [])  # did not write
 
   def testAsContextManager_readAndWrite(self):
+    type(self.device).build_version_sdk = mock.PropertyMock(
+        return_value=version_codes.LOLLIPOP_MR1)
     with shared_prefs.SharedPrefs(
         self.device, 'com.some.package', 'prefs.xml') as prefs:
       prefs.SetBoolean('featureEnabled', True)