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

Commit daaa7e80 authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

Merge "Use IPackageManager.getServiceInfo" into main

parents 65fc75c0 24b62eb6

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

+8 −4
Original line number Diff line number Diff line
@@ -1513,11 +1513,15 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
            }

            if (wallpaper.getComponent() != null

                    && isPackageModified(wallpaper.getComponent().getPackageName())) {

                ServiceInfo serviceInfo = null;

                try {

                    mContext.getPackageManager().getServiceInfo(wallpaper.getComponent(),

                            PackageManager.MATCH_DIRECT_BOOT_AWARE

                                    | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);

                } catch (NameNotFoundException e) {

                    serviceInfo = mIPackageManager.getServiceInfo(

                            wallpaper.getComponent(), PackageManager.MATCH_DIRECT_BOOT_AWARE

                                    | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, wallpaper.userId);

                } catch (RemoteException e) {

                    Slog.w(TAG, "Failed to call IPackageManager.getServiceInfo", e);

                }

                if (serviceInfo == null) {

                    Slog.e(TAG, "Wallpaper component gone, removing: "

                            + wallpaper.getComponent());

                    clearWallpaperLocked(wallpaper.mWhich, wallpaper.userId, false, null);