Merge "Fix ApnSettings crash issue." into nyc-dev

am: afdcb6a78e

* commit 'afdcb6a78ebc1c5c685e0b24fbf6bb5c23434b95':
  Fix ApnSettings crash issue.

Change-Id: I01da009772e6689a62fca6686900039ec4201fb5
This commit is contained in:
yifan.bai
2016-04-21 19:49:28 +00:00
committed by android-build-merger

View File

@@ -49,6 +49,7 @@ import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@@ -484,7 +485,11 @@ public class ApnSettings extends RestrictedSettingsFragment implements
@Override @Override
public Dialog onCreateDialog(int id) { public Dialog onCreateDialog(int id) {
if (id == DIALOG_RESTORE_DEFAULTAPN) { 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.setMessage(getResources().getString(R.string.restore_default_apn));
dialog.setCancelable(false); dialog.setCancelable(false);
return dialog; return dialog;