Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-dr1-dev

am: 9feab7a8a5

Change-Id: I45565eb7bd6046cc20ccb223d88d1ac31a95d6b5
This commit is contained in:
Matthew Fritze
2017-07-31 23:50:03 +00:00
committed by android-build-merger

View File

@@ -68,7 +68,8 @@ public class ResultPayload implements Parcelable {
@IntDef({Availability.AVAILABLE,
Availability.DISABLED_DEPENDENCY,
Availability.DISABLED_UNSUPPORTED,
Availability.RESOURCE_CONTENTION})
Availability.RESOURCE_CONTENTION,
Availability.INTENT_ONLY,})
@Retention(RetentionPolicy.SOURCE)
public @interface Availability {
/**
@@ -91,6 +92,11 @@ public class ResultPayload implements Parcelable {
* be changed until it is released by said application.
*/
int RESOURCE_CONTENTION = 3;
/**
* This setting is supported on the device but cannot be changed inline.
*/
int INTENT_ONLY = 4;
}
@IntDef({SettingsSource.UNKNOWN, SettingsSource.SYSTEM, SettingsSource.SECURE,