Merge "Add permission check in notifyWakingUp/GoingToSleep" into udc-dev (fa25a8e1) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ import android.os.IBinder;
		import android.os.IInterface;
		import android.os.IRemoteCallback;
		import android.os.ParcelFileDescriptor;
		import android.os.Process;
		import android.os.RemoteCallbackList;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		@@ -2514,6 +2515,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		* Propagate a wake event to the wallpaper engine(s).
		*/
		public void notifyWakingUp(int x, int y, @NonNull Bundle extras) {
		checkCallerIsSystemOrSystemUi();
		synchronized (mLock) {
		if (mIsLockscreenLiveWallpaperEnabled) {
		for (WallpaperData data : getActiveWallpapers()) {
		@@ -2551,6 +2553,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		* Propagate a sleep event to the wallpaper engine(s).
		*/
		public void notifyGoingToSleep(int x, int y, @NonNull Bundle extras) {
		checkCallerIsSystemOrSystemUi();
		synchronized (mLock) {
		if (mIsLockscreenLiveWallpaperEnabled) {
		for (WallpaperData data : getActiveWallpapers()) {
		@@ -3684,6 +3687,14 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		mActivityManager.getPackageImportance(callingPackage) == IMPORTANCE_FOREGROUND);
		}

		/** Check that the caller is either system_server or systemui */
		private void checkCallerIsSystemOrSystemUi() {
		if (Binder.getCallingUid() != Process.myUid() && mContext.checkCallingPermission(
		android.Manifest.permission.STATUS_BAR_SERVICE) != PERMISSION_GRANTED) {
		throw new SecurityException("Access denied: only system processes can call this");
		}
		}

		/**
		* Certain user types do not support wallpapers (e.g. managed profiles). The check is
		* implemented through through the OP_WRITE_WALLPAPER AppOp.