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

Commit cb7f6ffe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add COMP->COPE migration test into presubmit."

parents fba650ea cd38eba7

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −2
Original line number Diff line number Diff line
@@ -2291,6 +2291,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                    context, requestCode, intent, flags, options, user);

        }













        PendingIntent pendingIntentGetBroadcast(













                Context context, int requestCode, Intent intent, int flags) {













            return PendingIntent.getBroadcast(context, requestCode, intent, flags);













        }



























        void registerContentObserver(Uri uri, boolean notifyForDescendents,















                ContentObserver observer, int userHandle) {















            mContext.getContentResolver().registerContentObserver(uri, notifyForDescendents,










@@ -15645,8 +15650,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {



























    private void updateProfileOffAlarm(long profileOffDeadline) {















        final AlarmManager am = mInjector.getAlarmManager();













        final PendingIntent pi = PendingIntent.getBroadcast(mContext, REQUEST_PROFILE_OFF_DEADLINE,













                new Intent(ACTION_PROFILE_OFF_DEADLINE),













        final PendingIntent pi = mInjector.pendingIntentGetBroadcast(













                mContext, REQUEST_PROFILE_OFF_DEADLINE, new Intent(ACTION_PROFILE_OFF_DEADLINE),















                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);















        am.cancel(pi);















        if (profileOffDeadline != 0) {

























services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java



+8
−1




























Original line number
Diff line number
Diff line








@@ -31,8 +31,11 @@ import android.content.pm.PackageManager;













import android.os.Bundle;















import android.os.UserHandle;















import android.os.UserManager;













import android.platform.test.annotations.Presubmit;















import android.provider.Settings;





























import androidx.test.filters.SmallTest;





























import com.android.frameworks.servicestests.R;















import com.android.server.LocalServices;















import com.android.server.SystemService;









@@ -43,7 +46,7 @@ import java.util.HashMap;













import java.util.Map;















import java.util.Set;





























// TODO (b/143516163): Fix old test cases and put into presubmit.













// TODO (b/149818286): Fix old test cases and put the whole test into presubmit.















public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase {































    private static final String USER_TYPE_EMPTY = "";










@@ -343,6 +346,8 @@ public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase {













        assertTrue(alreadySet.contains(UserManager.DISALLOW_BLUETOOTH_SHARING));















    }





























    @Presubmit













    @SmallTest















    public void testCompMigrationUnAffiliated_skipped() throws Exception {















        prepareAdmin1AsDo();















        prepareAdminAnotherPackageAsPo(COPE_PROFILE_USER_ID);









@@ -354,6 +359,8 @@ public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase {













        assertTrue(dpms.mOwners.hasDeviceOwner());















    }





























    @Presubmit













    @SmallTest















    public void testCompMigrationAffiliated() throws Exception {















        prepareAdmin1AsDo();















        prepareAdmin1AsPo(COPE_PROFILE_USER_ID);

































services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -368,6 +368,12 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi













            return null;















        }





























        @Override













        PendingIntent pendingIntentGetBroadcast(Context context, int requestCode,













                Intent intent, int flags) {













            return null;













        }





























        @Override















        void registerContentObserver(Uri uri, boolean notifyForDescendents,















                ContentObserver observer, int userHandle) {