From fdbf4f057b058237670bab3ba432647536d7bd4e Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Tue, 1 Aug 2017 00:51:34 +0000 Subject: [PATCH] Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev" This reverts commit a504291eefc8b5d4d8fa5dd4416aa6e5118f3f60. Reason for revert: Change-Id: I5da4f902d2fbcaffa44761b3f6ed8820ddb927bf --- src/com/android/settings/search/ResultPayload.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/search/ResultPayload.java b/src/com/android/settings/search/ResultPayload.java index eac928afd58..048c172b4a1 100644 --- a/src/com/android/settings/search/ResultPayload.java +++ b/src/com/android/settings/search/ResultPayload.java @@ -1,4 +1,4 @@ -l/* +/* * Copyright (C) 2017 The Android Open Source Project * * 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_APP, Availability.DISABLED_UNSUPPORTED, - Availability.RESOURCE_CONTENTION, - Availability.INTENT_ONLY,}) + Availability.RESOURCE_CONTENTION}) @Retention(RetentionPolicy.SOURCE) public @interface Availability { /** @@ -99,11 +98,6 @@ 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,