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

Commit 8d7cb5e6 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "[LE Broadcast]Add check for null point exception" into udc-dev am: ac6e91d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23484432



Change-Id: Ia70d074e901f59d82ca913d5c0574ee5d9b6930e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1f23c3b ac6e91d9

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialog.java

+27 −8
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import android.widget.TextView; 
import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.core.graphics.drawable.IconCompat;

import androidx.core.graphics.drawable.IconCompat;





import com.android.internal.annotations.VisibleForTesting;

import com.android.settingslib.media.BluetoothMediaDevice;

import com.android.settingslib.media.BluetoothMediaDevice;

import com.android.settingslib.media.MediaDevice;

import com.android.settingslib.media.MediaDevice;

import com.android.settingslib.qrcode.QrCodeGenerator;

import com.android.settingslib.qrcode.QrCodeGenerator;
@@ -420,7 +421,8 @@ public class MediaOutputBroadcastDialog extends MediaOutputBaseDialog { 
        return mMediaOutputController.getBroadcastMetadata();

        return mMediaOutputController.getBroadcastMetadata();

    }

    }





    private void updateBroadcastInfo(boolean isBroadcastCode, String updatedString) {

    @VisibleForTesting

    void updateBroadcastInfo(boolean isBroadcastCode, String updatedString) {

        Button positiveBtn = mAlertDialog.getButton(AlertDialog.BUTTON_POSITIVE);

        Button positiveBtn = mAlertDialog.getButton(AlertDialog.BUTTON_POSITIVE);

        if (positiveBtn != null) {

        if (positiveBtn != null) {

            positiveBtn.setEnabled(false);

            positiveBtn.setEnabled(false);
@@ -523,16 +525,33 @@ public class MediaOutputBroadcastDialog extends MediaOutputBaseDialog { 
    }

    }





    private void handleUpdateFailedUi() {

    private void handleUpdateFailedUi() {

        final Button positiveBtn = mAlertDialog.getButton(AlertDialog.BUTTON_POSITIVE);

        if (mAlertDialog == null) {

        mBroadcastErrorMessage.setVisibility(View.VISIBLE);

            Log.d(TAG, "handleUpdateFailedUi: mAlertDialog is null");

        if (mRetryCount < MAX_BROADCAST_INFO_UPDATE) {

            return;

            if (positiveBtn != null) {

                positiveBtn.setEnabled(true);

        }

        }

            mBroadcastErrorMessage.setText(R.string.media_output_broadcast_update_error);

        int errorMessageStringId = -1;

        boolean enablePositiveBtn = false;

        if (mRetryCount < MAX_BROADCAST_INFO_UPDATE) {

            enablePositiveBtn = true;

            errorMessageStringId = R.string.media_output_broadcast_update_error;

        } else {

        } else {

            mRetryCount = 0;

            mRetryCount = 0;

            mBroadcastErrorMessage.setText(R.string.media_output_broadcast_last_update_error);

            errorMessageStringId = R.string.media_output_broadcast_last_update_error;

        }

        }



        // update UI

        final Button positiveBtn = mAlertDialog.getButton(AlertDialog.BUTTON_POSITIVE);

        if (positiveBtn != null && enablePositiveBtn) {

            positiveBtn.setEnabled(true);

        }

        if (mBroadcastErrorMessage != null) {

            mBroadcastErrorMessage.setVisibility(View.VISIBLE);

            mBroadcastErrorMessage.setText(errorMessageStringId);

        }

    }



    @VisibleForTesting

    int getRetryCount() {

        return mRetryCount;

    }

    }

}
 
}

packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java

+58 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.systemui.media.dialog;

package com.android.systemui.media.dialog;





import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.any;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;
@@ -33,6 +35,8 @@ import android.media.session.MediaSessionManager; 
import android.os.PowerExemptionManager;

import android.os.PowerExemptionManager;

import android.testing.AndroidTestingRunner;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper;

import android.widget.ImageView;

import android.widget.TextView;





import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;
@@ -44,6 +48,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; 
import com.android.settingslib.media.BluetoothMediaDevice;

import com.android.settingslib.media.BluetoothMediaDevice;

import com.android.settingslib.media.LocalMediaManager;

import com.android.settingslib.media.LocalMediaManager;

import com.android.settingslib.media.MediaDevice;

import com.android.settingslib.media.MediaDevice;

import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.animation.DialogLaunchAnimator;

import com.android.systemui.animation.DialogLaunchAnimator;

import com.android.systemui.broadcast.BroadcastSender;

import com.android.systemui.broadcast.BroadcastSender;
@@ -58,6 +63,7 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;





import java.nio.charset.StandardCharsets;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.List;

import java.util.List;

import java.util.Optional;

import java.util.Optional;
@@ -68,6 +74,9 @@ import java.util.Optional; 
public class MediaOutputBroadcastDialogTest extends SysuiTestCase {

public class MediaOutputBroadcastDialogTest extends SysuiTestCase {





    private static final String TEST_PACKAGE = "test_package";

    private static final String TEST_PACKAGE = "test_package";

    private static final String BROADCAST_NAME_TEST = "Broadcast_name_test";

    private static final String BROADCAST_CODE_TEST = "112233";

    private static final String BROADCAST_CODE_UPDATE_TEST = "11223344";





    // Mock

    // Mock

    private final MediaSessionManager mMediaSessionManager = mock(MediaSessionManager.class);

    private final MediaSessionManager mMediaSessionManager = mock(MediaSessionManager.class);
@@ -106,6 +115,9 @@ public class MediaOutputBroadcastDialogTest extends SysuiTestCase { 
        when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);

        when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);

        when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(null);

        when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(null);

        when(mLocalBluetoothProfileManager.getLeAudioBroadcastAssistantProfile()).thenReturn(null);

        when(mLocalBluetoothProfileManager.getLeAudioBroadcastAssistantProfile()).thenReturn(null);

        when(mLocalBluetoothLeBroadcast.getProgramInfo()).thenReturn(BROADCAST_NAME_TEST);

        when(mLocalBluetoothLeBroadcast.getBroadcastCode()).thenReturn(

                BROADCAST_CODE_TEST.getBytes(StandardCharsets.UTF_8));





        mMediaOutputController = new MediaOutputController(mContext, TEST_PACKAGE,

        mMediaOutputController = new MediaOutputController(mContext, TEST_PACKAGE,

                mMediaSessionManager, mLocalBluetoothManager, mStarter,

                mMediaSessionManager, mLocalBluetoothManager, mStarter,
@@ -194,4 +206,50 @@ public class MediaOutputBroadcastDialogTest extends SysuiTestCase { 




        verify(mLocalBluetoothLeBroadcastAssistant, times(1)).addSource(any(), any(), anyBoolean());

        verify(mLocalBluetoothLeBroadcastAssistant, times(1)).addSource(any(), any(), anyBoolean());

    }

    }



    @Test

    public void handleLeBroadcastMetadataChanged_checkBroadcastName() {

        when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(

                mLocalBluetoothLeBroadcast);

        final TextView broadcastName = mMediaOutputBroadcastDialog.mDialogView

                .requireViewById(R.id.broadcast_name_summary);



        mMediaOutputBroadcastDialog.handleLeBroadcastMetadataChanged();



        assertThat(broadcastName.getText().toString()).isEqualTo(BROADCAST_NAME_TEST);

    }



    @Test

    public void handleLeBroadcastMetadataChanged_checkBroadcastCode() {

        when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(

                mLocalBluetoothLeBroadcast);



        final TextView broadcastCode = mMediaOutputBroadcastDialog.mDialogView

                .requireViewById(R.id.broadcast_code_summary);



        mMediaOutputBroadcastDialog.handleLeBroadcastMetadataChanged();



        assertThat(broadcastCode.getText().toString()).isEqualTo(BROADCAST_CODE_TEST);

    }



    @Test

    public void updateBroadcastInfo_stopBroadcastFailed_handleFailedUi() {

        ImageView broadcastCodeEdit = mMediaOutputBroadcastDialog.mDialogView

                .requireViewById(R.id.broadcast_code_edit);

        TextView broadcastCode = mMediaOutputBroadcastDialog.mDialogView.requireViewById(

                R.id.broadcast_code_summary);

        broadcastCode.setText(BROADCAST_CODE_UPDATE_TEST);

        when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(null);

        broadcastCodeEdit.callOnClick();



        mMediaOutputBroadcastDialog.updateBroadcastInfo(true, BROADCAST_CODE_UPDATE_TEST);

        assertThat(mMediaOutputBroadcastDialog.getRetryCount()).isEqualTo(1);



        mMediaOutputBroadcastDialog.updateBroadcastInfo(true, BROADCAST_CODE_UPDATE_TEST);

        assertThat(mMediaOutputBroadcastDialog.getRetryCount()).isEqualTo(2);



        // It will be the MAX Retry Count = 3

        mMediaOutputBroadcastDialog.updateBroadcastInfo(true, BROADCAST_CODE_UPDATE_TEST);

        assertThat(mMediaOutputBroadcastDialog.getRetryCount()).isEqualTo(0);

    }

}
 
}