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

resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I382d6f881cbfebb7692cbe49a14d9a7cc04d824e
This commit is contained in:
Matthew Fritze
2017-07-31 17:10:24 -07:00
parent 5e888ad7b6 9feab7a8a5
commit a504291eef
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/search/ResultPayload.java
View File

@@ -1,4 +1,4 @@
/* l/*
* Copyright (C) 2017 The Android Open Source Project * Copyright (C) 2017 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@@ -69,7 +69,8 @@ public class ResultPayload implements Parcelable {
Availability.DISABLED_DEPENDENT_SETTING, Availability.DISABLED_DEPENDENT_SETTING,
Availability.DISABLED_DEPENDENT_APP, Availability.DISABLED_DEPENDENT_APP,
Availability.DISABLED_UNSUPPORTED, Availability.DISABLED_UNSUPPORTED,
Availability.RESOURCE_CONTENTION}) Availability.RESOURCE_CONTENTION,
Availability.INTENT_ONLY,})
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface Availability { public @interface Availability {
/** /**
@@ -98,6 +99,11 @@ public class ResultPayload implements Parcelable {
* The setting is disabled because corresponding app is disabled * The setting is disabled because corresponding app is disabled
*/ */
int DISABLED_DEPENDENT_APP = 4; 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, @IntDef({SettingsSource.UNKNOWN, SettingsSource.SYSTEM, SettingsSource.SECURE,