Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2c12911 authored by Carlos Valdivia's avatar Carlos Valdivia Committed by Android Git Automerger
Browse files

am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev 

* commit '58156b41':
  Fix NPE when restarting ChooseTypeAndAccountActiivty.
parents dde9559b 58156b41

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -34,13 +34,11 @@ import android.widget.ArrayAdapter; 
import android.widget.Button;

import android.widget.Button;

import android.widget.ListView;

import android.widget.ListView;

import android.widget.TextView;

import android.widget.TextView;

import android.widget.Toast;





import com.android.internal.R;

import com.android.internal.R;





import java.io.IOException;

import java.io.IOException;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashSet;

import java.util.HashSet;

import java.util.Set;

import java.util.Set;
@@ -110,6 +108,7 @@ public class ChooseTypeAndAccountActivity extends Activity 
    private static final String KEY_INSTANCE_STATE_EXISTING_ACCOUNTS = "existingAccounts";

    private static final String KEY_INSTANCE_STATE_EXISTING_ACCOUNTS = "existingAccounts";

    private static final String KEY_INSTANCE_STATE_SELECTED_ACCOUNT_NAME = "selectedAccountName";

    private static final String KEY_INSTANCE_STATE_SELECTED_ACCOUNT_NAME = "selectedAccountName";

    private static final String KEY_INSTANCE_STATE_SELECTED_ADD_ACCOUNT = "selectedAddAccount";

    private static final String KEY_INSTANCE_STATE_SELECTED_ADD_ACCOUNT = "selectedAddAccount";

    private static final String KEY_INSTANCE_STATE_ACCOUNT_LIST = "accountList";





    private static final int SELECTED_ITEM_NONE = -1;

    private static final int SELECTED_ITEM_NONE = -1;
@@ -169,6 +168,7 @@ public class ChooseTypeAndAccountActivity extends Activity 




            mSelectedAddNewAccount = savedInstanceState.getBoolean(

            mSelectedAddNewAccount = savedInstanceState.getBoolean(

                    KEY_INSTANCE_STATE_SELECTED_ADD_ACCOUNT, false);

                    KEY_INSTANCE_STATE_SELECTED_ADD_ACCOUNT, false);

            mAccounts = savedInstanceState.getParcelableArrayList(KEY_INSTANCE_STATE_ACCOUNT_LIST);

        } else {

        } else {

            mPendingRequest = REQUEST_NULL;

            mPendingRequest = REQUEST_NULL;

            mExistingAccounts = null;

            mExistingAccounts = null;
@@ -266,6 +266,7 @@ public class ChooseTypeAndAccountActivity extends Activity 
                        mAccounts.get(mSelectedItemIndex).name);

                        mAccounts.get(mSelectedItemIndex).name);

            }

            }

        }

        }

        outState.putParcelableArrayList(KEY_INSTANCE_STATE_ACCOUNT_LIST, mAccounts);

    }

    }





    public void onCancelButtonClicked(View view) {

    public void onCancelButtonClicked(View view) {