From ad2f190bbbe75edc641819abf127897d36c78fed Mon Sep 17 00:00:00 2001
From: Ian Pedowitz <ijpedowitz@google.com>
Date: Thu, 18 Feb 2016 04:50:05 +0000
Subject: Revert "Remove AccountsTester"

This reverts commit db65fef1ae49a24777eba4a683977b9b58bfbeb2.

Change-Id: Idbd18ab7fd4a0e9e0c99ce83dd7d65a2770d8239
---
 apps/Development/AndroidManifest.xml               |   1 +
 apps/Development/res/layout/accounts_tester.xml    | 110 +++++
 apps/Development/res/values/strings.xml            |  23 +
 .../com/android/development/AccountsTester.java    | 534 +++++++++++++++++++++
 4 files changed, 668 insertions(+)
 create mode 100644 apps/Development/res/layout/accounts_tester.xml
 create mode 100644 apps/Development/src/com/android/development/AccountsTester.java

diff --git a/apps/Development/AndroidManifest.xml b/apps/Development/AndroidManifest.xml
index ad0ef8aa7..d932174d1 100644
--- a/apps/Development/AndroidManifest.xml
+++ b/apps/Development/AndroidManifest.xml
@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.DEVICE_POWER" />
     <uses-permission android:name="android.permission.DUMP" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.HARDWARE_TEST" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/apps/Development/res/layout/accounts_tester.xml b/apps/Development/res/layout/accounts_tester.xml
new file mode 100644
index 000000000..3bf408eac
--- /dev/null
+++ b/apps/Development/res/layout/accounts_tester.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <TextView android:id="@+id/accounts_tester_account_types_spinner_label"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:text="@string/accounts_tester_select_account_type"/>
+
+        <Spinner android:id="@+id/accounts_tester_account_types_spinner"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"/>
+    </LinearLayout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        <Button
+                android:id="@+id/accounts_tester_get_accounts_by_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/accounts_tester_get_accounts_by_type"/>
+
+        <Button
+                android:id="@+id/accounts_tester_get_all_accounts"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/accounts_tester_get_all_accounts"/>
+
+        <Button android:id="@+id/accounts_tester_get_auth_token_by_type_and_feature"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/accounts_tester_get_auth_token_by_type_and_feature"/>
+
+    </LinearLayout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        <Button android:id="@+id/accounts_tester_add_account"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/accounts_tester_add_account"/>
+
+        <Button android:id="@+id/accounts_tester_edit_properties"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/accounts_tester_edit_properties"/>
+    </LinearLayout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <TextView android:id="@+id/accounts_tester_desiredFeatures"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:text="@string/accounts_tester_desired_features_label"/>
+
+        <EditText android:id="@+id/accounts_tester_desired_features"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:minEms="15"/>
+    </LinearLayout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <TextView android:id="@+id/accounts_tester_desiredFeatures"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:text="@string/accounts_tester_desired_authtokentype_label"/>
+
+        <EditText android:id="@+id/accounts_tester_desired_authtokentype"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:minEms="15"/>
+    </LinearLayout>
+
+    <ListView android:id="@+id/accounts_tester_accounts_list"
+              android:layout_width="match_parent" android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/apps/Development/res/values/strings.xml b/apps/Development/res/values/strings.xml
index 7553fd695..dd6cefd41 100644
--- a/apps/Development/res/values/strings.xml
+++ b/apps/Development/res/values/strings.xml
@@ -176,6 +176,29 @@
     <string name="source_uid_text">Source uid :  </string>
     <string name="shared_pkgs_text">Packages accessing via shared uid :  </string>
 
