commit 0dffeac00d6be0e37a75b564190a4f4a62908beb
author Lukacs Berki <lberki@google.com> Tue Sep 15 07:18:47 2015 +0000
committer John Field <jfield@google.com> Tue Sep 15 20:26:25 2015 +0000
tree 2eee97d676c26407f7f757f30c7237fec67df3f3
parent 415aae660a932ead71628072610948afd11d7dc2

Make --split_apk mobile-install work with a pristine device.

--
MOS_MIGRATED_REVID=103068396

tools/android/incremental_install_test.py

diff --git a/tools/android/incremental_install_test.py b/tools/android/incremental_install_test.py
index 87500fc..e16a00b 100644
--- a/tools/android/incremental_install_test.py
+++ b/tools/android/incremental_install_test.py
@@ -86,10 +86,11 @@
       if shell_cmdln.startswith(("mkdir", "am", "monkey", "input")):
         pass
       elif shell_cmdln.startswith("dumpsys package "):
-        return self._CreatePopenMock(
-            0,
-            "firstInstallTime=%s" % self.package_timestamp,
-            "")
+        if self.package_timestamp is not None:
+          timestamp = "firstInstallTime=%s" % self.package_timestamp
+        else:
+          timestamp = ""
+        return self._CreatePopenMock(0, timestamp, "")
       elif shell_cmdln.startswith("rm"):
         file_path = shell_cmdln.split()[2]
         self.files.pop(file_path, None)