commit 2fddfcdced436842cd07b6a52f0a2988d4fbb93c
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 28 16:57:30 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 28 16:57:30 2018 +0000
tree 758912bd84ff0d200865668596101c5e4f5c016e
parent be6d45fe92a6f2e1ba57bc28859f2b79f93763bb
parent 51a1d4453c44cdb12bbb8a27aa9ef40a431b0f6a

Merge "Use commas to separate API exemptions list, not colon."

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index c21af48..6b4cd4b 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -2731,7 +2731,7 @@
                     mBlacklistDisabled = false;
                     mExemptions = TextUtils.isEmpty(exemptions)
                             ? Collections.emptyList()
-                            : Arrays.asList(exemptions.split(":"));
+                            : Arrays.asList(exemptions.split(","));
                 }
                 zygoteProcess.setApiBlacklistExemptions(mExemptions);
             }