summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom O'Neill <tomo@google.com>2014-09-04 15:42:36 -0700
committerTom O'Neill <tomo@google.com>2014-09-04 15:42:36 -0700
commit17c5e79496bc1e2d53bc3c4e33bad4b39b80c36d (patch)
treea81fc3b35a526f01d51b42a7bae6fcfa8f994e1a
parent127343cb460c8d23f9fb59bcf4bcea6e9b9cea03 (diff)
downloadframeworks_base-17c5e79496bc1e2d53bc3c4e33bad4b39b80c36d.zip
frameworks_base-17c5e79496bc1e2d53bc3c4e33bad4b39b80c36d.tar.gz
frameworks_base-17c5e79496bc1e2d53bc3c4e33bad4b39b80c36d.tar.bz2
Keep LMP from breaking KitKat API
- Bug: 17390371 Change-Id: I25c1abebcc42ed24abd57bbe2834a40fb8ee834b
-rw-r--r--api/current.txt2
-rw-r--r--location/java/android/location/SettingInjectorService.java5
2 files changed, 2 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt
index f7c0b97..e48e5d5 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 98c7864..fcd2cde 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