From fe4d1e87ab4d0ae4649f3a127804c4f66d7ef8ab Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Thu, 9 Feb 2017 13:09:15 -0800
Subject: [PATCH] Fix NPE in ClipboarService.

Check if primaryClip is null or not before trying to set the timestamp.

Fixes: 35144954
Test: cts-tradefed run singleCommand cts-dev --module -t \
      com.android.cts.devicepolicy.ManagedProfileTest#testCrossProfileCopyPaste

Change-Id: If322626553f42dda56a42adc2c6e4d206715a673
---
 .../com/android/server/clipboard/ClipboardService.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index 4487d5b9b28e5..94417b531c712 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -404,9 +404,11 @@ public class ClipboardService extends SystemService {
             return;
         }
         clipboard.primaryClip = clip;
-        final ClipDescription description = clipboard.primaryClip.getDescription();
-        if (description != null) {
-            description.setTimestamp(SystemClock.elapsedRealtime());
+        if (clip != null) {
+            final ClipDescription description = clip.getDescription();
+            if (description != null) {
+                description.setTimestamp(SystemClock.elapsedRealtime());
+            }
         }
         final long ident = Binder.clearCallingIdentity();
         final int n = clipboard.primaryClipListeners.beginBroadcast();