[Android] Set permissions when clearing app state in test runner platform mode.

build/android/pylib/local/device/local_device_instrumentation_test_run.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import re
 import time
 
 from devil.android import device_errors
 from devil.android import flag_changer
@@ skipping 250 matching lines @@
           r.SetType(base_test_result.ResultType.CRASH)
 
     if any(r.GetType() not in (base_test_result.ResultType.PASS,
                                base_test_result.ResultType.SKIP)
            for r in results):
       logging.info('detected failure in %s. raw output:', test_display_name)
       for l in output:
         logging.info('  %s', l)
       if (not self._env.skip_clear_data
           and self._test_instance.package_info):
-        device.ClearApplicationState(self._test_instance.package_info.package)
+        permissions = (
+            self._test_instance.apk_under_test

[jbudorick, 2016/05/10 23:23:29]

I think this is backwards.

[rnephew (Reviews Here), 2016/05/10 23:27:33]

Done.

+            if self._test_instance.apk_under_test.GetPermissions()
+            else None)
+        device.ClearApplicationState(self._test_instance.package_info.package,
+                                     permissions=permissions)
+
     else:
       logging.debug('raw output from %s:', test_display_name)
       for l in output:
         logging.debug('  %s', l)
 
     return results
 
   #override
   def _ShouldShard(self):
     return True
@@ skipping 13 matching lines @@
         timeout = v
         break
     else:
       logging.warning('Using default 1 minute timeout for %s', test_name)
       timeout = 60
 
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout