Add INTENT_ONLY as a ResultPayload Availibility
Manual merge after a merge conflict. Test: robotests Bug: 64165583 Change-Id: I6eab018dc4065ceefdba2039a5842945e2f76a75
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user