+    <!-- AccountsTester -->
+    <string name="accounts_tester_app_name">Accounts Tester</string>
+    <string name="accounts_tester_get_accounts_by_type">Get By Type</string>
+    <string name="accounts_tester_get_all_accounts">Get All</string>
+    <string name="accounts_tester_add_account">Add</string>
+    <string name="accounts_tester_select_account_type">Select Account Type</string>
+    <string name="accounts_tester_process_name_header">Process Name:</string>
+    <string name="accounts_tester_remove_account">Remove Account</string>
+    <string name="accounts_tester_get_auth_token">Get Auth Token</string>
+    <string name="accounts_tester_get_auth_token_by_type_and_feature">Get Auth Token By Type/Feature</string>
+    <string name="accounts_tester_test_has_features">Has Features</string>
+    <string name="accounts_tester_invalidate_auth_token">Invalidate Token</string>
+    <string name="accounts_tester_account_context_menu_title">account operations</string>
+    <string name="accounts_tester_ok_button">Ok</string>
+    <string name="accounts_tester_enter_auth_token_type">Enter the authtoken type:</string>
+    <string name="accounts_tester_enter_features">Enter the features separated by a space:</string>
+    <string name="accounts_tester_update_credentials">Update Credentials</string>
+    <string name="accounts_tester_confirm_credentials">Confirm Credentials</string>
+    <string name="accounts_tester_clear_password">Clear Password</string>
+    <string name="accounts_tester_edit_properties">Properties</string>
+    <string name="accounts_tester_desired_authtokentype_label">authtoken type:</string>
+    <string name="accounts_tester_desired_features_label">features:</string>
+
     <!-- SyncAdapterDriver -->
     <string name="bind_button">bind</string>
     <string name="unbind_button">unbind</string>
