diff options
| author | 2018-03-29 06:50:23 +0000 | |
|---|---|---|
| committer | 2018-03-29 06:50:23 +0000 | |
| commit | d598caacfc818400c20f8aab471de87c515eb74d (patch) | |
| tree | 1e443b80d19b1303ea8b5dd6b8559257410cf285 | |
| parent | fe930f2023f8f69ffb481c88c81967396e9ce2dd (diff) | |
| parent | b559e75ddc6377c7cf7f554235cca4ad34b2fe64 (diff) | |
Merge "Use commas to separate API exemptions list, not colon." into pi-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
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 998bb49be7d8..08e5d44c8832 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2908,7 +2908,7 @@ public class ActivityManagerService extends IActivityManager.Stub mBlacklistDisabled = false; mExemptions = TextUtils.isEmpty(exemptions) ? Collections.emptyList() - : Arrays.asList(exemptions.split(":")); + : Arrays.asList(exemptions.split(",")); } zygoteProcess.setApiBlacklistExemptions(mExemptions); } |