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

Commit a8a1877e authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 9788eb83: am 778dccb8: am 825c2a00: Merge "Add setting to disable... 

am 9788eb83: am 778dccb8: am 825c2a00: Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev

* commit '9788eb83':
  Add setting to disable screenshot separately (1/2)
parents 8c70606a 9788eb83

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -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 ':'.

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java

+7 −4
Original line number Diff line number Diff line
@@ -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);