commit 4a04f010ac01c2acf66b438503a57392c2fbacbb
author Nick Kralevich <nnk@google.com> Thu May 28 16:13:41 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 28 16:13:41 2015 +0000
tree 6927ba41b18b0eb3b96552e20d5ecfbb567036f0
parent 431eb471690e986b164e751ee84850719ffe586b
parent 843c1f42617d09b618c31063656f0fe095ced37b

Don\'t NPE when no security message is provided.
automerge: 843c1f4

* commit '843c1f42617d09b618c31063656f0fe095ced37b':
  Don't NPE when no security message is provided.

tests/tests/security/src/android/security/cts/ServicePermissionsTest.java

diff --git a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
index 45f3d51..5d7ff75 100644
--- a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
+++ b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
@@ -99,7 +99,8 @@
             try {
                 serviceBinder.dump(out.getFD(), new String[0]);
             } catch (SecurityException e) {
-                if (e.getMessage().contains("android.permission.DUMP")) {
+                String msg = e.getMessage();
+                if ((msg == null) || msg.contains("android.permission.DUMP")) {
                     // Service correctly checked for DUMP permission, yay
                 } else {
                     // Service is throwing about something else; they're