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

Merge "Skip screenshots when user storage is locked." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-06 20:54:02 +00:00
committed by Android (Google) Code Review
parent d683945251 508b4e6de8
commit e7f14ced54
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java
View File

@@ -23,6 +23,8 @@ import android.os.IBinder;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserManager;
import android.util.Log;
import android.view.WindowManager; import android.view.WindowManager;
public class TakeScreenshotService extends Service { public class TakeScreenshotService extends Service {
@@ -44,6 +46,16 @@ public class TakeScreenshotService extends Service {
} }
} }
}; };
// If the storage for this user is locked, we have no place to store
// the screenshot, so skip taking it instead of showing a misleading
// animation and error notification.
if (!getSystemService(UserManager.class).isUserUnlocked()) {
Log.w(TAG, "Skipping screenshot because storage is locked!");
post(finisher);
return;
}
if (mScreenshot == null) { if (mScreenshot == null) {
mScreenshot = new GlobalScreenshot(TakeScreenshotService.this); mScreenshot = new GlobalScreenshot(TakeScreenshotService.this);
} }