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

Merge "Guard against null bitmap path" into nyc-dev

Browse Source 
am: a871c3104b

* commit 'a871c3104b6ae77eeee2b8d8bdb3371a0788c9a8':
  Guard against null bitmap path
This commit is contained in:
Makoto Onuki
2016-03-10 22:40:24 +00:00
committed by android-build-merger
parent 3283e02a45 a871c3104b
commit 9756ed95ec
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/pm/ShortcutService.java
View File

@@ -1436,16 +1436,20 @@ public class ShortcutService extends IShortcutService.Stub {
@Override @Override
public ParcelFileDescriptor getShortcutIconFd(@NonNull String callingPackage, public ParcelFileDescriptor getShortcutIconFd(@NonNull String callingPackage,
@NonNull ShortcutInfo shortcut, int userId) { @NonNull ShortcutInfo shortcutIn, int userId) {
Preconditions.checkNotNull(shortcut, "shortcut"); Preconditions.checkNotNull(shortcutIn, "shortcut");
synchronized (mLock) { synchronized (mLock) {
final ShortcutInfo shortcutInfo = getPackageShortcutsLocked( final ShortcutInfo shortcutInfo = getPackageShortcutsLocked(
shortcut.getPackageName(), userId).findShortcutById(shortcut.getId()); shortcutIn.getPackageName(), userId).findShortcutById(shortcutIn.getId());
if (shortcutInfo == null || !shortcutInfo.hasIconFile()) { if (shortcutInfo == null || !shortcutInfo.hasIconFile()) {
return null; return null;
} }
try { try {
if (shortcutInfo.getBitmapPath() == null) {
Slog.w(TAG, "null bitmap detected in getShortcutIconFd()");
return null;
}
return ParcelFileDescriptor.open( return ParcelFileDescriptor.open(
new File(shortcutInfo.getBitmapPath()), new File(shortcutInfo.getBitmapPath()),
ParcelFileDescriptor.MODE_READ_ONLY); ParcelFileDescriptor.MODE_READ_ONLY);
@@ -1977,7 +1981,7 @@ class PackageShortcuts {
final ShortcutInfo si = shortcuts.valueAt(i); final ShortcutInfo si = shortcuts.valueAt(i);
pw.print(" "); pw.print(" ");
pw.println(si.toInsecureString()); pw.println(si.toInsecureString());
if (si.hasIconFile()) { if (si.getBitmapPath() != null) {
final long len = new File(si.getBitmapPath()).length(); final long len = new File(si.getBitmapPath()).length();
pw.print(" "); pw.print(" ");
pw.print("bitmap size="); pw.print("bitmap size=");