Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in ClipboarService.

Browse Source 
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
This commit is contained in:
Sudheer Shanka
2017-02-09 13:09:15 -08:00
parent 5d99e14ca9
commit fe4d1e87ab
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/clipboard/ClipboardService.java
View File

@@ -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();