diff --git a/apps/Development/src/com/android/development/AccountsTester.java b/apps/Development/src/com/android/development/AccountsTester.java
new file mode 100644
index 000000000..09f4995e7
--- /dev/null
+++ b/apps/Development/src/com/android/development/AccountsTester.java
@@ -0,0 +1,534 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.development;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
+import android.accounts.AuthenticatorDescription;
+import android.accounts.AuthenticatorException;
+import android.accounts.OnAccountsUpdateListener;
+import android.accounts.OperationCanceledException;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.LayoutInflater;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AccountsTester extends Activity implements OnAccountsUpdateListener {
+    private static final String TAG = "AccountsTester";
+    private Spinner mAccountTypesSpinner;
+    private ListView mAccountsListView;
+    private AccountManager mAccountManager;
+    private Account mLongPressedAccount = null;
+    private AuthenticatorDescription[] mAuthenticatorDescs;
+
+    private static final int GET_AUTH_TOKEN_DIALOG_ID = 1;
+    private static final int UPDATE_CREDENTIALS_DIALOG_ID = 2;
+    private static final int INVALIDATE_AUTH_TOKEN_DIALOG_ID = 3;
+    private static final int TEST_HAS_FEATURES_DIALOG_ID = 4;
+    private static final int MESSAGE_DIALOG_ID = 5;
+    private static final int GET_AUTH_TOKEN_BY_TYPE_AND_FEATURE_DIALOG_ID = 6;
+
+    private EditText mDesiredAuthTokenTypeEditText;
+    private EditText mDesiredFeaturesEditText;
+    private volatile CharSequence mDialogMessage;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAccountManager = AccountManager.get(this);
+        setContentView(R.layout.accounts_tester);
+        ButtonClickListener buttonClickListener = new ButtonClickListener();
+
+        mAccountTypesSpinner = (Spinner) findViewById(R.id.accounts_tester_account_types_spinner);
+        mAccountsListView = (ListView) findViewById(R.id.accounts_tester_accounts_list);
+        registerForContextMenu(mAccountsListView);
+        initializeAuthenticatorsSpinner();
+        findViewById(R.id.accounts_tester_get_all_accounts).setOnClickListener(buttonClickListener);
+        findViewById(R.id.accounts_tester_get_accounts_by_type).setOnClickListener(
+                buttonClickListener);
+        findViewById(R.id.accounts_tester_add_account).setOnClickListener(buttonClickListener);
+        findViewById(R.id.accounts_tester_edit_properties).setOnClickListener(buttonClickListener);
+        findViewById(R.id.accounts_tester_get_auth_token_by_type_and_feature).setOnClickListener(
+                buttonClickListener);
+        mDesiredAuthTokenTypeEditText =
+                (EditText) findViewById(R.id.accounts_tester_desired_authtokentype);
+        mDesiredFeaturesEditText = (EditText) findViewById(R.id.accounts_tester_desired_features);
+    }
+
+    private class AccountArrayAdapter extends ArrayAdapter<Account> {
+        protected LayoutInflater mInflater;
+
+        public AccountArrayAdapter(Context context, Account[] accounts) {
+            super(context, R.layout.account_list_item, accounts);
+            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        }
+
+        class ViewHolder {
+            TextView name;
+            ImageView icon;
+            Account account;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            // A ViewHolder keeps references to children views to avoid unneccessary calls
+            // to findViewById() on each row.
+            ViewHolder holder;
+
+            // When convertView is not null, we can reuse it directly, there is no need
+            // to reinflate it. We only inflate a new View when the convertView supplied
+            // by ListView is null.
+            if (convertView == null) {
+                convertView = mInflater.inflate(R.layout.account_list_item, null);
+
+                // Creates a ViewHolder and store references to the two children views
+                // we want to bind data to.
+                holder = new ViewHolder();
+                holder.name = (TextView) convertView.findViewById(
+                        R.id.accounts_tester_account_name);
+                holder.icon = (ImageView) convertView.findViewById(
+                        R.id.accounts_tester_account_type_icon);
+
+                convertView.setTag(holder);
+            } else {
+                // Get the ViewHolder back to get fast access to the TextView
+                // and the ImageView.
+                holder = (ViewHolder) convertView.getTag();
+            }
+
+            final Account account = getItem(position);
+            holder.account = account;
+            holder.icon.setVisibility(View.INVISIBLE);
+            for (AuthenticatorDescription desc : mAuthenticatorDescs) {
+                if (desc.type.equals(account.type)) {
+                    final String packageName = desc.packageName;
+                    try {
+                        final Context authContext = getContext().createPackageContext(packageName,
+                                0);
+                        holder.icon.setImageDrawable(authContext.getResources().getDrawable(
+                                desc.iconId));
+                        holder.icon.setVisibility(View.VISIBLE);
+                    } catch (PackageManager.NameNotFoundException e) {
+                        Log.d(TAG, "error getting the Package Context for " + packageName, e);
+                    }
+                }
+            }
+
+            // Set text field
+            holder.name.setText(account.name);
+            return convertView;
+        }
+    }
+
+    private void initializeAuthenticatorsSpinner() {
+        mAuthenticatorDescs = mAccountManager.getAuthenticatorTypes();
+        List<String> names = new ArrayList(mAuthenticatorDescs.length);
+        for (int i = 0; i < mAuthenticatorDescs.length; i++) {
+            Context authContext;
+            try {
+                authContext = createPackageContext(mAuthenticatorDescs[i].packageName, 0);
+            } catch (PackageManager.NameNotFoundException e) {
+                continue;
+            }
+            try  {
+                names.add(authContext.getString(mAuthenticatorDescs[i].labelId));
+            } catch (Resources.NotFoundException e) {
+                continue;
+            }
+        }
+
+        String[] namesArray = names.toArray(new String[names.size()]);
+        ArrayAdapter<String> adapter =
+                new ArrayAdapter<String>(AccountsTester.this,
+                android.R.layout.simple_spinner_item, namesArray);
+        mAccountTypesSpinner.setAdapter(adapter);
+    }
+
+    public void onAccountsUpdated(Account[] accounts) {
+        Log.d(TAG, "onAccountsUpdated: \n  " + TextUtils.join("\n  ", accounts));
+        mAccountsListView.setAdapter(new AccountArrayAdapter(this, accounts));
+    }
+
+    protected void onStart() {
+        super.onStart();
+        final Handler mainHandler = new Handler(getMainLooper());
+        mAccountManager.addOnAccountsUpdatedListener(this, mainHandler,
+                true /* updateImmediately */);
+    }
+
+    protected void onStop() {
+        super.onStop();
+        mAccountManager.removeOnAccountsUpdatedListener(this);
+    }
+
+    class ButtonClickListener implements View.OnClickListener {
+        public void onClick(View v) {
+            if (R.id.accounts_tester_get_all_accounts == v.getId()) {
+                onAccountsUpdated(mAccountManager.getAccounts());
+            } else if (R.id.accounts_tester_get_accounts_by_type == v.getId()) {
+                String type = getSelectedAuthenticator().type;
+                onAccountsUpdated(mAccountManager.getAccountsByType(type));
+            } else if (R.id.accounts_tester_add_account == v.getId()) {
+                String authTokenType = mDesiredAuthTokenTypeEditText.getText().toString();
+                if (TextUtils.isEmpty(authTokenType)) {
+                    authTokenType = null;
+                }
+                String featureString = mDesiredFeaturesEditText.getText().toString();
+                String[] requiredFeatures = TextUtils.split(featureString, " ");
+                if (requiredFeatures.length == 0) {
+                    requiredFeatures = null;
+                }
+                mAccountManager.addAccount(getSelectedAuthenticator().type,
+                        authTokenType, requiredFeatures, null /* options */,
+                        AccountsTester.this,
+                        new CallbackToDialog(AccountsTester.this, "add account"),
+                        null /* handler */);
+            } else if (R.id.accounts_tester_edit_properties == v.getId()) {
+                mAccountManager.editProperties(getSelectedAuthenticator().type,
+                        AccountsTester.this,
+                        new CallbackToDialog(AccountsTester.this, "edit properties"),
+                        null /* handler */);
+            } else if (R.id.accounts_tester_get_auth_token_by_type_and_feature == v.getId()) {
+                showDialog(GET_AUTH_TOKEN_BY_TYPE_AND_FEATURE_DIALOG_ID);
+            } else {
+                // unknown button
+            }
+        }
+    }
+
+    private AuthenticatorDescription getSelectedAuthenticator() {
+        return mAuthenticatorDescs[mAccountTypesSpinner.getSelectedItemPosition()];
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v,
+            ContextMenu.ContextMenuInfo menuInfo) {
+        menu.setHeaderTitle(R.string.accounts_tester_account_context_menu_title);
+
+        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo)menuInfo;
+
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.layout.account_list_context_menu, menu);
+        AccountArrayAdapter.ViewHolder holder =
+                (AccountArrayAdapter.ViewHolder)info.targetView.getTag();
+        mLongPressedAccount = holder.account;
+    }
+
+    protected void onSaveInstanceState(Bundle outState) {
+        outState.putParcelable("account", mLongPressedAccount);
+    }
+
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        mLongPressedAccount = savedInstanceState.getParcelable("account");
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.accounts_tester_remove_account) {
+            final Account account = mLongPressedAccount;
+            mAccountManager.removeAccount(account, new AccountManagerCallback<Boolean>() {
+                public void run(AccountManagerFuture<Boolean> future) {
+                    try {
+                        Log.d(TAG, "removeAccount(" + account + ") = " + future.getResult());
+                    } catch (OperationCanceledException e) {
+                    } catch (IOException e) {
+                    } catch (AuthenticatorException e) {
+                    }
+                }
+            }, null /* handler */);
+        } else if (item.getItemId() == R.id.accounts_tester_clear_password) {
+            final Account account = mLongPressedAccount;
+            mAccountManager.clearPassword(account);
+            showMessageDialog("cleared");
+        } else if (item.getItemId() == R.id.accounts_tester_get_auth_token) {
+            showDialog(GET_AUTH_TOKEN_DIALOG_ID);
+        } else if (item.getItemId() == R.id.accounts_tester_test_has_features) {
+            showDialog(TEST_HAS_FEATURES_DIALOG_ID);
+        } else if (item.getItemId() == R.id.accounts_tester_invalidate_auth_token) {
+            showDialog(INVALIDATE_AUTH_TOKEN_DIALOG_ID);
+        } else if (item.getItemId() == R.id.accounts_tester_update_credentials) {
+            showDialog(UPDATE_CREDENTIALS_DIALOG_ID);
+        } else if (item.getItemId() == R.id.accounts_tester_confirm_credentials) {
+            mAccountManager.confirmCredentials(mLongPressedAccount, null,
+                    AccountsTester.this, new CallbackToDialog(this, "confirm credentials"),
+                    null /* handler */);
+        }
+        return true;
+    }
+
+    @Override
+    protected Dialog onCreateDialog(final int id) {
+        switch (id) {
+            case GET_AUTH_TOKEN_DIALOG_ID:
+            case INVALIDATE_AUTH_TOKEN_DIALOG_ID:
+            case UPDATE_CREDENTIALS_DIALOG_ID:
+            case TEST_HAS_FEATURES_DIALOG_ID: {
+                final View view = LayoutInflater.from(this).inflate(R.layout.get_auth_token_view,
+                        null);
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setPositiveButton(R.string.accounts_tester_ok_button,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                EditText value = (EditText) view.findViewById(
+                                        R.id.accounts_tester_auth_token_type);
+
+                                String authTokenType = value.getText().toString();
+                                final Account account = mLongPressedAccount;
+                                if (id == GET_AUTH_TOKEN_DIALOG_ID) {
+                                    mAccountManager.getAuthToken(account,
+                                            authTokenType,
+                                            null /* loginOptions */,
+                                            AccountsTester.this,
+                                            new CallbackToDialog(AccountsTester.this,
+                                                    "get auth token"),
+                                            null /* handler */);
+                                } else if (id == INVALIDATE_AUTH_TOKEN_DIALOG_ID) {
+                                    mAccountManager.getAuthToken(account, authTokenType, false,
+                                            new GetAndInvalidateAuthTokenCallback(account), null);
+                                } else if (id == TEST_HAS_FEATURES_DIALOG_ID) {
+                                    String[] features = TextUtils.split(authTokenType, ",");
+                                    mAccountManager.hasFeatures(account, features,
+                                            new TestHasFeaturesCallback(), null);
+                                } else {
+                                    mAccountManager.updateCredentials(
+                                            account,
+                                            authTokenType, null /* loginOptions */,
+                                            AccountsTester.this,
+                                            new CallbackToDialog(AccountsTester.this, "update"),
+                                            null /* handler */);
+                                }
+                            }
+                });
+                builder.setView(view);
+                return builder.create();
+            }
+
+            case GET_AUTH_TOKEN_BY_TYPE_AND_FEATURE_DIALOG_ID: {
+                final View view = LayoutInflater.from(this).inflate(R.layout.get_features_view,
+                        null);
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setPositiveButton(R.string.accounts_tester_ok_button,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                EditText value = (EditText) view.findViewById(
+                                        R.id.accounts_tester_auth_token_type);
+
+                                String authTokenType = value.getText().toString();
+
+                                value = (EditText) view.findViewById(
+                                        R.id.accounts_tester_features);
+
+                                String features = value.getText().toString();
+
+                                final Account account = mLongPressedAccount;
+                                mAccountManager.getAuthTokenByFeatures(
+                                        getSelectedAuthenticator().type,
+                                        authTokenType,
+                                        TextUtils.isEmpty(features) ? null : features.split(" "),
+                                        AccountsTester.this,
+                                        null /* addAccountOptions */,
+                                        null /* getAuthTokenOptions */,
+                                        new CallbackToDialog(AccountsTester.this,
+                                                "get auth token by features"),
+                                        null /* handler */);
+                            }
+                });
+                builder.setView(view);
+                return builder.create();
+            }
+
+            case MESSAGE_DIALOG_ID: {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setMessage(mDialogMessage);
+                return builder.create();
+            }
+        }
+
+        return super.onCreateDialog(id);
+    }
+
+    AccountManagerCallback<Bundle> newAccountsCallback(String type, String[] features) {
+        return new GetAccountsCallback(type, features);
+    }
+
+    class GetAccountsCallback implements AccountManagerCallback<Bundle> {
+        final String[] mFeatures;
+        final String mAccountType;
+
+        public GetAccountsCallback(String type, String[] features) {
+            mFeatures = features;
+            mAccountType = type;
+        }
+
+        public void run(AccountManagerFuture<Bundle> future) {
+            Log.d(TAG, "GetAccountsCallback: type " + mAccountType
+                    + ", features "
+                    + (mFeatures == null ? "none" : TextUtils.join(",", mFeatures)));
+            try {
+                Bundle result = future.getResult();
+                Parcelable[] accounts = result.getParcelableArray(AccountManager.KEY_ACCOUNTS);
+                Log.d(TAG, "found " + accounts.length + " accounts");
+                for (Parcelable account : accounts) {
+                    Log.d(TAG, "  " + account);
+                }
+            } catch (OperationCanceledException e) {
+                Log.d(TAG, "failure", e);
+            } catch (IOException e) {
+                Log.d(TAG, "failure", e);
+            } catch (AuthenticatorException e) {
+                Log.d(TAG, "failure", e);
+            }
+        }
+    }
+
+    AccountManagerCallback<Bundle> newAuthTokensCallback(String type, String authTokenType,
+            String[] features) {
+        return new GetAuthTokenCallback(type, authTokenType, features);
+    }
+
+    class GetAuthTokenCallback implements AccountManagerCallback<Bundle> {
+        final String[] mFeatures;
+        final String mAccountType;
+        final String mAuthTokenType;
+
+        public GetAuthTokenCallback(String type, String authTokenType, String[] features) {
+            mFeatures = features;
+            mAccountType = type;
+            mAuthTokenType = authTokenType;
+        }
+
+        public void run(AccountManagerFuture<Bundle> future) {
+            Log.d(TAG, "GetAuthTokenCallback: type " + mAccountType
+                    + ", features "
+                    + (mFeatures == null ? "none" : TextUtils.join(",", mFeatures)));
+            getAndLogResult(future, "get auth token");
+        }
+    }
+
+    private class GetAndInvalidateAuthTokenCallback implements AccountManagerCallback<Bundle> {
+        private final Account mAccount;
+
+        private GetAndInvalidateAuthTokenCallback(Account account) {
+            mAccount = account;
+        }
+
+        public void run(AccountManagerFuture<Bundle> future) {
+            Bundle result = getAndLogResult(future, "get and invalidate");
+            if (result != null) {
+                String authToken = result.getString(AccountManager.KEY_AUTHTOKEN);
+                mAccountManager.invalidateAuthToken(mAccount.type, authToken);
+            }
+        }
+    }
+
+    private void showMessageDialog(String message) {
+        mDialogMessage = message;
+        removeDialog(MESSAGE_DIALOG_ID);
+        showDialog(MESSAGE_DIALOG_ID);
+    }
+
+    private class TestHasFeaturesCallback implements AccountManagerCallback<Boolean> {
+        public void run(AccountManagerFuture<Boolean> future) {
+            try {
+                Boolean hasFeatures = future.getResult();
+                Log.d(TAG, "hasFeatures: " + hasFeatures);
+                showMessageDialog("hasFeatures: " + hasFeatures);
+            } catch (OperationCanceledException e) {
+                Log.d(TAG, "interrupted");
+                showMessageDialog("operation was canceled");
+            } catch (IOException e) {
+                Log.d(TAG, "error", e);
+                showMessageDialog("operation got an IOException");
+            } catch (AuthenticatorException e) {
+                Log.d(TAG, "error", e);
+                showMessageDialog("operation got an AuthenticationException");
+            }
+        }
+    }
+
+    private static class CallbackToDialog implements AccountManagerCallback<Bundle> {
+        private final AccountsTester mActivity;
+        private final String mLabel;
+
+        private CallbackToDialog(AccountsTester activity, String label) {
+            mActivity = activity;
+            mLabel = label;
+        }
+
+        public void run(AccountManagerFuture<Bundle> future) {
+            mActivity.getAndLogResult(future, mLabel);
+        }
+    }
+
+    private Bundle getAndLogResult(AccountManagerFuture<Bundle> future, String label) {
+        try {
+            Bundle result = future.getResult();
+            result.keySet();
+            Log.d(TAG, label + ": " + result);
+            StringBuffer sb = new StringBuffer();
+            sb.append(label).append(" result:");
+            for (String key : result.keySet()) {
+                Object value = result.get(key);
+                if (AccountManager.KEY_AUTHTOKEN.equals(key)) {
+                    value = "<redacted>";
+                }
+                sb.append("\n  ").append(key).append(" -> ").append(value);
+            }
+            showMessageDialog(sb.toString());
+            return result;
+        } catch (OperationCanceledException e) {
+            Log.d(TAG, label + " failed", e);
+            showMessageDialog(label + " was canceled");
+            return null;
+        } catch (IOException e) {
+            Log.d(TAG, label + " failed", e);
+            showMessageDialog(label + " failed with IOException: " + e.getMessage());
+            return null;
+        } catch (AuthenticatorException e) {
+            Log.d(TAG, label + " failed", e);
+            showMessageDialog(label + " failed with an AuthenticatorException: " + e.getMessage());
+            return null;
+        }
+    }
+}
-- 
cgit v1.2.3


