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

Commit f3d8f260 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge changes I49660236,I56a7970a 

* changes:
  Delete unused code.
  Unhide setting for CTS testing.
parents d5647923 43f1befa

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -26781,6 +26781,7 @@ package android.provider { 
    field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";

    field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods";

    field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";

    field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";

    field public static final java.lang.String INPUT_METHOD_SELECTOR_VISIBILITY = "input_method_selector_visibility";

    field public static final java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28873,6 +28873,7 @@ package android.provider { 
    field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";

    field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods";

    field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";

    field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";

    field public static final java.lang.String INPUT_METHOD_SELECTOR_VISIBILITY = "input_method_selector_visibility";

    field public static final java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

core/java/android/provider/Settings.java

+0 −2
Original line number Diff line number Diff line
@@ -5598,8 +5598,6 @@ public final class Settings { 
        /**

         * Names of the packages that the current user has explicitly allowed to

         * manage notification policy configuration, separated by ':'.

         *

         * @hide

         */

        public static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES =

                "enabled_notification_policy_access_packages";

core/java/android/service/notification/ConditionProviderService.java

+0 −10
Original line number Diff line number Diff line
@@ -167,11 +167,6 @@ public abstract class ConditionProviderService extends Service { 
            mHandler.obtainMessage(H.ON_CONNECTED).sendToTarget();

        }



        @Override

        public void onRequestConditions(int relevance) {

            mHandler.obtainMessage(H.ON_REQUEST_CONDITIONS, relevance, 0).sendToTarget();

        }



        @Override

        public void onSubscribe(Uri conditionId) {

            mHandler.obtainMessage(H.ON_SUBSCRIBE, conditionId).sendToTarget();
@@ -185,7 +180,6 @@ public abstract class ConditionProviderService extends Service { 


    private final class H extends Handler {

        private static final int ON_CONNECTED = 1;

        private static final int ON_REQUEST_CONDITIONS = 2;

        private static final int ON_SUBSCRIBE = 3;

        private static final int ON_UNSUBSCRIBE = 4;
@@ -198,10 +192,6 @@ public abstract class ConditionProviderService extends Service { 
                        name = "onConnected";

                        onConnected();

                        break;

                    case ON_REQUEST_CONDITIONS:

                        name = "onRequestConditions";

                        onRequestConditions(msg.arg1);

                        break;

                    case ON_SUBSCRIBE:

                        name = "onSubscribe";

                        onSubscribe((Uri)msg.obj);

core/java/android/service/notification/IConditionProvider.aidl

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.service.notification.Condition; 
/** @hide */

oneway interface IConditionProvider {

    void onConnected();

    void onRequestConditions(int relevance);

    void onSubscribe(in Uri conditionId);

    void onUnsubscribe(in Uri conditionId);

}
 
 No newline at end of file