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

[CDM] Explicitly annotate secure transport disabling API as @TestApi

Browse Source 
Bug: 281582104
Test: atest CtsCompanionDeviceManagerUiAutomationTestCases:SystemDataTransferTest
Test: atest CompanionTests:SystemDataTransportTest
Change-Id: If8fc682c9e93f1c719b6bc1e29312eb13f67ebfd
This commit is contained in:
Raphael Kim
2023-05-23 09:03:05 -07:00
parent c013b4b136
commit a18f96782d
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/test-current.txt
View File

@@ -837,6 +837,10 @@ package android.appwidget {
package android.companion {
public final class CompanionDeviceManager {
method @RequiresPermission("android.permission.MANAGE_COMPANION_DEVICES") public void enableSecureTransport(boolean);
}
public abstract class CompanionDeviceService extends android.app.Service {
method public void onBindCompanionDeviceService(@NonNull android.content.Intent);
}

4
core/java/android/companion/CompanionDeviceManager.java
View File

@@ -28,6 +28,7 @@ import android.annotation.RequiresPermission;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.TestApi;
import android.annotation.UserHandleAware;
import android.app.Activity;
import android.app.ActivityManager;
@@ -1308,12 +1309,13 @@ public final class CompanionDeviceManager {
}
/**
* Enable or disable secure transport for testing. Defaults to enabled.
* Enables or disables secure transport for testing. Defaults to being enabled.
* Should not be used outside of testing.
*
* @param enabled true to enable. false to disable.
* @hide
*/
@TestApi
@RequiresPermission(android.Manifest.permission.MANAGE_COMPANION_DEVICES)
public void enableSecureTransport(boolean enabled) {
try {

1
core/java/android/companion/ICompanionDeviceManager.aidl
View File

@@ -108,5 +108,6 @@ interface ICompanionDeviceManager {
void disableSystemDataSync(int associationId, int flags);
@EnforcePermission("MANAGE_COMPANION_DEVICES")
void enableSecureTransport(boolean enabled);
}

2
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -815,7 +815,9 @@ public class CompanionDeviceManagerService extends SystemService {
}
@Override
@EnforcePermission(MANAGE_COMPANION_DEVICES)
public void enableSecureTransport(boolean enabled) {
enableSecureTransport_enforcePermission();
mTransportManager.enableSecureTransport(enabled);
}