Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0983b807 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Catching generic app start exceptions in ProxyActivity 

Bug: 178815863
Test: None
Change-Id: I39ae2879e107160d552625db2946a439ee14440b
parent d4629656

quickstep/src/com/android/launcher3/proxy/ProxyActivityStarter.java

+9 −7
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.launcher3.proxy;



import android.app.Activity;

import android.content.ActivityNotFoundException;

import android.content.Context;

import android.content.Intent;

import android.content.IntentSender.SendIntentException;
@@ -48,19 +49,20 @@ public class ProxyActivityStarter extends Activity { 
            return;

        }



        try {

            if (mParams.intent != null) {

                startActivityForResult(mParams.intent, mParams.requestCode, mParams.options);

                return;

            } else if (mParams.intentSender != null) {

            try {

                startIntentSenderForResult(mParams.intentSender, mParams.requestCode,

                        mParams.fillInIntent, mParams.flagsMask, mParams.flagsValues,

                        mParams.extraFlags,

                        mParams.options);

                return;

            } catch (SendIntentException e) {

                mParams.deliverResult(this, RESULT_CANCELED, null);

            }

        } catch (NullPointerException | ActivityNotFoundException | SecurityException

                | SendIntentException e) {

            mParams.deliverResult(this, RESULT_CANCELED, null);

        }

        finishAndRemoveTask();

    }