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

Commit ea6590b2 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Automerger Merge Worker
Browse files

Merge "Add @CurrentTimeMillisLong annotation to getLastModifiedTimeMillis"... 

Merge "Add @CurrentTimeMillisLong annotation to getLastModifiedTimeMillis" into sc-dev am: fb19bcc0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27e60110803645cead1e6a1e3901b3bc237f790f
parents e02478da fb19bcc0

core/java/android/text/FontConfig.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.text; 


import static java.lang.annotation.RetentionPolicy.SOURCE;



import android.annotation.CurrentTimeMillisLong;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;
@@ -101,7 +102,7 @@ public final class FontConfig implements Parcelable { 
     *

     * If there is no update, this return 0.

     */

    public long getLastModifiedTimeMillis() {

    public @CurrentTimeMillisLong long getLastModifiedTimeMillis() {

        return mLastModifiedTimeMillis;

    }