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

Commit 649db7f0 authored by Tom O'Neill's avatar Tom O'Neill Committed by Android (Google) Code Review
Browse files

Merge "Keep LMP from breaking KitKat API" into lmp-dev

parents 8b9c97a4 17c5e794

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -14015,7 +14015,7 @@ package android.location { 
    ctor public SettingInjectorService(java.lang.String);

    method public final android.os.IBinder onBind(android.content.Intent);

    method protected abstract boolean onGetEnabled();

    method protected deprecated java.lang.String onGetSummary();

    method protected abstract deprecated java.lang.String onGetSummary();

    method public final void onStart(android.content.Intent, int);

    method public final int onStartCommand(android.content.Intent, int, int);

    field public static final java.lang.String ACTION_INJECTED_SETTING_CHANGED = "android.location.InjectedSettingChanged";

location/java/android/location/SettingInjectorService.java

+1 −4
Original line number Diff line number Diff line
@@ -196,10 +196,7 @@ public abstract class SettingInjectorService extends Service { 
     * @deprecated not called any more

     */

    @Deprecated

    protected String onGetSummary() {

        // Do not delete until no callers have @Override annotations for this method

        return null;

    }

    protected abstract String onGetSummary();



    /**

     * Returns the {@link android.preference.Preference#isEnabled()} value. Should not perform