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

Commit 35501e5b authored by Mocy Sheng's avatar Mocy Sheng Committed by Android (Google) Code Review
Browse files

Merge "Fix nullable annotation to match overriden method in super class"

parents 6960fbc3 ba61f71f

api/current.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -3987,7 +3987,7 @@ package android.app { 
    method public boolean startActivityIfNeeded(@NonNull @RequiresPermission android.content.Intent, int);

    method public boolean startActivityIfNeeded(@NonNull @RequiresPermission android.content.Intent, int);

    method public boolean startActivityIfNeeded(@NonNull @RequiresPermission android.content.Intent, int, @Nullable android.os.Bundle);

    method public boolean startActivityIfNeeded(@NonNull @RequiresPermission android.content.Intent, int, @Nullable android.os.Bundle);

    method public void startIntentSenderForResult(android.content.IntentSender, int, @Nullable android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;

    method public void startIntentSenderForResult(android.content.IntentSender, int, @Nullable android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;

    method public void startIntentSenderForResult(android.content.IntentSender, int, @Nullable android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;

    method public void startIntentSenderForResult(android.content.IntentSender, int, @Nullable android.content.Intent, int, int, int, @Nullable android.os.Bundle) throws android.content.IntentSender.SendIntentException;

    method @Deprecated public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;

    method @Deprecated public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;

    method @Deprecated public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int, @Nullable android.os.Bundle) throws android.content.IntentSender.SendIntentException;

    method @Deprecated public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int, @Nullable android.os.Bundle) throws android.content.IntentSender.SendIntentException;

    method public void startLocalVoiceInteraction(android.os.Bundle);

    method public void startLocalVoiceInteraction(android.os.Bundle);
@@ -10350,8 +10350,8 @@ package android.content { 
    method public void startActivity(android.content.Intent, android.os.Bundle);

    method public void startActivity(android.content.Intent, android.os.Bundle);

    method public android.content.ComponentName startForegroundService(android.content.Intent);

    method public android.content.ComponentName startForegroundService(android.content.Intent);

    method public boolean startInstrumentation(android.content.ComponentName, String, android.os.Bundle);

    method public boolean startInstrumentation(android.content.ComponentName, String, android.os.Bundle);

    method public void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;

    method public void startIntentSender(android.content.IntentSender, @Nullable android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;

    method public void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;

    method public void startIntentSender(android.content.IntentSender, @Nullable android.content.Intent, int, int, int, @Nullable android.os.Bundle) throws android.content.IntentSender.SendIntentException;

    method public android.content.ComponentName startService(android.content.Intent);

    method public android.content.ComponentName startService(android.content.Intent);

    method public boolean stopService(android.content.Intent);

    method public boolean stopService(android.content.Intent);

    method public void unbindService(android.content.ServiceConnection);

    method public void unbindService(android.content.ServiceConnection);

core/java/android/app/Activity.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -5372,7 +5372,7 @@ public class Activity extends ContextThemeWrapper 
        return mActivityTransitionState.isTransitionRunning();

        return mActivityTransitionState.isTransitionRunning();

    }

    }





    private Bundle transferSpringboardActivityOptions(Bundle options) {

    private Bundle transferSpringboardActivityOptions(@Nullable Bundle options) {

        if (options == null && (mWindow != null && !mWindow.isActive())) {

        if (options == null && (mWindow != null && !mWindow.isActive())) {

            final ActivityOptions activityOptions = getActivityOptions();

            final ActivityOptions activityOptions = getActivityOptions();

            if (activityOptions != null &&

            if (activityOptions != null &&
@@ -5540,7 +5540,7 @@ public class Activity extends ContextThemeWrapper 
     */

     */

    public void startIntentSenderForResult(IntentSender intent, int requestCode,

    public void startIntentSenderForResult(IntentSender intent, int requestCode,

            @Nullable Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags,

            @Nullable Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags,

            Bundle options) throws IntentSender.SendIntentException {

            @Nullable Bundle options) throws IntentSender.SendIntentException {

        if (mParent == null) {

        if (mParent == null) {

            startIntentSenderForResultInner(intent, mEmbeddedID, requestCode, fillInIntent,

            startIntentSenderForResultInner(intent, mEmbeddedID, requestCode, fillInIntent,

                    flagsMask, flagsValues, options);

                    flagsMask, flagsValues, options);
@@ -5557,7 +5557,7 @@ public class Activity extends ContextThemeWrapper 




    private void startIntentSenderForResultInner(IntentSender intent, String who, int requestCode,

    private void startIntentSenderForResultInner(IntentSender intent, String who, int requestCode,

            Intent fillInIntent, int flagsMask, int flagsValues,

            Intent fillInIntent, int flagsMask, int flagsValues,

            Bundle options)

            @Nullable Bundle options)

            throws IntentSender.SendIntentException {

            throws IntentSender.SendIntentException {

        try {

        try {

            options = transferSpringboardActivityOptions(options);

            options = transferSpringboardActivityOptions(options);
@@ -5718,6 +5718,7 @@ public class Activity extends ContextThemeWrapper 
     * <var>flagsMask</var>

     * <var>flagsMask</var>

     * @param extraFlags Always set to 0.

     * @param extraFlags Always set to 0.

     */

     */

    @Override

    public void startIntentSender(IntentSender intent,

    public void startIntentSender(IntentSender intent,

            @Nullable Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags)

            @Nullable Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags)

            throws IntentSender.SendIntentException {

            throws IntentSender.SendIntentException {
@@ -5745,9 +5746,10 @@ public class Activity extends ContextThemeWrapper 
     * have also been supplied by the IntentSender, options given here will

     * have also been supplied by the IntentSender, options given here will

     * override any that conflict with those given by the IntentSender.

     * override any that conflict with those given by the IntentSender.

     */

     */

    @Override

    public void startIntentSender(IntentSender intent,

    public void startIntentSender(IntentSender intent,

            @Nullable Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags,

            @Nullable Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags,

            Bundle options) throws IntentSender.SendIntentException {

            @Nullable Bundle options) throws IntentSender.SendIntentException {

        if (options != null) {

        if (options != null) {

            startIntentSenderForResult(intent, -1, fillInIntent, flagsMask,

            startIntentSenderForResult(intent, -1, fillInIntent, flagsMask,

                    flagsValues, extraFlags, options);

                    flagsValues, extraFlags, options);

core/java/android/content/ContextWrapper.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -449,7 +449,8 @@ public class ContextWrapper extends Context { 




    @Override

    @Override

    public void startIntentSender(IntentSender intent,

    public void startIntentSender(IntentSender intent,

            Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags)

            @Nullable Intent fillInIntent, int flagsMask, int flagsValues,

            int extraFlags)

            throws IntentSender.SendIntentException {

            throws IntentSender.SendIntentException {

        mBase.startIntentSender(intent, fillInIntent, flagsMask,

        mBase.startIntentSender(intent, fillInIntent, flagsMask,

                flagsValues, extraFlags);

                flagsValues, extraFlags);
@@ -457,8 +458,9 @@ public class ContextWrapper extends Context { 




    @Override

    @Override

    public void startIntentSender(IntentSender intent,

    public void startIntentSender(IntentSender intent,

            Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags,

            @Nullable Intent fillInIntent, int flagsMask, int flagsValues,

            Bundle options) throws IntentSender.SendIntentException {

            int extraFlags, @Nullable Bundle options)

            throws IntentSender.SendIntentException {

        mBase.startIntentSender(intent, fillInIntent, flagsMask,

        mBase.startIntentSender(intent, fillInIntent, flagsMask,

                flagsValues, extraFlags, options);

                flagsValues, extraFlags, options);

    }

    }