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

Merge "Add a null check for getWindow()"

Browse Source 
am: 3c69948e6a

Change-Id: Ibeffcb78acdb9744993d3aec810acd27416ba455
This commit is contained in:
Siarhei Vishniakou
2019-03-08 05:53:28 -08:00
committed by android-build-merger
parent c1d180cd7b 3c69948e6a
commit 71f52a6a0d
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/preference/DialogPreference.java
View File

@@ -342,16 +342,31 @@ public abstract class DialogPreference extends Preference implements
dialog.show();
}
/**
* Get the DecorView.
* @return the DecorView for the current dialog window, if it exists.
* If the window does not exist, null is returned.
*/
private View getDecorView() {
if (mDialog != null && mDialog.getWindow() != null) {
return mDialog.getWindow().getDecorView();
}
return null;
}
void postDismiss() {
removeDismissCallbacks();
View decorView = mDialog.getWindow().getDecorView();
decorView.post(mDismissRunnable);
View decorView = getDecorView();
if (decorView != null) {
// If decorView is null, dialog was already dismissed
decorView.post(mDismissRunnable);
}
}
private void removeDismissCallbacks() {
if (mDialog != null && mDialog.getWindow() != null
&& mDialog.getWindow().getDecorView() != null) {
mDialog.getWindow().getDecorView().removeCallbacks(mDismissRunnable);
View decorView = getDecorView();
if (decorView != null) {
decorView.removeCallbacks(mDismissRunnable);
}
}