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

Commit 37157473 authored by Christopher Tate's avatar Christopher Tate
Browse files

Apply package query policy to live wallpaper introspection 

Bug: 179045493
Test: atest CtsAppTestCases:WallpaperManagerTest
Test: bug POC
Change-Id: I3eaf1d057ddfa2975bcee3ef6a05a5caa504bdde
parent 2f65063b

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

+24 −13
Original line number Diff line number Diff line
@@ -17,10 +17,13 @@ 
package com.android.server.wallpaper;



import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;

import static android.Manifest.permission.QUERY_ALL_PACKAGES;

import static android.Manifest.permission.READ_WALLPAPER_INTERNAL;

import static android.app.WallpaperManager.COMMAND_REAPPLY;

import static android.app.WallpaperManager.FLAG_LOCK;

import static android.app.WallpaperManager.FLAG_SYSTEM;

import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AUTO;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.ParcelFileDescriptor.MODE_CREATE;

import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;

import static android.os.ParcelFileDescriptor.MODE_READ_WRITE;
@@ -2064,7 +2067,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
    private boolean hasCrossUserPermission() {

        final int interactPermission =

                mContext.checkCallingPermission(INTERACT_ACROSS_USERS_FULL);

        return interactPermission == PackageManager.PERMISSION_GRANTED;

        return interactPermission == PERMISSION_GRANTED;

    }



    @Override
@@ -2255,9 +2258,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
    @Override

    public ParcelFileDescriptor getWallpaperWithFeature(String callingPkg, String callingFeatureId,

            IWallpaperManagerCallback cb, final int which, Bundle outParams, int wallpaperUserId) {

        final int hasPrivilege = mContext.checkCallingOrSelfPermission(

                android.Manifest.permission.READ_WALLPAPER_INTERNAL);

        if (hasPrivilege != PackageManager.PERMISSION_GRANTED) {

        final boolean hasPrivilege = hasPermission(READ_WALLPAPER_INTERNAL);

        if (!hasPrivilege) {

            mContext.getSystemService(StorageManager.class).checkPermissionReadImages(true,

                    Binder.getCallingPid(), Binder.getCallingUid(), callingPkg, callingFeatureId);

        }
@@ -2301,8 +2303,15 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        }

    }



    private boolean hasPermission(String permission) {

        return mContext.checkCallingOrSelfPermission(permission) == PERMISSION_GRANTED;

    }



    @Override

    public WallpaperInfo getWallpaperInfo(int userId) {

        final boolean allow =

                hasPermission(READ_WALLPAPER_INTERNAL) || hasPermission(QUERY_ALL_PACKAGES);

        if (allow) {

            userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),

                    Binder.getCallingUid(), userId, false, true, "getWallpaperInfo", null);

            synchronized (mLock) {
@@ -2310,10 +2319,12 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                if (wallpaper != null && wallpaper.connection != null) {

                    return wallpaper.connection.mInfo;

                }

            return null;

            }

        }



        return null;

    }



    @Override

    public int getWallpaperIdForUser(int which, int userId) {

        userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(),
@@ -2935,7 +2946,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                final int hasPrivilege = mIPackageManager.checkPermission(

                        android.Manifest.permission.AMBIENT_WALLPAPER, wi.getPackageName(),

                        serviceUserId);

                if (hasPrivilege != PackageManager.PERMISSION_GRANTED) {

                if (hasPrivilege != PERMISSION_GRANTED) {

                    String msg = "Selected service does not have "

                            + android.Manifest.permission.AMBIENT_WALLPAPER

                            + ": " + componentName;
@@ -3056,7 +3067,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
    }



    private void checkPermission(String permission) {

        if (PackageManager.PERMISSION_GRANTED!= mContext.checkCallingOrSelfPermission(permission)) {

        if (!hasPermission(permission)) {

            throw new SecurityException("Access denied to process: " + Binder.getCallingPid()

                    + ", must have permission " + permission);

        }