commit 428a15696de6236db66790a9efb2076c8cb057e1
author gitbuildkicker <android-build@google.com> Tue May 02 00:09:13 2017 -0700
committer gitbuildkicker <android-build@google.com> Tue May 02 00:09:13 2017 -0700
tree e0e64659157105f60d37a5c6815fb774e9700cdf
parent b8fbe77a3021811328b6005f0015d8ac9a0a54d3
parent 684850e85bc3ca1dfbf8315fa21c26811bad441a

merge in oc-release history after reset to oc-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index 48bce25..8692412 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,8 +6,9 @@
     guava \
     jsr305 \
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+# Don't build anything, the needed system APIs have been removed.
+#LOCAL_SRC_FILES := $(call all-java-files-under, src)
+#LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := NetworkRecommendation
 LOCAL_CERTIFICATE := platform
@@ -24,4 +25,4 @@
 include $(BUILD_PACKAGE)
 
 # This finds and builds the test apk as well, so a single make does both.
-include $(call all-makefiles-under,$(LOCAL_PATH))
+#include $(call all-makefiles-under,$(LOCAL_PATH))

src/com/android/networkrecommendation/util/NotificationChannelUtil.java

diff --git a/src/com/android/networkrecommendation/util/NotificationChannelUtil.java b/src/com/android/networkrecommendation/util/NotificationChannelUtil.java
index 8be71bd..ebe5ff3 100644
--- a/src/com/android/networkrecommendation/util/NotificationChannelUtil.java
+++ b/src/com/android/networkrecommendation/util/NotificationChannelUtil.java
@@ -64,6 +64,6 @@
 
     /** Wraps Notification.Builder.setChannel. */
     public static Builder setChannel(Builder notificationBuilder, String channelId) {
-        return notificationBuilder.setChannel(channelId);
+        return notificationBuilder.setChannelId(channelId);
     }
 }