diff options
| author | Winson Chung <winsonc@google.com> | 2015-06-24 21:21:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 21:21:24 +0000 |
| commit | 6301d802244f6e6c9fc6084e4bedd20ba0bd3064 (patch) | |
| tree | eeef0c378d84747ad36f16d623b373c716974b55 /packages | |
| parent | 420cf236762db164ef8d37b336ee18ba84aab5b6 (diff) | |
| parent | b8f03072d46b0d535415c07655b9fe5a8c41fb8f (diff) | |
| download | frameworks_base-6301d802244f6e6c9fc6084e4bedd20ba0bd3064.zip frameworks_base-6301d802244f6e6c9fc6084e4bedd20ba0bd3064.tar.gz frameworks_base-6301d802244f6e6c9fc6084e4bedd20ba0bd3064.tar.bz2 | |
Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index 3cd769e..da7247c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -36,6 +36,7 @@ import android.widget.Toast; import com.android.systemui.Prefs; import com.android.systemui.R; +import com.android.systemui.recents.misc.Console; import com.android.systemui.recents.misc.DebugTrigger; import com.android.systemui.recents.misc.ReferenceCountedTrigger; import com.android.systemui.recents.misc.SystemServicesProxy; @@ -108,10 +109,15 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView public void run() { // Finish Recents if (mLaunchIntent != null) { - if (mLaunchOpts != null) { - startActivityAsUser(mLaunchIntent, mLaunchOpts.toBundle(), UserHandle.CURRENT); - } else { - startActivityAsUser(mLaunchIntent, UserHandle.CURRENT); + try { + if (mLaunchOpts != null) { + startActivityAsUser(mLaunchIntent, mLaunchOpts.toBundle(), UserHandle.CURRENT); + } else { + startActivityAsUser(mLaunchIntent, UserHandle.CURRENT); + } + } catch (Exception e) { + Console.logError(RecentsActivity.this, + getString(R.string.recents_launch_error_message, "Home")); } } else { finish(); |