From 27b908f6d140bcfa80202dba154b70890f3d60e9 Mon Sep 17 00:00:00 2001 From: "yifan.bai" Date: Fri, 15 Apr 2016 15:25:03 +0800 Subject: [PATCH] Fix ApnSettings crash issue. Steps: 1. Add a new APN; 2. Click 'Reset to default'; 3. During reset, click the new APN; 4. Crash happened. Solution: Disable menu items when reseting default APN. Bug: 28314239 Change-Id: I8df439d066e58039e9f91a9be642127eb7298159 --- src/com/android/settings/ApnSettings.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index a6cd9b2e97b..870c5aabbfa 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -49,6 +49,7 @@ import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import android.view.MotionEvent; import android.widget.TextView; import android.widget.Toast; @@ -484,7 +485,11 @@ public class ApnSettings extends RestrictedSettingsFragment implements @Override public Dialog onCreateDialog(int id) { if (id == DIALOG_RESTORE_DEFAULTAPN) { - ProgressDialog dialog = new ProgressDialog(getActivity()); + ProgressDialog dialog = new ProgressDialog(getActivity()) { + public boolean onTouchEvent(MotionEvent event) { + return true; + } + }; dialog.setMessage(getResources().getString(R.string.restore_default_apn)); dialog.setCancelable(false); return dialog;