commit 649db7f0a5b1a2add3f68ace9d7896a76340ff78
author Tom O'Neill <tomo@google.com> Thu Sep 04 22:56:57 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 22:56:58 2014 +0000
tree a4109e9ec77cb73dceb62aa8a05228cfe6576c3f
parent 8b9c97a4e27364750d4ca72ec724596c5bc93d32
parent 17c5e79496bc1e2d53bc3c4e33bad4b39b80c36d

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

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 7e2b0ed..f479430 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14015,7 +14015,7 @@
     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

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 @@
      * @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