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

Commit baffff56 authored by Hui Yu's avatar Hui Yu
Browse files

Throw IllegalArgumentException for invalid foregroundServiceType. 

Throw IllegalArgumentException if the passed-in foregroundServiceType
is not a subset of foregroundServiceType flags of service element in
manifest file.

Change-Id: I267f76f6a1633a35f0a20db60999f61de13b4b20
Fix: 120611119
Test: NA
parent c7e26f7f

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

+5 −4
Original line number Diff line number Diff line
@@ -1260,10 +1260,11 @@ public final class ActiveServices { 
                // Check the passed in foreground service type flags is a subset of manifest

                // foreground service type flags.

                if ((foregroundServiceType & manifestType) != foregroundServiceType) {

                    // STOPSHIP(b/120611119): replace log message with IllegalArgumentException.

                    Slog.w(TAG, "foregroundServiceType must be a subset of "

                            + "foregroundServiceType attribute in "

                            + "service element of manifest file");

                    throw new IllegalArgumentException("foregroundServiceType "

                        + String.format("0x%08X", foregroundServiceType)

                        + " is not a subset of foregroundServiceType attribute "

                        +  String.format("0x%08X", manifestType)

                        + " in service element of manifest file");

                }

            }

            boolean alreadyStartedOp = false;