Merge cherrypicks of ['googleplex-android-review.googlesource.com/27130203']...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27130203'] into sparse-11767787-L45500030003493810.
SPARSE_CHANGE: I37fc893f608142a57b23271aadd4eaf2b26f629b

Change-Id: Ic7417621563a86c2da6038432aa3a015778f36e8

parents 7e8cb3c2 a0173caa

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3856,7 +3856,7 @@ public final class ActiveServices {
		void onFgsTimeout(ServiceRecord sr) {
		synchronized (mAm) {
		final int fgsType = getTimeLimitedFgsType(sr.foregroundServiceType);
		if (fgsType == ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE) {
		if (fgsType == ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE \|\| sr.app == null) {
		mFGSAnrTimer.discard(sr);
		return;
		}