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

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

Change-Id: Idee6552c7f73f56693408988db8b2f709a059ac3
This commit is contained in:
Charles Chen
2021-06-22 10:17:22 +00:00
committed by Automerger Merge Worker
parent 319b0f061b 4a20c9425a
commit 46c16674f6
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 WindowTokenClient mWindowToken = new WindowTokenClient();
private final WindowContextController mController = new WindowContextController(mWindowToken); private final WindowContextController mController = new WindowContextController(mWindowToken);
private WindowManager mWindowManager; private WindowManager mWindowManager;
private boolean mInitialized;
/** /**
* Returns the type of this {@link WindowProviderService}. * Returns the type of this {@link WindowProviderService}.
@@ -122,13 +123,17 @@ public abstract class WindowProviderService extends Service {
return context.createTokenContext(mWindowToken, display); return context.createTokenContext(mWindowToken, display);
} }
@CallSuper /** @hide */
@Override @Override
public void onCreate() { protected void attachBaseContext(Context newBase) {
super.onCreate(); super.attachBaseContext(newBase);
mWindowToken.attachContext(this); if (!mInitialized) {
mController.attachToDisplayArea(getWindowType(), getDisplayId(), getWindowContextOptions()); mWindowToken.attachContext(this);
mWindowManager = WindowManagerImpl.createWindowContextWindowManager(this); mController.attachToDisplayArea(getWindowType(), getDisplayId(),
getWindowContextOptions());
mWindowManager = WindowManagerImpl.createWindowContextWindowManager(this);
mInitialized = true;
}
} }
@SuppressLint("OnNameExpected") @SuppressLint("OnNameExpected")