Merge "Include ServiceRecord in foreground service exception exception text." into pi-dev (08f7c6a7) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -2645,6 +2645,8 @@ public final class ActiveServices {
		Message msg = mAm.mHandler.obtainMessage(
		ActivityManagerService.SERVICE_FOREGROUND_CRASH_MSG);
		msg.obj = r.app;
		msg.getData().putCharSequence(
		ActivityManagerService.SERVICE_RECORD_KEY, r.toString());
		mAm.mHandler.sendMessage(msg);
		}
		}
		@@ -3563,13 +3565,15 @@ public final class ActiveServices {

		if (app != null) {
		mAm.mAppErrors.appNotResponding(app, null, null, false,
		"Context.startForegroundService() did not then call Service.startForeground()");
		"Context.startForegroundService() did not then call Service.startForeground(): "
		+ r);
		}
		}

		void serviceForegroundCrash(ProcessRecord app) {
		void serviceForegroundCrash(ProcessRecord app, CharSequence serviceRecord) {
		mAm.crashApplication(app.uid, app.pid, app.info.packageName, app.userId,
		"Context.startForegroundService() did not then call Service.startForeground()");
		"Context.startForegroundService() did not then call Service.startForeground(): "
		+ serviceRecord);
		}

		void scheduleServiceTimeoutLocked(ProcessRecord proc) {

+4 −1

Original line number	Diff line number	Diff line
		@@ -1920,6 +1920,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		static final int FIRST_COMPAT_MODE_MSG = 300;
		static final int FIRST_SUPERVISOR_STACK_MSG = 100;

		static final String SERVICE_RECORD_KEY = "servicerecord";

		static ServiceThread sKillThread = null;
		static KillHandler sKillHandler = null;

		@@ -2168,7 +2170,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		mServices.serviceForegroundTimeout((ServiceRecord)msg.obj);
		} break;
		case SERVICE_FOREGROUND_CRASH_MSG: {
		mServices.serviceForegroundCrash((ProcessRecord)msg.obj);
		mServices.serviceForegroundCrash(
		(ProcessRecord) msg.obj, msg.getData().getCharSequence(SERVICE_RECORD_KEY));
		} break;
		case DISPATCH_PENDING_INTENT_CANCEL_MSG: {
		RemoteCallbackList<IResultReceiver> callbacks