From e0d5c41d6b31a4cc66f56da0d5be39d5b1f6379b Mon Sep 17 00:00:00 2001
From: Bo Hu <bohu@google.com>
Date: Mon, 2 May 2016 17:16:53 +0000
Subject: Revert "Emulator: enable predexopt for some sample apps"

because it breaks jank tests.
revert first


This reverts commit 59581fb6d478cfee517a078aea2d5c002f4c7fb9.

Change-Id: Ic4b07b28edd387826fc58df86b02bbab460c9074
---
 apps/GestureBuilder/Android.mk       | 2 +-
 apps/WidgetPreview/Android.mk        | 2 +-
 samples/ApiDemos/Android.mk          | 2 +-
 samples/CubeLiveWallpaper/Android.mk | 2 +-
 samples/SoftKeyboard/Android.mk      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/GestureBuilder/Android.mk b/apps/GestureBuilder/Android.mk
index 79532df35..424844394 100644
--- a/apps/GestureBuilder/Android.mk
+++ b/apps/GestureBuilder/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples tests
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := GestureBuilder
diff --git a/apps/WidgetPreview/Android.mk b/apps/WidgetPreview/Android.mk
index f1a97964a..04a492798 100644
--- a/apps/WidgetPreview/Android.mk
+++ b/apps/WidgetPreview/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := WidgetPreview
diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk
index 75748734f..66100b168 100644
--- a/samples/ApiDemos/Android.mk
+++ b/samples/ApiDemos/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples tests
-LOCAL_DEX_PREOPT := true
+
 # Only compile source java files in this apk.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += \
diff --git a/samples/CubeLiveWallpaper/Android.mk b/samples/CubeLiveWallpaper/Android.mk
index 08c90c83b..f14c5e656 100644
--- a/samples/CubeLiveWallpaper/Android.mk
+++ b/samples/CubeLiveWallpaper/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := CubeLiveWallpapers
diff --git a/samples/SoftKeyboard/Android.mk b/samples/SoftKeyboard/Android.mk
index 3fbd831bc..883bf2fd7 100755
--- a/samples/SoftKeyboard/Android.mk
+++ b/samples/SoftKeyboard/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := samples
-LOCAL_DEX_PREOPT := true
+
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_SDK_VERSION := current
-- 
cgit v1.2.3