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

Commit ee9fc2ba authored by Raphael Kim's avatar Raphael Kim Committed by Automerger Merge Worker
Browse files

Merge "[CDM] Gate hidden test API behind a permission" into udc-dev am:... 

Merge "[CDM] Gate hidden test API behind a permission" into udc-dev am: f60a0fe0 am: 1720e6c9 am: 91e1d8c9

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



Change-Id: If2c3a63536ae3204308cd83ca68692faa2c233a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e351a8db 91e1d8c9

core/java/android/companion/CompanionDeviceManager.java

+2 −0
Original line number Diff line number Diff line
@@ -1331,10 +1331,12 @@ public final class CompanionDeviceManager { 


    /**

     * Enable or disable secure transport for testing. Defaults to enabled.

     * Should not be used outside of testing.

     *

     * @param enabled true to enable. false to disable.

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_COMPANION_DEVICES)

    public void enableSecureTransport(boolean enabled) {

        try {

            mService.enableSecureTransport(enabled);