Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev am: 688e5438dd

am: a9dfbcee2b

Change-Id: I98d2aeff732b36e925591a820a63711ceddff066
This commit is contained in:
Matthew Fritze
2017-08-06 20:55:07 +00:00
committed by android-build-merger

View File

@@ -69,7 +69,8 @@ public class ResultPayload implements Parcelable {
Availability.DISABLED_DEPENDENT_SETTING,
Availability.DISABLED_DEPENDENT_APP,
Availability.DISABLED_UNSUPPORTED,
Availability.RESOURCE_CONTENTION})
Availability.RESOURCE_CONTENTION,
Availability.INTENT_ONLY,})
@Retention(RetentionPolicy.SOURCE)
public @interface Availability {
/**
@@ -98,6 +99,11 @@ public class ResultPayload implements Parcelable {
* The setting is disabled because corresponding app is disabled
*/
int DISABLED_DEPENDENT_APP = 4;
/**
* This setting is supported on the device but cannot be changed inline.
*/
int INTENT_ONLY = 5;
}
@IntDef({SettingsSource.UNKNOWN, SettingsSource.SYSTEM, SettingsSource.SECURE,