Merge "Throw DeadSystemRuntimeException when system_server dies." (bf23230d) · Commits · e / os / android_frameworks_base

core/java/android/os/DeadSystemRuntimeException.java

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.os;

		/**
		* Exception thrown when a call into system_server resulted in a
		* DeadObjectException, meaning that the system_server has died. There's
		* nothing apps can do at this point - the system will automatically restart -
		* so there's no point in catching this.
		*
		* @hide
		*/
		public class DeadSystemRuntimeException extends RuntimeException {
		public DeadSystemRuntimeException() {
		super(new DeadSystemException());
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ public class RemoteException extends AndroidException {
		/**
		* Rethrow this exception when we know it came from the system server. This
		* gives us an opportunity to throw a nice clean
		* {@link DeadSystemException} signal to avoid spamming logs with
		* {@link DeadSystemRuntimeException} signal to avoid spamming logs with
		* misleading stack traces.
		* <p>
		* Apps making calls into the system server may end up persisting internal
		@@ -73,7 +73,7 @@ public class RemoteException extends AndroidException {
		@NonNull
		public RuntimeException rethrowFromSystemServer() {
		if (this instanceof DeadObjectException) {
		throw new RuntimeException(new DeadSystemException());
		throw new DeadSystemRuntimeException();
		} else {
		throw new RuntimeException(this);
		}