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

Commit ff9f7271 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "wallpaper: fix null service manager registered to server" into udc-dev

parents 6fbe5c11 e1cc6f6a

services/core/java/com/android/server/wallpaper/WallpaperDataParser.java

+3 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.content.pm.PackageManager; 
import android.content.res.Resources;

import android.graphics.Color;

import android.os.FileUtils;

import android.os.SystemProperties;

import android.util.Slog;

import android.util.SparseArray;

import android.util.Xml;
@@ -85,8 +86,8 @@ class WallpaperDataParser { 
        mWallpaperCropper = wallpaperCropper;

        mImageWallpaper = ComponentName.unflattenFromString(

                context.getResources().getString(R.string.image_wallpaper_component));

        mIsLockscreenLiveWallpaperEnabled = context.getSystemService(WallpaperManager.class)

                .isLockscreenLiveWallpaperEnabled();

        mIsLockscreenLiveWallpaperEnabled =

                SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false);

    }



    private JournaledFile makeJournaledFile(int userId) {