Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev

Browse Source
This commit is contained in:
Winson Chung
2015-06-24 21:21:23 +00:00
committed by Android (Google) Code Review
parent 420cf23676 b8f03072d4
commit 6301d80224
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
View File

@@ -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();