Ignore any error when killing our process
Bug: 113929153
Change-Id: Ie9a8b59fda1f813748404ed529269cccb1e28c61
diff --git a/src/com/android/launcher3/util/ConfigMonitor.java b/src/com/android/launcher3/util/ConfigMonitor.java
index 611931d..5dd0d08 100644
--- a/src/com/android/launcher3/util/ConfigMonitor.java
+++ b/src/com/android/launcher3/util/ConfigMonitor.java
@@ -111,8 +111,12 @@
private void killProcess() {
Log.d(TAG, "restarting launcher");
- mContext.unregisterReceiver(this);
- mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this);
+ try {
+ mContext.unregisterReceiver(this);
+ mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this);
+ } catch (Exception e) {
+ // We are going to die anyway, ignore any error die to race condition in registering.
+ }
android.os.Process.killProcess(android.os.Process.myPid());
}