Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdbf4f05 authored by Matthew Fritze's avatar Matthew Fritze
Browse files

Revert "resolve merge conflicts of 9feab7a8 to oc-mr1-dev" 

This reverts commit a504291e.

Reason for revert: <Build breaking>

Change-Id: I5da4f902d2fbcaffa44761b3f6ed8820ddb927bf
parent a504291e

src/com/android/settings/search/ResultPayload.java

+2 −8
Original line number Diff line number Diff line 
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,