Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4eb4d9d authored by Marco Nelissen's avatar Marco Nelissen
Browse files

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
parent 4b8d36b3

media/java/android/media/MediaScanner.java

+7 −3
Original line number Diff line number Diff line
@@ -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;

            }