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

Fix crash while rotating with app info dialog up

Browse Source 
Bug: 21037445
Change-Id: Ie5b0f8aa04913d0ab781be334c6c305db97235a0
This commit is contained in:
Jason Monk
2015-05-26 15:09:38 -04:00
parent 85a72a9088
commit 5e2529aeb4
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -35,7 +35,6 @@ import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Log; import android.util.Log;
import com.android.settings.InstrumentedPreferenceFragment;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils; import com.android.settings.Utils;
@@ -154,7 +153,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
} }
protected void showDialogInner(int id, int moveErrorCode) { protected void showDialogInner(int id, int moveErrorCode) {
DialogFragment newFragment = new MyAlertDialogFragment(id, moveErrorCode); DialogFragment newFragment = MyAlertDialogFragment.newInstance(id, moveErrorCode);
newFragment.setTargetFragment(this, 0); newFragment.setTargetFragment(this, 0);
newFragment.show(getFragmentManager(), "dialog " + id); newFragment.show(getFragmentManager(), "dialog " + id);
} }
@@ -214,23 +213,26 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
new UserHandle(UserHandle.getUserId(uid))); new UserHandle(UserHandle.getUserId(uid)));
} }
public class MyAlertDialogFragment extends DialogFragment { public static class MyAlertDialogFragment extends DialogFragment {
public MyAlertDialogFragment(int id, int errorCode) {
Bundle args = new Bundle();
args.putInt("id", id);
args.putInt("moveError", errorCode);
setArguments(args);
}
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
int id = getArguments().getInt("id"); int id = getArguments().getInt("id");
int errorCode = getArguments().getInt("moveError"); int errorCode = getArguments().getInt("moveError");
Dialog dialog = createDialog(id, errorCode); Dialog dialog = ((AppInfoBase) getTargetFragment()).createDialog(id, errorCode);
if (dialog == null) { if (dialog == null) {
throw new IllegalArgumentException("unknown id " + id); throw new IllegalArgumentException("unknown id " + id);
} }
return dialog; return dialog;
} }
public static MyAlertDialogFragment newInstance(int id, int errorCode) {
MyAlertDialogFragment dialogFragment = new MyAlertDialogFragment();
Bundle args = new Bundle();
args.putInt("id", id);
args.putInt("moveError", errorCode);
dialogFragment.setArguments(args);
return dialogFragment;
}
} }
} }