PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am: c7697e9b8a am: 933cdd5503

Browse Source 
am: 0730393097

Change-Id: Ia65d7c966350dac44a1d15a5781d051df8d464cd
This commit is contained in:
Mikhail Malakhov
2017-06-03 22:24:50 +00:00
committed by android-build-merger
parent ea71adb730 0730393097
commit 38382a44b0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/AllowBindAppWidgetActivity.java
View File

@@ -52,9 +52,8 @@ public class AllowBindAppWidgetActivity extends AlertActivity implements
private boolean mClicked;
public void onClick(DialogInterface dialog, int which) {
mClicked = true;
if (which == AlertDialog.BUTTON_POSITIVE) {
// By default, set the result to cancelled
setResult(RESULT_CANCELED);
if (mAppWidgetId != -1 && mComponentName != null && mCallingPackage != null) {
try {
final boolean bound = mAppWidgetManager.bindAppWidgetIdIfAllowed(mAppWidgetId,
@@ -80,15 +79,18 @@ public class AllowBindAppWidgetActivity extends AlertActivity implements
finish();
}
@Override
protected void onPause() {
if (isDestroyed() && !mClicked) {
setResult(RESULT_CANCELED);
if (!mClicked) { // RESULT_CANCELED
finish();
}
super.onDestroy();
super.onPause();
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setResult(RESULT_CANCELED); // By default, set the result to cancelled
Intent intent = getIntent();
CharSequence label = "";
if (intent != null) {
@@ -112,7 +114,6 @@ public class AllowBindAppWidgetActivity extends AlertActivity implements
mComponentName = null;
mCallingPackage = null;
Log.v("BIND_APPWIDGET", "Error getting parameters");
setResult(RESULT_CANCELED);
finish();
return;
}