diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-06-25 13:20:23 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2013-06-25 13:20:36 -0400 |
| commit | 49883409ff9bbdbaa327c98cdd75e109b6a46be7 (patch) | |
| tree | 09504b3ca65c37a9fbbb8d97d7b0353afcf76740 /src/com/android/launcher3/MemoryTracker.java | |
| parent | b9eb2865af05d9ade572e71934a9e6a50421aa7d (diff) | |
| download | android_packages_apps_Trebuchet-49883409ff9bbdbaa327c98cdd75e109b6a46be7.tar.gz android_packages_apps_Trebuchet-49883409ff9bbdbaa327c98cdd75e109b6a46be7.tar.bz2 android_packages_apps_Trebuchet-49883409ff9bbdbaa327c98cdd75e109b6a46be7.zip | |
Fix crash when restarting memory service.
Change-Id: I251fefa8c71ac35e1bf884d25653c729b8e422d1
Diffstat (limited to 'src/com/android/launcher3/MemoryTracker.java')
| -rw-r--r-- | src/com/android/launcher3/MemoryTracker.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/launcher3/MemoryTracker.java b/src/com/android/launcher3/MemoryTracker.java index 600344e50..c1057a8df 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); |