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

Commit 62b95625 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Restrict cross-user wallpaper inspection" into sc-v2-dev am: 242c8ea4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15585677

Change-Id: I434de4703a089c8bf79fc52b980d0557d42f9e6c
parents fbcf878c 242c8ea4

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

+20 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wallpaper;



import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;

import static android.app.WallpaperManager.COMMAND_REAPPLY;

import static android.app.WallpaperManager.FLAG_LOCK;

import static android.app.WallpaperManager.FLAG_SYSTEM;
@@ -2045,7 +2046,21 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        }

    }



    private boolean hasCrossUserPermission() {

        final int interactPermission =

                mContext.checkCallingPermission(INTERACT_ACROSS_USERS_FULL);

        return interactPermission == PackageManager.PERMISSION_GRANTED;

    }



    @Override

    public boolean hasNamedWallpaper(String name) {

        final int callingUser = UserHandle.getCallingUserId();

        final boolean allowCrossUser = hasCrossUserPermission();

        if (DEBUG) {

            Slog.d(TAG, "hasNamedWallpaper() caller " + Binder.getCallingUid()

                    + " cross-user?: " + allowCrossUser);

        }



        synchronized (mLock) {

            List<UserInfo> users;

            final long ident = Binder.clearCallingIdentity();
@@ -2055,6 +2070,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                Binder.restoreCallingIdentity(ident);

            }

            for (UserInfo user: users) {

                if (!allowCrossUser && callingUser != user.id) {

                    // No cross-user information for callers without permission

                    continue;

                }



                // ignore managed profiles

                if (user.isManagedProfile()) {

                    continue;