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

Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2015-06-30 00:24:34 +00:00
committed by Android (Google) Code Review
parent a03b18c6c2 a133f0b522
commit 825c2a006e
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Settings.java
View File

@@ -5443,6 +5443,14 @@ public final class Settings {
*/
public static final String ASSIST_STRUCTURE_ENABLED = "assist_structure_enabled";
/**
* Specifies whether a screenshot of the screen contents will be sent to the assist
* application (active voice interaction service).
*
* @hide
*/
public static final String ASSIST_SCREENSHOT_ENABLED = "assist_screenshot_enabled";
/**
* Names of the service components that the current user has explicitly allowed to
* see all of the user's notifications, separated by ':'.

11
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
View File

@@ -198,8 +198,11 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
isScreenCaptureAllowed = mAm.isScreenCaptureAllowedOnCurrentActivity();
} catch (RemoteException e) {
}
boolean allDataEnabled = (Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1, mUser) != 0)
boolean structureEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1, mUser) != 0
&& isScreenCaptureAllowed;
boolean screenshotEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1, mUser) != 0
&& isScreenCaptureAllowed;
mShowArgs = args;
mShowFlags = flags;
@@ -208,7 +211,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
if ((flags& VoiceInteractionSession.SHOW_WITH_ASSIST) != 0) {
if (mAppOps.noteOpNoThrow(AppOpsManager.OP_ASSIST_STRUCTURE, mCallingUid,
mSessionComponentName.getPackageName()) == AppOpsManager.MODE_ALLOWED
&& allDataEnabled) {
&& structureEnabled) {
try {
needDisclosure = true;
mAm.requestAssistContextExtras(ActivityManager.ASSIST_CONTEXT_FULL,
@@ -226,7 +229,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
if ((flags& VoiceInteractionSession.SHOW_WITH_SCREENSHOT) != 0) {
if (mAppOps.noteOpNoThrow(AppOpsManager.OP_ASSIST_SCREENSHOT, mCallingUid,
mSessionComponentName.getPackageName()) == AppOpsManager.MODE_ALLOWED
&& allDataEnabled) {
&& screenshotEnabled) {
try {
needDisclosure = true;
mIWindowManager.requestAssistScreenshot(mScreenshotReceiver);