Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev

import android.annotation.RawRes;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.SdkConstant.SdkConstantType;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Iterator;

import java.util.List;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

        }

        WallpaperColors getWallpaperColors(int which) {

            synchronized (this) {

                if (which != FLAG_LOCK && which != FLAG_SYSTEM)

            if (which != FLAG_LOCK && which != FLAG_SYSTEM) {

                throw new IllegalArgumentException(

                            "which should be either FLAG_LOCK or FLAG_SYSTEM");

                        "Must request colors for exactly one kind of wallpaper");

            }

            try {

                return mService.getWallpaperColors(which);

            }

            return null;

        }

        }

        public Bitmap peekWallpaperBitmap(Context context, boolean returnDefault,

                @SetWallpaperFlags int which) {