Merge "Make FGS_BG_START_RESTRICTION_CHANGE_ID @Overridable" into sc-dev am: 389475e436

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

Change-Id: I96ae72d2bb80dc2f63d86a7ad7f66baf6fe433a6
This commit is contained in:
Makoto Onuki
2021-08-03 21:10:55 +00:00
committed by Automerger Merge Worker

View File

@@ -102,6 +102,7 @@ import android.app.usage.UsageEvents;
import android.appwidget.AppWidgetManagerInternal; import android.appwidget.AppWidgetManagerInternal;
import android.compat.annotation.ChangeId; import android.compat.annotation.ChangeId;
import android.compat.annotation.EnabledSince; import android.compat.annotation.EnabledSince;
import android.compat.annotation.Overridable;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ComponentName.WithComponentName; import android.content.ComponentName.WithComponentName;
import android.content.Context; import android.content.Context;
@@ -307,6 +308,7 @@ public final class ActiveServices {
*/ */
@ChangeId @ChangeId
@EnabledSince(targetSdkVersion = android.os.Build.VERSION_CODES.S) @EnabledSince(targetSdkVersion = android.os.Build.VERSION_CODES.S)
@Overridable
static final long FGS_BG_START_RESTRICTION_CHANGE_ID = 170668199L; static final long FGS_BG_START_RESTRICTION_CHANGE_ID = 170668199L;
/** /**