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

Commit e929bee9 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Merge commit '734a78fb' into manualmerge 

Conflicts:
	core/java/android/app/WallpaperManager.java

Change-Id: Id103f540329ea484ff2e0829a0fc8158621f3dd3
parents 812ad226 734a78fb

core/java/android/app/WallpaperManager.java

+16 −21
Original line number Diff line number Diff line
@@ -279,13 +279,15 @@ public class WallpaperManager { 
        }



        private Bitmap getCurrentWallpaperLocked(Context context) {

            if (mService == null) {

                Log.w(TAG, "WallpaperService not running");

                return null;

            }



            try {

                Bundle params = new Bundle();

                ParcelFileDescriptor fd = mService.getWallpaper(this, params);

                if (fd != null) {

                    int width = params.getInt("width", 0);

                    int height = params.getInt("height", 0);



                    try {

                        BitmapFactory.Options options = new BitmapFactory.Options();

                        return BitmapFactory.decodeFileDescriptor(
@@ -307,12 +309,8 @@ public class WallpaperManager { 
        }

        

        private Bitmap getDefaultWallpaperLocked(Context context) {

            try {

            InputStream is = openDefaultWallpaper(context);

            if (is != null) {

                    int width = mService.getWidthHint();

                    int height = mService.getHeightHint();



                try {

                    BitmapFactory.Options options = new BitmapFactory.Options();

                    return BitmapFactory.decodeStream(is, null, options);
@@ -326,9 +324,6 @@ public class WallpaperManager { 
                    }

                }

            }

            } catch (RemoteException e) {

                // Ignore

            }

            return null;

        }

    }

services/java/com/android/server/SystemServer.java

+4 −5
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import com.android.server.am.ActivityManagerService; 
import com.android.server.am.BatteryStatsService;

import com.android.server.clipboard.ClipboardService;

import com.android.server.content.ContentService;

import com.android.server.devicepolicy.DevicePolicyManagerService;

import com.android.server.display.DisplayManagerService;

import com.android.server.dreams.DreamManagerService;

import com.android.server.hdmi.HdmiControlService;
@@ -112,8 +113,6 @@ public final class SystemServer { 
     */

    private static final String BACKUP_MANAGER_SERVICE_CLASS =

            "com.android.server.backup.BackupManagerService$Lifecycle";

    private static final String DEVICE_POLICY_MANAGER_SERVICE_CLASS =

            "com.android.server.devicepolicy.DevicePolicyManagerService$Lifecycle";

    private static final String APPWIDGET_SERVICE_CLASS =

            "com.android.server.appwidget.AppWidgetService";

    private static final String VOICE_RECOGNITION_MANAGER_SERVICE_CLASS =
@@ -555,9 +554,9 @@ public final class SystemServer { 
                }



                try {

                    if (pm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN)) {

                        mSystemServiceManager.startService(DEVICE_POLICY_MANAGER_SERVICE_CLASS);

                    }

                    // Always start the Device Policy Manager, so that the API is compatible with

                    // API8.

                    mSystemServiceManager.startService(DevicePolicyManagerService.Lifecycle.class);

                } catch (Throwable e) {

                    reportWtf("starting DevicePolicyService", e);

                }