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

Merge "Added a hidden modelState to indicate model was deleted from device but available still." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-21 23:19:26 +00:00
committed by Android (Google) Code Review
parent 890daeb051 8b25ff8c9f
commit e4724a8e8f
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/service/translation/TranslationService.java
View File

@@ -361,6 +361,11 @@ public abstract class TranslationService extends Service {
new Consumer<Set<TranslationCapability>>() {
@Override
public void accept(Set<TranslationCapability> values) {
if (!isValidCapabilities(sourceFormat, targetFormat, values)) {
throw new IllegalStateException("Invalid capabilities and "
+ "format compatibility");
}
final ArraySet<TranslationCapability> capabilities = new ArraySet<>(values);
final Bundle bundle = new Bundle();
bundle.putParcelableArray(TranslationManager.EXTRA_CAPABILITIES,
@@ -369,4 +374,23 @@ public abstract class TranslationService extends Service {
}
});
}
/**
* Helper method to validate capabilities and format compatibility.
*/
private boolean isValidCapabilities(@TranslationSpec.DataFormat int sourceFormat,
@TranslationSpec.DataFormat int targetFormat, Set<TranslationCapability> capabilities) {
if (sourceFormat != TranslationSpec.DATA_FORMAT_TEXT
&& targetFormat != TranslationSpec.DATA_FORMAT_TEXT) {
return true;
}
for (TranslationCapability capability : capabilities) {
if (capability.getState() == TranslationCapability.STATE_REMOVED_AND_AVAILABLE) {
return false;
}
}
return true;
}
}

22
core/java/android/view/translation/TranslationCapability.java
View File

@@ -61,6 +61,13 @@ public final class TranslationCapability implements Parcelable {
* was dropped.</p>
*/
public static final @ModelState int STATE_NOT_AVAILABLE = 4;
/**
* The translation between the source and target specs were removed from the system, but is
* still available to be downloaded again.
*
* @hide
*/
public static final @ModelState int STATE_REMOVED_AND_AVAILABLE = 1000;
/**
* The state of translation readiness between {@code mSourceSpec} and {@code mTargetSpec}.
@@ -134,7 +141,8 @@ public final class TranslationCapability implements Parcelable {
STATE_AVAILABLE_TO_DOWNLOAD,
STATE_DOWNLOADING,
STATE_ON_DEVICE,
STATE_NOT_AVAILABLE
STATE_NOT_AVAILABLE,
STATE_REMOVED_AND_AVAILABLE
})
@Retention(RetentionPolicy.SOURCE)
@DataClass.Generated.Member
@@ -152,6 +160,8 @@ public final class TranslationCapability implements Parcelable {
return "STATE_ON_DEVICE";
case STATE_NOT_AVAILABLE:
return "STATE_NOT_AVAILABLE";
case STATE_REMOVED_AND_AVAILABLE:
return "STATE_REMOVED_AND_AVAILABLE";
default: return Integer.toHexString(value);
}
}
@@ -255,13 +265,15 @@ public final class TranslationCapability implements Parcelable {
if (!(mState == STATE_AVAILABLE_TO_DOWNLOAD)
&& !(mState == STATE_DOWNLOADING)
&& !(mState == STATE_ON_DEVICE)
&& !(mState == STATE_NOT_AVAILABLE)) {
&& !(mState == STATE_NOT_AVAILABLE)
&& !(mState == STATE_REMOVED_AND_AVAILABLE)) {
throw new java.lang.IllegalArgumentException(
"state was " + mState + " but must be one of: "
+ "STATE_AVAILABLE_TO_DOWNLOAD(" + STATE_AVAILABLE_TO_DOWNLOAD + "), "
+ "STATE_DOWNLOADING(" + STATE_DOWNLOADING + "), "
+ "STATE_ON_DEVICE(" + STATE_ON_DEVICE + "), "
+ "STATE_NOT_AVAILABLE(" + STATE_NOT_AVAILABLE + ")");
+ "STATE_NOT_AVAILABLE(" + STATE_NOT_AVAILABLE + "), "
+ "STATE_REMOVED_AND_AVAILABLE(" + STATE_REMOVED_AND_AVAILABLE + ")");
}
this.mSourceSpec = sourceSpec;
@@ -293,10 +305,10 @@ public final class TranslationCapability implements Parcelable {
};
@DataClass.Generated(
time = 1621545303074L,
time = 1624307114468L,
codegenVersion = "1.0.23",
sourceFile = "frameworks/base/core/java/android/view/translation/TranslationCapability.java",
inputSignatures = "public static final @android.view.translation.TranslationCapability.ModelState int STATE_AVAILABLE_TO_DOWNLOAD\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_DOWNLOADING\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_ON_DEVICE\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_NOT_AVAILABLE\nprivate final @android.view.translation.TranslationCapability.ModelState int mState\nprivate final @android.annotation.NonNull android.view.translation.TranslationSpec mSourceSpec\nprivate final @android.annotation.NonNull android.view.translation.TranslationSpec mTargetSpec\nprivate final boolean mUiTranslationEnabled\nprivate final @android.view.translation.TranslationContext.TranslationFlag int mSupportedTranslationFlags\nclass TranslationCapability extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstDefs=true, genToString=true, genConstructor=false)")
inputSignatures = "public static final @android.view.translation.TranslationCapability.ModelState int STATE_AVAILABLE_TO_DOWNLOAD\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_DOWNLOADING\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_ON_DEVICE\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_NOT_AVAILABLE\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_REMOVED_AND_AVAILABLE\nprivate final @android.view.translation.TranslationCapability.ModelState int mState\nprivate final @android.annotation.NonNull android.view.translation.TranslationSpec mSourceSpec\nprivate final @android.annotation.NonNull android.view.translation.TranslationSpec mTargetSpec\nprivate final boolean mUiTranslationEnabled\nprivate final @android.view.translation.TranslationContext.TranslationFlag int mSupportedTranslationFlags\nclass TranslationCapability extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstDefs=true, genToString=true, genConstructor=false)")
@Deprecated
private void __metadata() {}