commit 4bbccf0af1f03fdd68a4ae8c28b4ac70c49ade4d
author Amit Mahajan <amitmahajan@google.com> Fri Mar 17 16:52:30 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 17 16:52:31 2017 +0000
tree 2fdd0e67f56a538e709fb7a28e3037db6a15f7c0
parent ddcd1bab60773d4121e68083334d37792f4d4243
parent 3f2bd962a7e8c94966a629271f59c88b9ecc1006

Merge "Null check action of intents in StkCmdReceiver and BootCompletedReceiver"

src/com/android/stk/BootCompletedReceiver.java

diff --git a/src/com/android/stk/BootCompletedReceiver.java b/src/com/android/stk/BootCompletedReceiver.java
index 3f06f25..d162910 100644
--- a/src/com/android/stk/BootCompletedReceiver.java
+++ b/src/com/android/stk/BootCompletedReceiver.java
@@ -35,6 +35,9 @@
     @Override
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
+        if (action == null) {
+            return;
+        }
 
         // make sure the app icon is removed every time the device boots.
         if (action.equals(Intent.ACTION_BOOT_COMPLETED)) {

src/com/android/stk/StkCmdReceiver.java

diff --git a/src/com/android/stk/StkCmdReceiver.java b/src/com/android/stk/StkCmdReceiver.java
index 508e7f8..fd6f382 100644
--- a/src/com/android/stk/StkCmdReceiver.java
+++ b/src/com/android/stk/StkCmdReceiver.java
@@ -35,6 +35,9 @@
     @Override
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
+        if (action == null) {
+            return;
+        }
 
         if (action.equals(AppInterface.CAT_CMD_ACTION)) {
             handleAction(context, intent, StkAppService.OP_CMD);