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

Commit 379f84ff authored by narinder Rana's avatar narinder Rana
Browse files

Merge branch 'issue_2401' into 'v1-oreo'

handle null pointer exception

See merge request e/apps/eDrive!42
parents bfa72c8b 53a9b73b
Loading
Loading
Loading
Loading
Loading
+58 −47
Original line number Diff line number Diff line
@@ -239,8 +239,15 @@ public class OperationManagerService extends Service implements OnRemoteOperatio
    public int onStartCommand(Intent intent, int flags, int startId) {
        Log.i(TAG, "onStartCommand()");

        try{
            CommonUtils.setServiceUnCaughtExceptionHandler(this);

            if (null == intent || null == intent.getAction ()) {
                String source = null == intent ? "intent" : "action";
                Log.e (TAG, source + " was null, flags=" + flags + " bits=" + Integer.toBinaryString (flags));
                //return START_STICKY;
            }

            Bundle extras = intent.getExtras();
            Log.d(TAG, "OperationManagerService recieved "+(extras == null ? "null extras": extras.size()+" operations to perform") );

@@ -293,6 +300,10 @@ public class OperationManagerService extends Service implements OnRemoteOperatio
            }else{
                Log.w(TAG, "Intent's extras is null.");
            }
        }catch (Exception ex){
            Log.e("Exception", ex.getMessage());
            ex.printStackTrace();
        }

        return super.onStartCommand(intent, flags, startId);
    }