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

Commit 5bfdc9f6 authored by Ayush Sharma's avatar Ayush Sharma
Browse files

Add check package belong to caller 

For API isWallperSupported, add check that queried package belongs to
the caller.

Bug: 194112606
Test: atest StrictModeTest
      atest WallpaperManagerTest
      atest NoWallpaperPermissionsTest
      atest ScopedStorageTest
      atest NoSystemFunctionPermissionTest#testSetWallpaper

Change-Id: I93c1b4b74d8bd1e1e5202cd39038319a3f8a7f23
parent 12f914e3

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

+24 −1
Original line number Diff line number Diff line
@@ -3047,12 +3047,35 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        }

    }



    private boolean packageBelongsToUid(String packageName, int uid) {

        int userId = UserHandle.getUserId(uid);

        int packageUid;

        try {

            packageUid = mContext.getPackageManager().getPackageUidAsUser(

                    packageName, userId);

        } catch (PackageManager.NameNotFoundException e) {

            return false;

        }

        return packageUid == uid;

    }



    private void enforcePackageBelongsToUid(String packageName, int uid) {

        if (!packageBelongsToUid(packageName, uid)) {

            throw new IllegalArgumentException(

                    "Invalid package or package does not belong to uid:"

                            + uid);

        }

    }



    /**

     * Certain user types do not support wallpapers (e.g. managed profiles). The check is

     * implemented through through the OP_WRITE_WALLPAPER AppOp.

     */

    public boolean isWallpaperSupported(String callingPackage) {

        return mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_WRITE_WALLPAPER, Binder.getCallingUid(),

        final int callingUid = Binder.getCallingUid();

        enforcePackageBelongsToUid(callingPackage, callingUid);



        return mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_WRITE_WALLPAPER, callingUid,

                callingPackage) == AppOpsManager.MODE_ALLOWED;

    }