summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-06-26 14:00:57 -0700
committerSunny Goyal <sunnygoyal@google.com>2015-06-26 21:04:55 +0000
commit11d491173206313a65801961e02425c0526e891e (patch)
tree392e81f4a4026c655b90f7201601312b06795c7f
parent1a8a6e0baabf636f9b429280cba536450d594089 (diff)
downloadandroid_packages_apps_Trebuchet-11d491173206313a65801961e02425c0526e891e.tar.gz
android_packages_apps_Trebuchet-11d491173206313a65801961e02425c0526e891e.tar.bz2
android_packages_apps_Trebuchet-11d491173206313a65801961e02425c0526e891e.zip
Removing junit.framework.Assert
Bug: 22124692 Change-Id: Ie9c920ec6ef9631392a70b9ab2a5659ba23385b3
-rw-r--r--src/com/android/launcher3/Utilities.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 0d13c6990..19334ed31 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -56,8 +56,6 @@ import android.util.TypedValue;
import android.view.View;
import android.widget.Toast;
-import junit.framework.Assert;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -665,8 +663,9 @@ public final class Utilities {
}
public static void assertWorkerThread() {
- if (LauncherAppState.isDogfoodBuild()) {
- Assert.assertTrue(LauncherModel.sWorkerThread.getThreadId() == Process.myTid());
+ if (LauncherAppState.isDogfoodBuild() &&
+ (LauncherModel.sWorkerThread.getThreadId() != Process.myTid())) {
+ throw new IllegalStateException();
}
}