summaryrefslogtreecommitdiffstats
path: root/location
diff options
context:
space:
mode:
authorTom O'Neill <tomo@google.com>2014-09-04 22:56:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-04 22:56:58 +0000
commit649db7f0a5b1a2add3f68ace9d7896a76340ff78 (patch)
treea4109e9ec77cb73dceb62aa8a05228cfe6576c3f /location
parent8b9c97a4e27364750d4ca72ec724596c5bc93d32 (diff)
parent17c5e79496bc1e2d53bc3c4e33bad4b39b80c36d (diff)
downloadframeworks_base-649db7f0a5b1a2add3f68ace9d7896a76340ff78.zip
frameworks_base-649db7f0a5b1a2add3f68ace9d7896a76340ff78.tar.gz
frameworks_base-649db7f0a5b1a2add3f68ace9d7896a76340ff78.tar.bz2
Merge "Keep LMP from breaking KitKat API" into lmp-dev
Diffstat (limited to 'location')
-rw-r--r--location/java/android/location/SettingInjectorService.java5
1 files changed, 1 insertions, 4 deletions
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