commit 4bc5649caf133658c598565a89d92b2747ba373c
author Michal Karpinski <mkarpinski@google.com> Thu Jan 31 12:07:33 2019 +0000
committer Michal Karpinski <mkarpinski@google.com> Thu Jan 31 16:50:33 2019 +0000
tree 1c30c4d27c10e1693a09759abfdc5ede42d632ad
parent c7026dd6ae32aadb55ecc764ff2e143b70defc9d

Minor refactoring for instrumenting with background activity
starts permission

Bug: 110956953
Test: atest WmTests:ActivityStarterTests
Change-Id: I144542ffb6a17364efc5d64e8fc516b4af7465ad

services/core/java/com/android/server/am/ProcessRecord.java

diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index 6161f7d..5dccaf1 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -1172,9 +1172,9 @@
 
     void setActiveInstrumentation(ActiveInstrumentation instr) {
         mInstr = instr;
-        mWindowProcessController.setInstrumenting(instr != null);
-        mWindowProcessController.setInstrumentingWithBackgroundActivityStartPrivileges(instr != null
-                && instr.mHasBackgroundActivityStartsPermission);
+        boolean isInstrumenting = instr != null;
+        mWindowProcessController.setInstrumenting(isInstrumenting,
+                isInstrumenting && instr.mHasBackgroundActivityStartsPermission);
     }
 
     ActiveInstrumentation getActiveInstrumentation() {