diff options
author | Marco Nelissen <marcone@google.com> | 2017-07-24 13:35:29 -0700 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2017-07-24 13:36:58 -0700 |
commit | 3eb4baafc0a50097c881a53e8072ace9c776b227 (patch) | |
tree | 2aeb83e39b6c960b70070e9bdf018617b60be43f /cmds/content | |
parent | 5fd324476e56626ebd211b34593fb8356e8b359a (diff) |
Add null check
Bundle returned from ContentProvider.call() may be null, and content
command shouldn't crash because of that.
Test: manual
Change-Id: I4c7e6c2b607b065699b58e6b9bca20e84cdb19ca
Diffstat (limited to 'cmds/content')
-rw-r--r-- | cmds/content/src/com/android/commands/content/Content.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/content/src/com/android/commands/content/Content.java b/cmds/content/src/com/android/commands/content/Content.java index 3687f10f9974..716bc5f24631 100644 --- a/cmds/content/src/com/android/commands/content/Content.java +++ b/cmds/content/src/com/android/commands/content/Content.java @@ -535,7 +535,9 @@ public class Content { @Override public void onExecute(IContentProvider provider) throws Exception { Bundle result = provider.call(null, mMethod, mArg, mExtras); - final int size = result.size(); // unpack + if (result != null) { + result.size(); // unpack + } System.out.println("Result: " + result); } } |