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

am: 72c7247

* commit '72c7247df3b01c2a0044cfb9bb773cc75ad28307':
  test out the new disconnect api

Change-Id: Icdbe716627402d53f97f2b603117736f642e3446

2 files changed, 6 insertions, 1 deletions

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 @@ public class Listener extends NotificationListenerService {
     }
 
     @Override
+    public void onListenerDisconnected() {
+        Log.w(TAG, "onListenerDisconnected: ");
+    }
+
+    @Override
     public void onNotificationRankingUpdate(RankingMap rankingMap) {
         Log.w(TAG, "onNotificationRankingUpdate");
         Message.obtain(sHandler, MSG_ORDER,
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 @@ public class NotificationListenerActivity extends ListActivity {
             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();