StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

releasetools: correct allowed property sources for incremental OTAs

Browse Source 
When loading build info from a previous version of Android, the set of
allowed property sources should match those available in that version.
In this particular case, the product_services partition was a valid
property source in Android 10.

Bug: 155053195
Test: ran unit tests from test_common.py
Test: generated an incremental OTA which previously failed
Change-Id: Ic0b0a112656533eca78dee31517deff7e3c8d7cc
Merged-In: Ic0b0a112656533eca78dee31517deff7e3c8d7cc
This commit is contained in:
Steven Laver
2020-04-27 16:26:31 -07:00
parent e414a3fd3d
commit dd33d75d39
2 changed files with 109 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
tools/releasetools/test_common.py
View File

@@ -107,6 +107,51 @@ class BuildInfoTest(test_utils.ReleaseToolsTestCase):
},
]
TEST_INFO_DICT_PROPERTY_SOURCE_ORDER = {
'build.prop' : {
'ro.build.fingerprint' : 'build-fingerprint',
'ro.product.property_source_order' :
'product,odm,vendor,system_ext,system',
},
'system.build.prop' : {
'ro.product.system.device' : 'system-product-device',
},
'vendor.build.prop' : {
'ro.product.vendor.device' : 'vendor-product-device',
},
}
TEST_INFO_DICT_PROPERTY_SOURCE_ORDER_ANDROID_10 = {
'build.prop' : {
'ro.build.fingerprint' : 'build-fingerprint',
'ro.product.property_source_order' :
'product,product_services,odm,vendor,system',
'ro.build.version.release' : '10',
'ro.build.version.codename' : 'REL',
},
'system.build.prop' : {
'ro.product.system.device' : 'system-product-device',
},
'vendor.build.prop' : {
'ro.product.vendor.device' : 'vendor-product-device',
},
}
TEST_INFO_DICT_PROPERTY_SOURCE_ORDER_ANDROID_9 = {
'build.prop' : {
'ro.product.device' : 'product-device',
'ro.build.fingerprint' : 'build-fingerprint',
'ro.build.version.release' : '9',
'ro.build.version.codename' : 'REL',
},
'system.build.prop' : {
'ro.product.system.device' : 'system-product-device',
},
'vendor.build.prop' : {
'ro.product.vendor.device' : 'vendor-product-device',
},
}
def test_init(self):
target_info = common.BuildInfo(self.TEST_INFO_DICT, None)
self.assertEqual('product-device', target_info.device)
@@ -253,6 +298,41 @@ class BuildInfoTest(test_utils.ReleaseToolsTestCase):
],
script_writer.lines)
def test_ResolveRoProductProperty_FromVendor(self):
info_dict = copy.deepcopy(self.TEST_INFO_DICT_PROPERTY_SOURCE_ORDER)
info = common.BuildInfo(info_dict, None)
self.assertEqual('vendor-product-device',
info.GetBuildProp('ro.product.device'))
def test_ResolveRoProductProperty_FromSystem(self):
info_dict = copy.deepcopy(self.TEST_INFO_DICT_PROPERTY_SOURCE_ORDER)
del info_dict['vendor.build.prop']['ro.product.vendor.device']
info = common.BuildInfo(info_dict, None)
self.assertEqual('system-product-device',
info.GetBuildProp('ro.product.device'))
def test_ResolveRoProductProperty_InvalidPropertySearchOrder(self):
info_dict = copy.deepcopy(self.TEST_INFO_DICT_PROPERTY_SOURCE_ORDER)
info_dict['build.prop']['ro.product.property_source_order'] = 'bad-source'
with self.assertRaisesRegexp(common.ExternalError,
'Invalid ro.product.property_source_order'):
info = common.BuildInfo(info_dict, None)
info.GetBuildProp('ro.product.device')
def test_ResolveRoProductProperty_Android10PropertySearchOrder(self):
info_dict = copy.deepcopy(
self.TEST_INFO_DICT_PROPERTY_SOURCE_ORDER_ANDROID_10)
info = common.BuildInfo(info_dict, None)
self.assertEqual('vendor-product-device',
info.GetBuildProp('ro.product.device'))
def test_ResolveRoProductProperty_Android9PropertySearchOrder(self):
info_dict = copy.deepcopy(
self.TEST_INFO_DICT_PROPERTY_SOURCE_ORDER_ANDROID_9)
info = common.BuildInfo(info_dict, None)
self.assertEqual('product-device',
info.GetBuildProp('ro.product.device'))
class CommonZipTest(test_utils.ReleaseToolsTestCase):