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

Commit 3c5e88c3 authored by Wang Han's avatar Wang Han Committed by Bruno Martins
Browse files

SystemUI: Don't append app name to file on lockscreen 

When device is locked, current implementation will append the current
app name to file when taking screenshot. This causes information leaks.

To prevent this, we check for isKeyGuardLocked() and fall back not to
append the app name when taking screenshot on lockscreen.

Change-Id: I04498faf51986e1a3723a32befd97d29e1f3fe58
parent 55748a40

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.animation.ValueAnimator.AnimatorUpdateListener; 
import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.admin.DevicePolicyManager;

import android.app.KeyguardManager;

import android.app.Notification;

import android.app.Notification.BigPictureStyle;

import android.app.NotificationManager;
@@ -163,7 +164,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
        mImageTime = System.currentTimeMillis();

        String imageDate = new SimpleDateFormat("yyyyMMdd-HHmmss").format(new Date(mImageTime));

        CharSequence appName = getRunningActivityName(context);

        if (appName != null) {

        boolean onKeyguard = context.getSystemService(KeyguardManager.class).isKeyguardLocked();

        if (!onKeyguard && appName != null) {

            // Replace all spaces and special chars with an underscore

            String appNameString = appName.toString().replaceAll("[\\\\/:*?\"<>|\\s]+", "_");

            mImageFileName = String.format(SCREENSHOT_FILE_NAME_TEMPLATE_APPNAME,