drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 3379239: Catch exceptions from workaround for OOM.

Browse Source 
This catches possible exceptions caused by attempting to
unregister a receiver that may have already been unregistered.
This is related to the OOM issue workaround in Change I99a7e0c3.

Change-Id: Ib69a8acc6b12659125c958a03efac0a8a68a3859
This commit is contained in:
Jim Miller
2011-01-23 13:40:31 -08:00
parent 1c9761e30d
commit 42a461570b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/widget/DigitalClock.java
View File

@ -80,7 +80,11 @@ public class DigitalClock extends LinearLayout {
} }
}); });
} else { } else {
mContext.unregisterReceiver(this); try {
mContext.unregisterReceiver(this);
} catch (RuntimeException e) {
// Shouldn't happen
}
} }
} }
}; };
@ -124,7 +128,11 @@ public class DigitalClock extends LinearLayout {
digitalClock.setDateFormat(); digitalClock.setDateFormat();
digitalClock.updateTime(); digitalClock.updateTime();
} else { } else {
mContext.getContentResolver().unregisterContentObserver(this); try {
mContext.getContentResolver().unregisterContentObserver(this);
} catch (RuntimeException e) {
// Shouldn't happen
}
} }
} }
} }