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

TIF: Update the internal input list with new TvInputInfo

Browse Source 
Bug: 26864151, Bug: 26863281
Change-Id: I33e357aac74bceda50c794eb6057c363de9250b8
(cherry picked from commit 89a9937927)
This commit is contained in:
Jae Seo
2016-01-28 19:13:04 -08:00
parent ed330c7f7d
commit abda420b9d
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media/java/android/media/tv/TvInputInfo.java
View File

@@ -52,6 +52,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
/**
@@ -502,7 +503,22 @@ public final class TvInputInfo implements Parcelable {
}
TvInputInfo obj = (TvInputInfo) o;
return mId.equals(obj.mId);
return TextUtils.equals(mId, obj.mId)
&& TextUtils.equals(mParentId, obj.mParentId)
&& Objects.equals(mService, obj.mService)
&& TextUtils.equals(mSetupActivity, obj.mSetupActivity)
&& TextUtils.equals(mSettingsActivity, obj.mSettingsActivity)
&& mType == obj.mType
&& mTunerCount == obj.mTunerCount
&& mCanRecord == obj.mCanRecord
&& mIsHardwareInput == obj.mIsHardwareInput
&& Objects.equals(mHdmiDeviceInfo, obj.mHdmiDeviceInfo)
&& Objects.equals(mIcon, obj.mIcon)
&& Objects.equals(mIconUri, obj.mIconUri)
&& mLabelResId == obj.mLabelResId
&& TextUtils.equals(mLabel, obj.mLabel)
&& mIsConnectedToHdmiSwitch == obj.mIsConnectedToHdmiSwitch
&& Objects.equals(mExtras, obj.mExtras);
}
@Override

24
services/core/java/com/android/server/tv/TvInputManagerService.java
View File

@@ -330,12 +330,12 @@ public final class TvInputManagerService extends SystemService {
if (DEBUG) {
Slog.d(TAG, "add " + info.getId());
}
TvInputState state = userState.inputMap.get(info.getId());
if (state == null) {
state = new TvInputState();
TvInputState inputState = userState.inputMap.get(info.getId());
if (inputState == null) {
inputState = new TvInputState();
inputState.info = info;
}
state.info = info;
inputMap.put(info.getId(), state);
inputMap.put(info.getId(), inputState);
}
for (String inputId : inputMap.keySet()) {
@@ -781,7 +781,17 @@ public final class TvInputManagerService extends SystemService {
if (DEBUG) {
Slog.d(TAG, "setTvInputInfoLocked(inputInfo=" + inputInfo + ")");
}
// TODO: Also update the internal input list.
String inputId = inputInfo.getId();
TvInputState inputState = userState.inputMap.get(inputId);
if (inputState == null) {
Slog.e(TAG, "failed to set input info - unknown input id " + inputId);
return;
}
if (inputState.info.equals(inputInfo)) {
return;
}
inputState.info = inputInfo;
for (ITvInputManagerCallback callback : userState.callbackSet) {
try {
callback.onTvInputInfoChanged(inputInfo);
@@ -852,7 +862,7 @@ public final class TvInputManagerService extends SystemService {
}
final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(),
Binder.getCallingUid(), userId, "setTvInputInfoChanged");
Binder.getCallingUid(), userId, "setTvInputInfo");
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mLock) {