summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe LaPenna <jlapenna@google.com> 2016-12-19 21:01:26 +0000
committer android-build-merger <android-build-merger@google.com> 2016-12-19 21:01:26 +0000
commit8df12d98f7b27a9949e09880b4546b322005cda3 (patch)
tree1986f813447dd27d8102a8a6387694a4454ae897
parent1876d8245018c1a1d32eddf27b3e4edadaa8cbbd (diff)
parentb60d7b334c04fc66ca0405759252d9607c650558 (diff)
Merge "Remove "final" from ResultCallback."
am: b60d7b334c Change-Id: I3b6679368418af3992007f58d47c544cf7a1b1ed
-rw-r--r--api/system-current.txt2
-rw-r--r--core/java/android/net/NetworkRecommendationProvider.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 92553067447e..2327128b7c8f 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -25669,7 +25669,7 @@ package android.net {
field public static final java.lang.String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE";
}
- public static final class NetworkRecommendationProvider.ResultCallback {
+ public static class NetworkRecommendationProvider.ResultCallback {
method public void onResult(android.net.RecommendationResult);
}
diff --git a/core/java/android/net/NetworkRecommendationProvider.java b/core/java/android/net/NetworkRecommendationProvider.java
index af5a052c6bf7..16ae867d81e7 100644
--- a/core/java/android/net/NetworkRecommendationProvider.java
+++ b/core/java/android/net/NetworkRecommendationProvider.java
@@ -75,7 +75,7 @@ public abstract class NetworkRecommendationProvider {
* A callback implementing applications should invoke when a {@link RecommendationResult}
* is available.
*/
- public static final class ResultCallback {
+ public static class ResultCallback {
private final IRemoteCallback mCallback;
private final int mSequence;
private final AtomicBoolean mCallbackRun;