Merge "Enable SETTINGS_API_V2" into sc-dev

This commit is contained in:
Winson Chiu
2021-03-29 18:44:51 +00:00
committed by Android (Google) Code Review

View File

@@ -24,7 +24,6 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.Disabled;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.IntentFilterVerificationInfo; import android.content.pm.IntentFilterVerificationInfo;
@@ -92,7 +91,6 @@ public class DomainVerificationService extends SystemService
* commands. * commands.
*/ */
@ChangeId @ChangeId
@Disabled
private static final long SETTINGS_API_V2 = 178111421; private static final long SETTINGS_API_V2 = 178111421;
/** /**