Merge "Acivity to rethrow an exception from AMS." (97056bbb) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -8344,7 +8344,7 @@ public class Activity extends ContextThemeWrapper
		try {
		ActivityTaskManager.getService().setDisablePreviewScreenshots(mToken, disable);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to call setDisablePreviewScreenshots", e);
		throw e.rethrowFromSystemServer();
		}
		}

		@@ -8365,7 +8365,7 @@ public class Activity extends ContextThemeWrapper
		try {
		ActivityTaskManager.getService().setShowWhenLocked(mToken, showWhenLocked);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to call setShowWhenLocked", e);
		throw e.rethrowFromSystemServer();
		}
		}

		@@ -8389,7 +8389,7 @@ public class Activity extends ContextThemeWrapper
		ActivityTaskManager.getService().setInheritShowWhenLocked(
		mToken, inheritShowWhenLocked);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to call setInheritShowWhenLocked", e);
		throw e.rethrowFromSystemServer();
		}
		}

		@@ -8415,7 +8415,7 @@ public class Activity extends ContextThemeWrapper
		try {
		ActivityTaskManager.getService().setTurnScreenOn(mToken, turnScreenOn);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to call setTurnScreenOn", e);
		throw e.rethrowFromSystemServer();
		}
		}

		@@ -8432,7 +8432,7 @@ public class Activity extends ContextThemeWrapper
		try {
		ActivityTaskManager.getService().registerRemoteAnimations(mToken, definition);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to call registerRemoteAnimations", e);
		throw e.rethrowFromSystemServer();
		}
		}