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

Merge "Transition SerialManager to @EnforcePermission" am: dd9db63692 am: ada390bead

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946227

Change-Id: I0e5fb34d0a93f0d0ac695d6ba3a46846171b7b70
This commit is contained in:
Thiébaud Weksteen
2022-01-19 00:50:34 +00:00
committed by Automerger Merge Worker
parent 7d7010dcf8 ada390bead
commit ed7e6f6bdf
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/ISerialManager.aidl
View File

@@ -22,8 +22,10 @@ import android.os.ParcelFileDescriptor;
interface ISerialManager interface ISerialManager
{ {
/* Returns a list of all available serial ports */ /* Returns a list of all available serial ports */
@EnforcePermission("SERIAL_PORT")
String[] getSerialPorts(); String[] getSerialPorts();
/* Returns a file descriptor for the serial port. */ /* Returns a file descriptor for the serial port. */
@EnforcePermission("SERIAL_PORT")
ParcelFileDescriptor openSerialPort(String name); ParcelFileDescriptor openSerialPort(String name);
} }

6
services/core/java/com/android/server/SerialService.java
View File

@@ -16,6 +16,7 @@
package com.android.server; package com.android.server;
import android.annotation.EnforcePermission;
import android.content.Context; import android.content.Context;
import android.hardware.ISerialManager; import android.hardware.ISerialManager;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
@@ -34,9 +35,8 @@ public class SerialService extends ISerialManager.Stub {
com.android.internal.R.array.config_serialPorts); com.android.internal.R.array.config_serialPorts);
} }
@EnforcePermission(android.Manifest.permission.SERIAL_PORT)
public String[] getSerialPorts() { public String[] getSerialPorts() {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SERIAL_PORT, null);
ArrayList<String> ports = new ArrayList<String>(); ArrayList<String> ports = new ArrayList<String>();
for (int i = 0; i < mSerialPorts.length; i++) { for (int i = 0; i < mSerialPorts.length; i++) {
String path = mSerialPorts[i]; String path = mSerialPorts[i];
@@ -49,8 +49,8 @@ public class SerialService extends ISerialManager.Stub {
return result; return result;
} }
@EnforcePermission(android.Manifest.permission.SERIAL_PORT)
public ParcelFileDescriptor openSerialPort(String path) { public ParcelFileDescriptor openSerialPort(String path) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SERIAL_PORT, null);
for (int i = 0; i < mSerialPorts.length; i++) { for (int i = 0; i < mSerialPorts.length; i++) {
if (mSerialPorts[i].equals(path)) { if (mSerialPorts[i].equals(path)) {
return native_open(path); return native_open(path);