In java, System.getProperty returns null when the property doesn't exist,

rather than an empty string like it does in native code.
b/3157546

Change-Id: I7985a405e4d2d1f20be0a151aa2cf2e5a83b380b

1 files changed, 7 insertions, 3 deletions

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 5aabddf0a24e..8c3efffcdf3b 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -383,6 +383,11 @@ public class MediaScanner
 
     private MyMediaScannerClient mClient = new MyMediaScannerClient();
 
+    private boolean isDrmEnabled() {
+        String prop = System.getProperty("drm.service.enabled");
+        return prop != null && prop.equals("true");
+    }
+    
     private class MyMediaScannerClient implements MediaScannerClient {
 
         private String mArtist;
@@ -449,8 +454,7 @@ public class MediaScanner
                 }
             }
 
-            if (System.getProperty("drm.service.enabled").equals("true")
-                    && MediaFile.isDrmFileType(mFileType)) {
+            if (isDrmEnabled() && MediaFile.isDrmFileType(mFileType)) {
                 mFileType = getFileTypeFromDrm(path);
             }
 
@@ -882,7 +886,7 @@ public class MediaScanner
         }
 
         private int getFileTypeFromDrm(String path) {
-            if (!System.getProperty("drm.service.enabled").equals("true")) {
+            if (!isDrmEnabled()) {
                 return 0;
             }