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

Merge "Add permission check on disabling sensor privacy" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-22 18:03:11 +00:00
committed by Android (Google) Code Review
parent 92e23aa512 48f98c54c4
commit 6194c49caf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/SensorPrivacyService.java
View File

@@ -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);
}
/**