Merge "Use elapsedRealtimeClock as time source for RateEstimator in NM" into main (180ea311) · Commits · e / os / android_frameworks_base

core/java/android/app/NotificationManager.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import android.os.Parcelable;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.StrictMode;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.provider.Settings.Global;
		@@ -677,9 +678,14 @@ public class NotificationManager {
		}

		/** {@hide} */
		@UnsupportedAppUsage
		public NotificationManager(Context context, InstantSource clock)
		public NotificationManager(Context context)
		{
		this(context, SystemClock.elapsedRealtimeClock());
		}

		/** {@hide} */
		@UnsupportedAppUsage
		public NotificationManager(Context context, InstantSource clock) {
		mContext = context;
		mClock = clock;
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -289,7 +289,6 @@ import com.android.internal.os.IDropBoxManagerService;
		import com.android.internal.policy.PhoneLayoutInflater;
		import com.android.internal.util.Preconditions;

		import java.time.InstantSource;
		import java.util.Map;
		import java.util.Objects;

		@@ -625,8 +624,8 @@ public final class SystemServiceRegistry {
		com.android.internal.R.style.Theme_Dialog,
		com.android.internal.R.style.Theme_Holo_Dialog,
		com.android.internal.R.style.Theme_DeviceDefault_Dialog,
		com.android.internal.R.style.Theme_DeviceDefault_Light_Dialog)),
		InstantSource.system());
		com.android.internal.R.style.Theme_DeviceDefault_Light_Dialog))
		);
		}});

		registerService(Context.PEOPLE_SERVICE, PeopleManager.class,