commit b4d9c66c9e662fae68cc00731b14600de41069b9
author Roy West <rwest@android.com> Tue Nov 02 13:54:30 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 02 13:54:30 2010 -0700
tree 05ead06baaec523b7a51ec376a44d84c0d75fb49
parent e4eb4d9de37a8e9ed6f43a5f7deccf88f28bfc8b
parent f1c5138592bc722b2d7868ad51c47e9227bf1033

Merge "Fix bug 2248975, edits to load error HTML pages."

media/java/android/media/MediaScanner.java

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 5aabddf..8c3efff 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -383,6 +383,11 @@
 
     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 @@
                 }
             }
 
-            if (System.getProperty("drm.service.enabled").equals("true")
-                    && MediaFile.isDrmFileType(mFileType)) {
+            if (isDrmEnabled() && MediaFile.isDrmFileType(mFileType)) {
                 mFileType = getFileTypeFromDrm(path);
             }
 
@@ -882,7 +886,7 @@
         }
 
         private int getFileTypeFromDrm(String path) {
-            if (!System.getProperty("drm.service.enabled").equals("true")) {
+            if (!isDrmEnabled()) {
                 return 0;
             }