Commit 389fd697 authored by Ted Choc's avatar Ted Choc Committed by Commit Bot

Throw exceptions instead of asserts in ApplicationStatus error cases.

BUG=796932

Change-Id: I7ce6be0b361162573430020d4b7a2de7cf1fc644
Reviewed-on: https://chromium-review.googlesource.com/848241Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Commit-Queue: Ted Choc (back but slow, ping me) <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526849}
parent 732b86f2
...@@ -298,7 +298,9 @@ public class ApplicationStatus { ...@@ -298,7 +298,9 @@ public class ApplicationStatus {
* Asserts that initialize method has been called. * Asserts that initialize method has been called.
*/ */
private static void assertInitialized() { private static void assertInitialized() {
assert sIsInitialized; if (!sIsInitialized) {
throw new IllegalStateException("ApplicationStatus has not been initialized yet.");
}
} }
/** /**
...@@ -496,7 +498,9 @@ public class ApplicationStatus { ...@@ -496,7 +498,9 @@ public class ApplicationStatus {
@SuppressLint("NewApi") @SuppressLint("NewApi")
public static void registerStateListenerForActivity(ActivityStateListener listener, public static void registerStateListenerForActivity(ActivityStateListener listener,
Activity activity) { Activity activity) {
assert activity != null; if (activity == null) {
throw new IllegalStateException("Attempting to register listener on a null activity.");
}
ApplicationStatus.assertInitialized(); ApplicationStatus.assertInitialized();
ActivityInfo info = sActivityInfo.get(activity); ActivityInfo info = sActivityInfo.get(activity);
...@@ -508,7 +512,11 @@ public class ApplicationStatus { ...@@ -508,7 +512,11 @@ public class ApplicationStatus {
info = new ActivityInfo(); info = new ActivityInfo();
sActivityInfo.put(activity, info); sActivityInfo.put(activity, info);
} }
assert info != null && info.getStatus() != ActivityState.DESTROYED; if (info == null) {
throw new IllegalStateException(
"Attempting to register listener on an untracked activity.");
}
assert info.getStatus() != ActivityState.DESTROYED;
info.getListeners().addObserver(listener); info.getListeners().addObserver(listener);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment