Merge "Enable SETTINGS_API_V2" into sc-dev am: 0906f735dc

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

Change-Id: I4c8b388fe0d81e2d5a91fc5220cb40c25cd60814
This commit is contained in:
Winson Chiu
2021-03-29 19:04:44 +00:00
committed by Automerger Merge Worker

View File

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