summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Li <lihongyu@google.com> 2021-05-12 06:00:13 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-05-12 06:00:13 +0000
commit6e2b80c0467bc601f3616d32e6b60c367217a2b0 (patch)
treeb9a371b5bef7cf8790aa7fccef568844f1532879
parentdb8daf6c6fa1970395531737f7aebf3d77bb5e63 (diff)
parent4cb2859e93885dad7ede4c025d35ebdab779bfe7 (diff)
Merge "Fix non-visual Context in ImageWallpaper" into sc-dev
-rw-r--r--core/java/android/service/wallpaper/WallpaperService.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 53bde36a8a64..324d1abf24bb 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -21,6 +21,7 @@ import static android.graphics.Matrix.MSCALE_Y;
import static android.graphics.Matrix.MSKEW_X;
import static android.graphics.Matrix.MSKEW_Y;
import static android.view.View.SYSTEM_UI_FLAG_VISIBLE;
+import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
import android.annotation.FloatRange;
import android.annotation.NonNull;
@@ -1218,7 +1219,9 @@ public abstract class WallpaperService extends Service {
mIWallpaperEngine.mDisplayManager.registerDisplayListener(mDisplayListener,
mCaller.getHandler());
mDisplay = mIWallpaperEngine.mDisplay;
- mDisplayContext = createDisplayContext(mDisplay);
+ // Use window context of TYPE_WALLPAPER so client can access UI resources correctly.
+ mDisplayContext = createDisplayContext(mDisplay)
+ .createWindowContext(TYPE_WALLPAPER, null /* options */);
mDisplayState = mDisplay.getState();
if (DEBUG) Log.v(TAG, "onCreate(): " + this);