Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b294eac0 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev

parents 30a87547 337abb3b

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -8398,6 +8398,10 @@ public final class ActivityManagerService extends ActivityManagerNative 














    @Override















    public Bitmap getTaskDescriptionIcon(String filename) {













        if (!FileUtils.isValidExtFilename(filename)













                || !filename.contains(ActivityRecord.ACTIVITY_ICON_SUFFIX)) {













            throw new IllegalArgumentException("Bad filename: " + filename);













        }















        return mTaskPersister.getTaskDescriptionIcon(filename);















    }















































services/core/java/com/android/server/am/ActivityRecord.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -79,7 +79,7 @@ final class ActivityRecord {













    private static final String ATTR_LAUNCHEDFROMPACKAGE = "launched_from_package";















    private static final String ATTR_RESOLVEDTYPE = "resolved_type";















    private static final String ATTR_COMPONENTSPECIFIED = "component_specified";













    private static final String ACTIVITY_ICON_SUFFIX = "_activity_icon_";













    static final String ACTIVITY_ICON_SUFFIX = "_activity_icon_";































    final ActivityManagerService service; // owner















    final IApplicationToken.Stub appToken; // window manager token