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

Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev

Browse Source 
am: 21b22f0154

Change-Id: I9f203d14386598c0cb9c3264350564d75280e9a7
This commit is contained in:
Matthew Fritze
2017-08-01 01:01:35 +00:00
committed by android-build-merger
parent 61c338ee9a 21b22f0154
commit 8c0d24cb6d
1 changed files with 2 additions and 8 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,8 +69,7 @@ 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 {
/** /**
@@ -99,11 +98,6 @@ 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,