Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 2de66f7be1

Change-Id: Id453b9477272c8d10738a06626411dfda58cea74
This commit is contained in:
Christopher Tate
2017-06-29 22:34:22 +00:00
committed by android-build-merger
parent 949b625c57 2de66f7be1
commit 0d95a0eefa
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/app/WallpaperManager.java
View File

@@ -22,9 +22,9 @@ import android.annotation.Nullable;
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;
@@ -74,7 +74,6 @@ import java.io.InputStream;
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;
@@ -369,18 +368,17 @@ public class WallpaperManager {
}
WallpaperColors getWallpaperColors(int which) {
synchronized (this) {
if (which != FLAG_LOCK && which != FLAG_SYSTEM)
throw new IllegalArgumentException(
"which should be either FLAG_LOCK or FLAG_SYSTEM");
try {
return mService.getWallpaperColors(which);
} catch (RemoteException e) {
// Can't get colors, connection lost.
}
return null;
if (which != FLAG_LOCK && which != FLAG_SYSTEM) {
throw new IllegalArgumentException(
"Must request colors for exactly one kind of wallpaper");
}
try {
return mService.getWallpaperColors(which);
} catch (RemoteException e) {
// Can't get colors, connection lost.
}
return null;
}
public Bitmap peekWallpaperBitmap(Context context, boolean returnDefault,