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

Add a null check for getWindow()

Browse Source 
Protect against crash surfaced by monkey, where it seems that the window
of the dialog is no longer present. If not present, don't need to post
dismiss runnable.

Bug: 124327419
Test: adb shell monkey -p com.google.android.GoogleCamera -s 999 -v 20000
Change-Id: Ic03b8501bb73725e04544fcb2397532be531988e
This commit is contained in:
Siarhei Vishniakou
2019-03-05 10:05:01 -08:00
parent a11fb3bafe
commit d0de1cd170
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);
}
}