From 7a7d1ac87d16a28726c4e0d34b5ea553be41eea8 Mon Sep 17 00:00:00 2001 From: Kholoud Mohamed Date: Fri, 19 Apr 2024 09:35:36 +0000 Subject: [PATCH] Fix DO check on headless devices Bug: 289515470 Test: btest a.d.c.PreferentialNetworkServiceTest Merged-In: Id93322caca55e122339701e4c69b4ded57b8f6cc Change-Id: Id93322caca55e122339701e4c69b4ded57b8f6cc --- service/src/com/android/server/ConnectivityService.java | 4 ++-- .../java/com/android/server/ConnectivityServiceTest.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index a15a2bf412..7195d64c12 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -12733,8 +12733,8 @@ public class ConnectivityService extends IConnectivityManager.Stub if (um.isManagedProfile(profile.getIdentifier())) { return true; } - if (mDeps.isAtLeastT() && dpm.getDeviceOwner() != null) return true; - return false; + + return mDeps.isAtLeastT() && dpm.getDeviceOwnerComponentOnAnyUser() != null; } /** diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index ce495335b5..ca4b8a032a 100755 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -799,8 +799,10 @@ public class ConnectivityServiceTest { // This relies on all contexts for a given user returning the same UM mock final DevicePolicyManager dpmMock = createContextAsUser(userHandle, 0 /* flags */) .getSystemService(DevicePolicyManager.class); - doReturn(value).when(dpmMock).getDeviceOwner(); - doReturn(value).when(mDevicePolicyManager).getDeviceOwner(); + ComponentName componentName = value == null + ? null : new ComponentName(value, "deviceOwnerClass"); + doReturn(componentName).when(dpmMock).getDeviceOwnerComponentOnAnyUser(); + doReturn(componentName).when(mDevicePolicyManager).getDeviceOwnerComponentOnAnyUser(); } @Override