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

Commit 3782aabe authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "DreamManagerService: Handle missing db value" into jb-mr1-dev

parents ba94170a 4fde81f7

core/java/android/service/dreams/DreamManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public class DreamManagerService 
    public ComponentName[] getDreamComponents() {

        // TODO(dsandler) don't load this every time, watch the value

        String names = Settings.Secure.getString(mContext.getContentResolver(), SCREENSAVER_COMPONENTS);

        return componentsFromString(names);

        return names == null ? null : componentsFromString(names);

    }



    // IDreamManager method