summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hui Yu <huiyu@google.com> 2021-03-01 17:28:17 -0800
committer Hui Yu <huiyu@google.com> 2021-03-01 17:28:17 -0800
commitb5f53a4a3e10e1c42dcd3724cb6d235ccf38d6cc (patch)
tree61ea45a15a1e84e3f5d141f4abbb594069ac632d
parentd7cda89ca5c24f50adb60d3b29ce07548ce48cae (diff)
Fix a bug when uid is removed from temp-allowlist.
The bug is caused by previous merge conflict. Bug: 181538234 Test: atest android.app.cts.ActivityManagerProcessStateTest Change-Id: I687fa0872a87d933f005acaca2f2159099263162
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 7cd494976c94..e8a4fa20cd30 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15179,8 +15179,8 @@ public class ActivityManagerService extends IActivityManager.Stub
mFgsStartTempAllowList.add(changingUid, durationMs, reasonCode, reason,
callingUid);
}
- setAppIdTempAllowlistStateLSP(changingUid, adding);
}
+ setAppIdTempAllowlistStateLSP(changingUid, adding);
}
}
}