From 49883409ff9bbdbaa327c98cdd75e109b6a46be7 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Tue, 25 Jun 2013 13:20:23 -0400
Subject: [PATCH] Fix crash when restarting memory service.

Change-Id: I251fefa8c71ac35e1bf884d25653c729b8e422d1
---
 src/com/android/launcher3/MemoryTracker.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/com/android/launcher3/MemoryTracker.java b/src/com/android/launcher3/MemoryTracker.java
index 600344e50d..c1057a8dfc 100644
--- a/src/com/android/launcher3/MemoryTracker.java
+++ b/src/com/android/launcher3/MemoryTracker.java
@@ -130,11 +130,12 @@ public class MemoryTracker extends Service {
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.i(TAG, "Received start id " + startId + ": " + intent);
 
-        if (ACTION_START_TRACKING.equals(intent.getAction())) {
-            final Uri uri = intent.getData();
-            final int pid = intent.getIntExtra("pid", -1);
-            final String name = intent.getStringExtra("name");
-            startTrackingProcess(pid, name);
+        if (intent != null) {
+            if (ACTION_START_TRACKING.equals(intent.getAction())) {
+                final int pid = intent.getIntExtra("pid", -1);
+                final String name = intent.getStringExtra("name");
+                startTrackingProcess(pid, name);
+            }
         }
 
         mHandler.sendEmptyMessage(MSG_START);