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

Commit c7cdc8ca authored by Hani Kazmi's avatar Hani Kazmi Committed by Android (Google) Code Review
Browse files

Merge "Migrate Bundle/Intent APIs to new, type checked, variants"

parents 2ddcf674 4f221e5c

core/java/android/accessibilityservice/AccessibilityService.java

+2 −2
Original line number Diff line number Diff line
@@ -2590,9 +2590,9 @@ public abstract class AccessibilityService extends Service { 
                    return;

                }

                final HardwareBuffer hardwareBuffer =

                        result.getParcelable(KEY_ACCESSIBILITY_SCREENSHOT_HARDWAREBUFFER);

                        result.getParcelable(KEY_ACCESSIBILITY_SCREENSHOT_HARDWAREBUFFER, android.hardware.HardwareBuffer.class);

                final ParcelableColorSpace colorSpace =

                        result.getParcelable(KEY_ACCESSIBILITY_SCREENSHOT_COLORSPACE);

                        result.getParcelable(KEY_ACCESSIBILITY_SCREENSHOT_COLORSPACE, android.graphics.ParcelableColorSpace.class);

                final ScreenshotResult screenshot = new ScreenshotResult(hardwareBuffer,

                        colorSpace.getColorSpace(),

                        result.getLong(KEY_ACCESSIBILITY_SCREENSHOT_TIMESTAMP));

core/java/android/accounts/AbstractAccountAuthenticator.java

+1 −1
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ public abstract class AbstractAccountAuthenticator { 
        String authTokenType = sessionBundle.getString(KEY_AUTH_TOKEN_TYPE);

        Bundle options = sessionBundle.getBundle(KEY_OPTIONS);

        String[] requiredFeatures = sessionBundle.getStringArray(KEY_REQUIRED_FEATURES);

        Account account = sessionBundle.getParcelable(KEY_ACCOUNT);

        Account account = sessionBundle.getParcelable(KEY_ACCOUNT, android.accounts.Account.class);

        boolean containsKeyAccount = sessionBundle.containsKey(KEY_ACCOUNT);



        // Actual options passed to add account or update credentials flow.

core/java/android/accounts/AccountAuthenticatorActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class AccountAuthenticatorActivity extends Activity { 
        super.onCreate(icicle);



        mAccountAuthenticatorResponse =

                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);

                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, android.accounts.AccountAuthenticatorResponse.class);



        if (mAccountAuthenticatorResponse != null) {

            mAccountAuthenticatorResponse.onRequestContinued();

core/java/android/accounts/AccountManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2450,7 +2450,7 @@ public class AccountManager { 
                    onError(ERROR_CODE_INVALID_RESPONSE, "null bundle returned");

                    return;

                }

                Intent intent = bundle.getParcelable(KEY_INTENT);

                Intent intent = bundle.getParcelable(KEY_INTENT, android.content.Intent.class);

                if (intent != null && mActivity != null) {

                    // since the user provided an Activity we will silently start intents

                    // that we see

core/java/android/accounts/ChooseAccountActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class ChooseAccountActivity extends Activity { 
                        .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        mAccounts = getIntent().getParcelableArrayExtra(AccountManager.KEY_ACCOUNTS);

        mAccountManagerResponse =

                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_MANAGER_RESPONSE);

                getIntent().getParcelableExtra(AccountManager.KEY_ACCOUNT_MANAGER_RESPONSE, android.accounts.AccountManagerResponse.class);



        // KEY_ACCOUNTS is a required parameter

        if (mAccounts == null) {