Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6464edbf authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Skip _oem_props if oem_dicts is None."

parents af4c62f7 d7c160ff

tools/releasetools/common.py

+6 −3
Original line number Diff line number Diff line
@@ -361,10 +361,13 @@ class BuildInfo(object): 
    self.oem_dicts = oem_dicts



    self._is_ab = info_dict.get("ab_update") == "true"

    self._oem_props = info_dict.get("oem_fingerprint_properties")



    if self._oem_props:

      assert oem_dicts, "OEM source required for this build"

    # Skip _oem_props if oem_dicts is None to use BuildInfo in

    # sign_target_files_apks

    if self.oem_dicts:

      self._oem_props = info_dict.get("oem_fingerprint_properties")

    else:

      self._oem_props = None



    def check_fingerprint(fingerprint):

      if (" " in fingerprint or any(ord(ch) > 127 for ch in fingerprint)):

tools/releasetools/test_common.py

+0 −4
Original line number Diff line number Diff line
@@ -176,10 +176,6 @@ class BuildInfoTest(test_utils.ReleaseToolsTestCase): 
    self.assertEqual('brand3/product-name/device3:build-thumbprint',

                     target_info.fingerprint)



    # Missing oem_dict should be rejected.

    self.assertRaises(AssertionError, common.BuildInfo,

                      self.TEST_INFO_DICT_USES_OEM_PROPS, None)



  def test_init_badFingerprint(self):

    info_dict = copy.deepcopy(self.TEST_INFO_DICT)

    info_dict['build.prop']['ro.build.fingerprint'] = 'bad fingerprint'