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

Merge "Move initialization from onCreate to attachBaseContext" into sc-v2-dev am: 4a20c9425a am: 46c16674f6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15048195

Change-Id: Iec3dd30355e4c7f18341a964d75d286366c41915
This commit is contained in:
Charles Chen
2021-06-22 10:29:44 +00:00
committed by Automerger Merge Worker
parent bef5ea37a0 46c16674f6
commit 04082fcf2e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/window/WindowProviderService.java
View File

@@ -53,6 +53,7 @@ public abstract class WindowProviderService extends Service {
private final WindowTokenClient mWindowToken = new WindowTokenClient();
private final WindowContextController mController = new WindowContextController(mWindowToken);
private WindowManager mWindowManager;
private boolean mInitialized;
/**
* Returns the type of this {@link WindowProviderService}.
@@ -122,13 +123,17 @@ public abstract class WindowProviderService extends Service {
return context.createTokenContext(mWindowToken, display);
}
@CallSuper
/** @hide */
@Override
public void onCreate() {
super.onCreate();
mWindowToken.attachContext(this);
mController.attachToDisplayArea(getWindowType(), getDisplayId(), getWindowContextOptions());
mWindowManager = WindowManagerImpl.createWindowContextWindowManager(this);
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(newBase);
if (!mInitialized) {
mWindowToken.attachContext(this);
mController.attachToDisplayArea(getWindowType(), getDisplayId(),
getWindowContextOptions());
mWindowManager = WindowManagerImpl.createWindowContextWindowManager(this);
mInitialized = true;
}
}
@SuppressLint("OnNameExpected")