Remove grf_required_api_level
As we don't fix the grf window, we may not calculate the grf
expiration date and the required api level.
The verification of this will be covered by the tests at run time.
Bug: 176950752
Test: atest --host post_process_props_unittest
Change-Id: I1205f0d9a9da5bc508a49acbcbb7da581800bf45
diff --git a/tools/test_post_process_props.py b/tools/test_post_process_props.py
index dd5f8ec..236f9ed 100644
--- a/tools/test_post_process_props.py
+++ b/tools/test_post_process_props.py
@@ -258,30 +258,20 @@
props.put("ro.board.first_api_level","25")
# ro.board.first_api_level must be less than or equal to the sdk version
- self.assertFalse(validate_and_add_grf_props(props, 20))
- self.assertTrue(validate_and_add_grf_props(props, 26))
- # ro.board.api_level is automatically set
- self.assertEqual(props.get_value("ro.board.api_level"), "25")
+ self.assertFalse(validate_grf_props(props, 20))
+ self.assertTrue(validate_grf_props(props, 26))
+ self.assertTrue(validate_grf_props(props, 35))
- props.get_all_props()[-1].make_as_comment()
- self.assertTrue(validate_and_add_grf_props(props, 35))
- # ro.board.api_level is automatically set to the required GRF version
- self.assertEqual(props.get_value("ro.board.api_level"), "33")
-
- props.get_all_props()[-1].make_as_comment()
# manually set ro.board.api_level to an invalid value
props.put("ro.board.api_level","20")
- self.assertFalse(validate_and_add_grf_props(props, 26))
+ self.assertFalse(validate_grf_props(props, 26))
props.get_all_props()[-1].make_as_comment()
# manually set ro.board.api_level to a valid value
props.put("ro.board.api_level","26")
- self.assertTrue(validate_and_add_grf_props(props, 26))
+ self.assertTrue(validate_grf_props(props, 26))
# ro.board.api_level must be less than or equal to the sdk version
- self.assertFalse(validate_and_add_grf_props(props, 25))
- # ro.board.api_level must be greater than or equal to the required GRF
- # version
- self.assertFalse(validate_and_add_grf_props(props, 30))
+ self.assertFalse(validate_grf_props(props, 25))
if __name__ == '__main__':
unittest.main(verbosity=2)