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

Commit 1afba555 authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
Browse files

Merge "Remove get APP label API" into rvc-dev am: f976dee6 am: 97337104 

Change-Id: Ief46dbe03ea0cb38a5f4470691cf472ba0ec10df
parents aac1884c 97337104

packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java

+0 −28
Original line number Original line Diff line number Diff line
@@ -31,18 +31,14 @@ import static android.media.MediaRoute2Info.TYPE_WIRED_HEADPHONES; 
import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET;

import static android.media.MediaRoute2Info.TYPE_WIRED_HEADSET;





import android.content.Context;

import android.content.Context;

import android.content.pm.PackageManager;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.media.MediaRoute2Info;

import android.media.MediaRoute2Info;

import android.media.MediaRouter2Manager;

import android.media.MediaRouter2Manager;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Log;





import androidx.annotation.IntDef;

import androidx.annotation.IntDef;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;





import com.android.settingslib.R;



import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;
@@ -210,30 +206,6 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { 
        return mRouteInfo.getClientPackageName();

        return mRouteInfo.getClientPackageName();

    }

    }





    /**

     * Get application label from MediaDevice.

     *

     * @return application label.

     */

    public String getClientAppLabel() {

        final String packageName = mRouteInfo.getClientPackageName();

        if (TextUtils.isEmpty(packageName)) {

            Log.d(TAG, "Client package name is empty");

            return mContext.getResources().getString(R.string.unknown);

        }

        try {

            final PackageManager packageManager = mContext.getPackageManager();

            final String appLabel = packageManager.getApplicationLabel(

                    packageManager.getApplicationInfo(packageName, 0)).toString();

            if (!TextUtils.isEmpty(appLabel)) {

                return appLabel;

            }

        } catch (PackageManager.NameNotFoundException e) {

            Log.e(TAG, "unable to find " + packageName);

        }

        return mContext.getResources().getString(R.string.unknown);

    }



    /**

    /**

     * Get application label from MediaDevice.

     * Get application label from MediaDevice.

     *

     *

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java

+0 −47
Original line number Original line Diff line number Diff line
@@ -29,13 +29,9 @@ import static org.mockito.Mockito.when; 
import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothDevice;

import android.content.Context;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageStats;

import android.media.MediaRoute2Info;

import android.media.MediaRoute2Info;

import android.media.MediaRouter2Manager;

import android.media.MediaRouter2Manager;





import com.android.settingslib.R;

import com.android.settingslib.bluetooth.A2dpProfile;

import com.android.settingslib.bluetooth.A2dpProfile;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.HearingAidProfile;

import com.android.settingslib.bluetooth.HearingAidProfile;
@@ -49,8 +45,6 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.Shadows;

import org.robolectric.shadows.ShadowPackageManager;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Collections;
@@ -70,8 +64,6 @@ public class MediaDeviceTest { 
    private static final String ROUTER_ID_2 = "RouterId_2";

    private static final String ROUTER_ID_2 = "RouterId_2";

    private static final String ROUTER_ID_3 = "RouterId_3";

    private static final String ROUTER_ID_3 = "RouterId_3";

    private static final String TEST_PACKAGE_NAME = "com.test.playmusic";

    private static final String TEST_PACKAGE_NAME = "com.test.playmusic";

    private static final String TEST_PACKAGE_NAME2 = "com.test.playmusic2";

    private static final String TEST_APPLICATION_LABEL = "playmusic";

    private final BluetoothClass mHeadreeClass =

    private final BluetoothClass mHeadreeClass =

            new BluetoothClass(BluetoothClass.Device.AUDIO_VIDEO_HEADPHONES);

            new BluetoothClass(BluetoothClass.Device.AUDIO_VIDEO_HEADPHONES);

    private final BluetoothClass mCarkitClass =

    private final BluetoothClass mCarkitClass =
@@ -125,10 +117,6 @@ public class MediaDeviceTest { 
    private InfoMediaDevice mInfoMediaDevice3;

    private InfoMediaDevice mInfoMediaDevice3;

    private List<MediaDevice> mMediaDevices = new ArrayList<>();

    private List<MediaDevice> mMediaDevices = new ArrayList<>();

    private PhoneMediaDevice mPhoneMediaDevice;

    private PhoneMediaDevice mPhoneMediaDevice;

    private ShadowPackageManager mShadowPackageManager;

    private ApplicationInfo mAppInfo;

    private PackageInfo mPackageInfo;

    private PackageStats mPackageStats;





    @Before

    @Before

    public void setUp() {

    public void setUp() {
@@ -459,41 +447,6 @@ public class MediaDeviceTest { 
        assertThat(mInfoMediaDevice1.getClientPackageName()).isEqualTo(TEST_PACKAGE_NAME);

        assertThat(mInfoMediaDevice1.getClientPackageName()).isEqualTo(TEST_PACKAGE_NAME);

    }

    }





    private void initPackage() {

        mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());

        mAppInfo = new ApplicationInfo();

        mAppInfo.flags = ApplicationInfo.FLAG_INSTALLED;

        mAppInfo.packageName = TEST_PACKAGE_NAME;

        mAppInfo.name = TEST_APPLICATION_LABEL;

        mPackageInfo = new PackageInfo();

        mPackageInfo.packageName = TEST_PACKAGE_NAME;

        mPackageInfo.applicationInfo = mAppInfo;

        mPackageStats = new PackageStats(TEST_PACKAGE_NAME);

    }



    @Test

    public void getClientAppLabel_matchedPackageName_returnLabel() {

        initPackage();

        when(mRouteInfo1.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME);



        assertThat(mInfoMediaDevice1.getClientAppLabel()).isEqualTo(

                mContext.getResources().getString(R.string.unknown));



        mShadowPackageManager.addPackage(mPackageInfo, mPackageStats);



        assertThat(mInfoMediaDevice1.getClientAppLabel()).isEqualTo(TEST_APPLICATION_LABEL);

    }



    @Test

    public void getClientAppLabel_noMatchedPackageName_returnDefault() {

        initPackage();

        mShadowPackageManager.addPackage(mPackageInfo, mPackageStats);

        when(mRouteInfo1.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME2);



        assertThat(mInfoMediaDevice1.getClientAppLabel()).isEqualTo(

                mContext.getResources().getString(R.string.unknown));

    }



    @Test

    @Test

    public void setState_verifyGetState() {

    public void setState_verifyGetState() {

        mInfoMediaDevice1.setState(LocalMediaManager.MediaDeviceState.STATE_CONNECTED);

        mInfoMediaDevice1.setState(LocalMediaManager.MediaDeviceState.STATE_CONNECTED);