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

Commit c9303bd3 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 

am: 33be0a8c

Change-Id: I00af79a43f37957ff30944f8b9bb1a81a26a9fa9
parents 37c8a2c4 33be0a8c

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);

            }