Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include ServiceRecord in foreground service exception exception text." into pi-dev

Browse Source 
am: e8479d77a1

Change-Id: I4631a2b5f9d89e3627d935af99ce95dc5892d6a8
This commit is contained in:
Kodlee Yin
2018-04-05 17:23:49 -07:00
committed by android-build-merger
parent a2508cb0d8 e8479d77a1
commit 08f7c6a7ef
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -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) {

5
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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