Merge "Remove owerUid from WindowSurfaceController constructor"
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 9b91e3a..8cbeccd 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -2575,7 +2575,7 @@
WindowSurfaceController surfaceController;
try {
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "createSurfaceControl");
- surfaceController = winAnimator.createSurfaceLocked(win.mAttrs.type, win.mOwnerUid);
+ surfaceController = winAnimator.createSurfaceLocked(win.mAttrs.type);
} finally {
Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
}
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index 0fd8146..9cc72a2 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -420,7 +420,7 @@
}
}
- WindowSurfaceController createSurfaceLocked(int windowType, int ownerUid) {
+ WindowSurfaceController createSurfaceLocked(int windowType) {
final WindowState w = mWin;
if (mSurfaceController != null) {
@@ -480,7 +480,7 @@
}
mSurfaceController = new WindowSurfaceController(attrs.getTitle().toString(), width,
- height, format, flags, this, windowType, ownerUid);
+ height, format, flags, this, windowType);
mSurfaceController.setColorSpaceAgnostic((attrs.privateFlags
& WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC) != 0);
diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java
index db93c89..ec79c59 100644
--- a/services/core/java/com/android/server/wm/WindowSurfaceController.java
+++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java
@@ -82,7 +82,7 @@
boolean mChildrenDetached;
WindowSurfaceController(String name, int w, int h, int format,
- int flags, WindowStateAnimator animator, int windowType, int ownerUid) {
+ int flags, WindowStateAnimator animator, int windowType) {
mAnimator = animator;
mSurfaceW = w;
@@ -104,7 +104,7 @@
.setFormat(format)
.setFlags(flags)
.setMetadata(METADATA_WINDOW_TYPE, windowType)
- .setMetadata(METADATA_OWNER_UID, ownerUid)
+ .setMetadata(METADATA_OWNER_UID, mWindowSession.mUid)
.setMetadata(METADATA_OWNER_PID, mWindowSession.mPid)
.setCallsite("WindowSurfaceController");