diff options
| author | 2022-01-19 01:16:02 +0000 | |
|---|---|---|
| committer | 2022-01-19 01:16:02 +0000 | |
| commit | 1acb7b93ddbfbca909a3f7ec7aee72df10a94b51 (patch) | |
| tree | 93acb0b7c081502d990b74a2e7746fca8b56587b | |
| parent | 1c632f80e870bf78f5dedb79233f7c338f97b12d (diff) | |
| parent | a233ce9dc7951fedab856e77725fe7a2b11e6af6 (diff) | |
Merge "Transition SerialManager to @EnforcePermission" am: dd9db63692 am: ada390bead am: ed7e6f6bdf am: a233ce9dc7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946227
Change-Id: Iac629eab14a50b09549b92386aa6ca3265c75c3e
| -rw-r--r-- | core/java/android/hardware/ISerialManager.aidl | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/SerialService.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/hardware/ISerialManager.aidl b/core/java/android/hardware/ISerialManager.aidl index 74d30f7afefe..65a0fa4f893e 100644 --- a/core/java/android/hardware/ISerialManager.aidl +++ b/core/java/android/hardware/ISerialManager.aidl @@ -22,8 +22,10 @@ import android.os.ParcelFileDescriptor; interface ISerialManager { /* Returns a list of all available serial ports */ + @EnforcePermission("SERIAL_PORT") String[] getSerialPorts(); /* Returns a file descriptor for the serial port. */ + @EnforcePermission("SERIAL_PORT") ParcelFileDescriptor openSerialPort(String name); } diff --git a/services/core/java/com/android/server/SerialService.java b/services/core/java/com/android/server/SerialService.java index 1abe4588261a..e915fa1522a1 100644 --- a/services/core/java/com/android/server/SerialService.java +++ b/services/core/java/com/android/server/SerialService.java @@ -16,6 +16,7 @@ package com.android.server; +import android.annotation.EnforcePermission; import android.content.Context; import android.hardware.ISerialManager; import android.os.ParcelFileDescriptor; @@ -34,9 +35,8 @@ public class SerialService extends ISerialManager.Stub { com.android.internal.R.array.config_serialPorts); } + @EnforcePermission(android.Manifest.permission.SERIAL_PORT) public String[] getSerialPorts() { - mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SERIAL_PORT, null); - ArrayList<String> ports = new ArrayList<String>(); for (int i = 0; i < mSerialPorts.length; i++) { String path = mSerialPorts[i]; @@ -49,8 +49,8 @@ public class SerialService extends ISerialManager.Stub { return result; } + @EnforcePermission(android.Manifest.permission.SERIAL_PORT) public ParcelFileDescriptor openSerialPort(String path) { - mContext.enforceCallingOrSelfPermission(android.Manifest.permission.SERIAL_PORT, null); for (int i = 0; i < mSerialPorts.length; i++) { if (mSerialPorts[i].equals(path)) { return native_open(path); |