commit 72c7247df3b01c2a0044cfb9bb773cc75ad28307
author Chris Wren <cwren@android.com> Thu Apr 07 17:44:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 07 17:44:10 2016 +0000
tree 582ae8e8bb0f36f9f30f00788506cd91da76ed47
parent 7e3e666f243586c0dc97853ce92bee9e4f4d1d3b
parent 7d59ec824cde9611834aa1383d2cdc8341809e3a

Merge "test out the new disconnect api" into nyc-dev

NotificationListenerSample/src/com/android/example/notificationlistener/Listener.java

diff --git a/NotificationListenerSample/src/com/android/example/notificationlistener/Listener.java b/NotificationListenerSample/src/com/android/example/notificationlistener/Listener.java
index 4f79375..4a65e6a 100644
--- a/NotificationListenerSample/src/com/android/example/notificationlistener/Listener.java
+++ b/NotificationListenerSample/src/com/android/example/notificationlistener/Listener.java
@@ -269,6 +269,11 @@
     }
 
     @Override
+    public void onListenerDisconnected() {
+        Log.w(TAG, "onListenerDisconnected: ");
+    }
+
+    @Override
     public void onNotificationRankingUpdate(RankingMap rankingMap) {
         Log.w(TAG, "onNotificationRankingUpdate");
         Message.obtain(sHandler, MSG_ORDER,

NotificationListenerSample/src/com/android/example/notificationlistener/NotificationListenerActivity.java

diff --git a/NotificationListenerSample/src/com/android/example/notificationlistener/NotificationListenerActivity.java b/NotificationListenerSample/src/com/android/example/notificationlistener/NotificationListenerActivity.java
index bbba935..c5016af 100644
--- a/NotificationListenerSample/src/com/android/example/notificationlistener/NotificationListenerActivity.java
+++ b/NotificationListenerSample/src/com/android/example/notificationlistener/NotificationListenerActivity.java
@@ -244,7 +244,7 @@
             if (child == null) {
                 Notification.Builder builder =
                         Notification.Builder.recoverBuilder(mContext, sbn.getNotification());
-                child = builder.makeContentView().apply(mContext, null);
+                child = builder.createContentView().apply(mContext, null);
             }
             container.setTag(sbn);
             container.removeAllViews();