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

Commit 047f7272 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Throw IllegalArgumentException for invalid foregroundServiceType."

parents 6ead427b baffff56
Loading
Loading
Loading
Loading
+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;