summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-08-26 22:00:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-08-26 22:00:16 -0400
commit1309783e3f43a4c59ba885580d9f530c0bdc3424 (patch)
treeaeaa9eaf91f1cdd661976fcfeb55b84b203df527
parente53405864239ea480e56b13962423228dee600d9 (diff)
Android: Fix bug in terminal app that caused it to spin using much CPU and battery. This problem was introduced in version 4.20130601.
-rw-r--r--debian/changelog2
-rw-r--r--doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit.mdwn3
-rw-r--r--standalone/android/term.patch2
3 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3c04aecb5..4649e16f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ git-annex (4.20130816) UNRELEASED; urgency=low
* unused: Is now a minimum of 30 times faster, and typically many
more times than that (when a repository has several branches).
(Thanks, guilhem for the patch.)
+ * Android: Fix bug in terminal app that caused it to spin using much
+ CPU and battery. This problem was introduced in version 4.20130601.
* unused: Fix bugs in two edge cases involving manually staged changes.
(Thanks, guilhem for the patch.)
* Debian: Run the builtin test suite as an autopkgtest.
diff --git a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit.mdwn b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit.mdwn
index 9f1ee21f0..e739b9691 100644
--- a/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit.mdwn
+++ b/doc/bugs/android:_high_CPU_usage__44___unclear_how_to_quit.mdwn
@@ -23,3 +23,6 @@ the current (4.20130826-g46f422) version on Android.
# End of transcript or log.
"""]]
+
+> [[done]]; I fixed the bug which turned out to be a stupid
+> minunderstanding of how a java library worked. --[[Joey]]
diff --git a/standalone/android/term.patch b/standalone/android/term.patch
index b83c30e98..5f7d40335 100644
--- a/standalone/android/term.patch
+++ b/standalone/android/term.patch
@@ -501,8 +501,8 @@ index 8a3a4ac..824025d 100644
+
+ /* Reading from the fifo blocks until a url is written
+ * to it. */
-+ BufferedReader buf = new BufferedReader(new FileReader(webAppFifo));
+ while (true) {
++ BufferedReader buf = new BufferedReader(new FileReader(webAppFifo));
+ String s = buf.readLine();
+ try {
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(s));