| Chunk |
|---|
| Conflicting content |
|---|
private MyMediaScannerClient mClient = new MyMediaScannerClient();
private boolean isDrmEnabled() {
<<<<<<< HEAD
String prop = System.getProperty("drm.service.enabled");
=======
String prop = SystemProperties.get("drm.service.enabled");
>>>>>>> 82415bed3478a3a2200386691f05d671b46568f5
return prop != null && prop.equals("true");
}
|
| Solution content |
|---|
private MyMediaScannerClient mClient = new MyMediaScannerClient();
private boolean isDrmEnabled() {
String prop = SystemProperties.get("drm.service.enabled");
return prop != null && prop.equals("true");
}
|
| File |
|---|
| MediaScanner.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |