From 17c5e79496bc1e2d53bc3c4e33bad4b39b80c36d Mon Sep 17 00:00:00 2001 From: Tom O'Neill Date: Thu, 4 Sep 2014 15:42:36 -0700 Subject: [PATCH] Keep LMP from breaking KitKat API - Bug: 17390371 Change-Id: I25c1abebcc42ed24abd57bbe2834a40fb8ee834b --- api/current.txt | 2 +- location/java/android/location/SettingInjectorService.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/api/current.txt b/api/current.txt index f7c0b975e038d..e48e5d5999b0b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/location/java/android/location/SettingInjectorService.java b/location/java/android/location/SettingInjectorService.java index 98c78647185e8..fcd2cdec904f3 100644 --- a/location/java/android/location/SettingInjectorService.java +++ b/location/java/android/location/SettingInjectorService.java @@ -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