Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add getSessionName() API for group name in SettingsLib" into rvc-dev am: 8d287fd039

Browse Source 
Change-Id: I418d824054d169b22b3213fd277cab1b0f626840
This commit is contained in:
Automerger Merge Worker
2020-03-06 07:08:57 +00:00
parent 54278a4714 8d287fd039
commit 6f690303b8
3 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
View File

@@ -311,6 +311,21 @@ public class InfoMediaManager extends MediaManager {
return -1;
}
CharSequence getSessionName() {
if (TextUtils.isEmpty(mPackageName)) {
Log.w(TAG, "Unable to get session name. The package name is null or empty!");
return null;
}
final RoutingSessionInfo info = getRoutingSessionInfo();
if (info != null) {
return info.getName();
}
Log.w(TAG, "Unable to get session name for package: " + mPackageName);
return null;
}
private void refreshDevices() {
mMediaDevices.clear();
mCurrentConnectedDevice = null;

9
packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
View File

@@ -324,6 +324,15 @@ public class LocalMediaManager implements BluetoothCallback {
return mInfoMediaManager.getSessionVolume();
}
/**
* Gets the user-visible name of the {@link android.media.RoutingSessionInfo}.
*
* @return current name of the session, and return {@code null} if not found.
*/
public CharSequence getSessionName() {
return mInfoMediaManager.getSessionName();
}
private MediaDevice updateCurrentConnectedDevice() {
MediaDevice phoneMediaDevice = null;
for (MediaDevice device : mMediaDevices) {

33
packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java
View File

@@ -460,4 +460,37 @@ public class InfoMediaManagerTest {
assertThat(mInfoMediaManager.releaseSession()).isTrue();
}
@Test
public void getSessionName_packageNameIsNull_returnNull() {
mInfoMediaManager.mPackageName = null;
assertThat(mInfoMediaManager.getSessionName()).isNull();
}
@Test
public void getSessionName_notContainPackageName_returnNull() {
final List<RoutingSessionInfo> routingSessionInfos = new ArrayList<>();
final RoutingSessionInfo info = mock(RoutingSessionInfo.class);
routingSessionInfos.add(info);
mShadowRouter2Manager.setRoutingSessions(routingSessionInfos);
when(info.getClientPackageName()).thenReturn("com.fake.packagename");
when(info.getName()).thenReturn(TEST_NAME);
assertThat(mInfoMediaManager.getSessionName()).isNull();
}
@Test
public void getSessionName_containPackageName_returnName() {
final List<RoutingSessionInfo> routingSessionInfos = new ArrayList<>();
final RoutingSessionInfo info = mock(RoutingSessionInfo.class);
routingSessionInfos.add(info);
mShadowRouter2Manager.setRoutingSessions(routingSessionInfos);
when(info.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME);
when(info.getName()).thenReturn(TEST_NAME);
assertThat(mInfoMediaManager.getSessionName()).isEqualTo(TEST_NAME);
}
}