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

Commit 44dc173d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add permission check on disabling sensor privacy" into sc-dev am: 6194c49c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c507ee5654edb223b7a913a467905dfc50cb5e6
parents 88f56e47 6194c49c

services/core/java/com/android/server/SensorPrivacyService.java

+5 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server;



import static android.Manifest.permission.MANAGE_SENSOR_PRIVACY;

import static android.app.ActivityManager.RunningServiceInfo;

import static android.app.ActivityManager.RunningTaskInfo;

import static android.app.AppOpsManager.MODE_ALLOWED;
@@ -197,7 +198,8 @@ public final class SensorPrivacyService extends SystemService { 
                                    Intent.EXTRA_USER)).getIdentifier(),

                            intent.getIntExtra(EXTRA_SENSOR, UNKNOWN), false);

                }

            }, new IntentFilter(ACTION_DISABLE_INDIVIDUAL_SENSOR_PRIVACY));

            }, new IntentFilter(ACTION_DISABLE_INDIVIDUAL_SENSOR_PRIVACY),

                    MANAGE_SENSOR_PRIVACY, null);

        }



        @Override
@@ -460,12 +462,12 @@ public final class SensorPrivacyService extends SystemService { 
         */

        private void enforceSensorPrivacyPermission() {

            if (mContext.checkCallingOrSelfPermission(

                    android.Manifest.permission.MANAGE_SENSOR_PRIVACY) == PERMISSION_GRANTED) {

                    MANAGE_SENSOR_PRIVACY) == PERMISSION_GRANTED) {

                return;

            }

            throw new SecurityException(

                    "Changing sensor privacy requires the following permission: "

                            + android.Manifest.permission.MANAGE_SENSOR_PRIVACY);

                            + MANAGE_SENSOR_PRIVACY);

        }



        /**