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

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

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

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I382d6f881cbfebb7692cbe49a14d9a7cc04d824e
parents 5e888ad7 9feab7a8

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

+8 −2
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,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,