PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp

Browse Source 
am: 7907bd215d

Change-Id: Ida01ce711fb56538558eb7314bb50d0ece122849
This commit is contained in:
Matthew Fritze
2017-08-01 00:35:36 +00:00
committed by android-build-merger
parent 7f509d341e 7907bd215d
commit 5d4a45da39
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/search/ResultPayload.java
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,