Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33be0a8c authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Use commas to separate API exemptions list, not colon." am: 2fddfcdc 

am: 9f85ad8c

Change-Id: Idc8adc6ccc505b1264cc8e26c76f067ae4abca1f
parents 1edf1e19 9f85ad8c

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }