Merge "Merge "Additional log instrumentation for multi-user" into oc-dev am:... (5b4600f9) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -740,6 +740,8 @@ class AppErrors {
		}
		// If we've created a crash dialog, show it without the lock held
		if(data.proc.crashDialog != null) {
		Slog.i(TAG, "Showing crash dialog for package " + data.proc.info.packageName
		+ " u" + data.proc.userId);
		data.proc.crashDialog.show();
		}
		}

+9 −2

Original line number	Diff line number	Diff line
		@@ -439,7 +439,7 @@ final class UserController {
		}
		}

		Slog.d(TAG, "Sending BOOT_COMPLETE user #" + userId);
		Slog.i(TAG, "Sending BOOT_COMPLETE user #" + userId);
		// Do not report secondary users, runtime restarts or first boot/upgrade
		if (userId == UserHandle.USER_SYSTEM
		&& !mInjector.isRuntimeRestarted() && !mInjector.isFirstBootOrUpgrade()) {
		@@ -451,7 +451,14 @@ final class UserController {
		bootIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);
		bootIntent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT
		\| Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
		mInjector.broadcastIntentLocked(bootIntent, null, null, 0, null, null,
		mInjector.broadcastIntentLocked(bootIntent, null, new IIntentReceiver.Stub() {
		@Override
		public void performReceive(Intent intent, int resultCode, String data,
		Bundle extras, boolean ordered, boolean sticky, int sendingUser)
		throws RemoteException {
		Slog.i(UserController.TAG, "Finished processing BOOT_COMPLETED for u" + userId);
		}
		}, 0, null, null,
		new String[] { android.Manifest.permission.RECEIVE_BOOT_COMPLETED },
		AppOpsManager.OP_NONE, null, true, false, MY_PID, SYSTEM_UID, userId);
		}