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

Commit e52f1971 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3c am:... 

Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3c am: 08c51b04 am: d312550f am: f23caaca

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

Change-Id: I4ecebf6cc2c8c0eb69aa14164a19426947470eb8
parents ae17bc52 f23caaca

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -32485,6 +32485,7 @@ package android.os { 
















  public final class SystemClock {







  public final class SystemClock {











    method @NonNull public static java.time.Clock currentGnssTimeClock();







    method @NonNull public static java.time.Clock currentGnssTimeClock();














    method @NonNull public static java.time.Clock currentNetworkTimeClock();











    method public static long currentThreadTimeMillis();







    method public static long currentThreadTimeMillis();











    method public static long elapsedRealtime();







    method public static long elapsedRealtime();











    method public static long elapsedRealtimeNanos();







    method public static long elapsedRealtimeNanos();

























core/api/module-lib-current.txt



+41
−0




























Original line number
Original line
Diff line number
Diff line








@@ -258,6 +258,43 @@ package android.net {









    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStateSnapshot> CREATOR;







    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStateSnapshot> CREATOR;











  }







  }


































  public final class NetworkTemplate implements android.os.Parcelable {














    method public int describeContents();














    method public int getDefaultNetworkStatus();














    method public int getMatchRule();














    method public int getMeteredness();














    method public int getOemManaged();














    method public int getRatType();














    method public int getRoaming();














    method @NonNull public java.util.Set<java.lang.String> getSubscriberIds();














    method @NonNull public java.util.Set<java.lang.String> getWifiNetworkKeys();














    method public void writeToParcel(@NonNull android.os.Parcel, int);














    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkTemplate> CREATOR;














    field public static final int MATCH_BLUETOOTH = 8; // 0x8














    field public static final int MATCH_CARRIER = 10; // 0xa














    field public static final int MATCH_ETHERNET = 5; // 0x5














    field public static final int MATCH_MOBILE = 1; // 0x1














    field public static final int MATCH_WIFI = 4; // 0x4














    field public static final int NETWORK_TYPE_ALL = -1; // 0xffffffff














    field public static final int OEM_MANAGED_ALL = -1; // 0xffffffff














    field public static final int OEM_MANAGED_NO = 0; // 0x0














    field public static final int OEM_MANAGED_PAID = 1; // 0x1














    field public static final int OEM_MANAGED_PRIVATE = 2; // 0x2














    field public static final int OEM_MANAGED_YES = -2; // 0xfffffffe














  }





























  public static final class NetworkTemplate.Builder {














    ctor public NetworkTemplate.Builder(int);














    method @NonNull public android.net.NetworkTemplate build();














    method @NonNull public android.net.NetworkTemplate.Builder setDefaultNetworkStatus(int);














    method @NonNull public android.net.NetworkTemplate.Builder setMeteredness(int);














    method @NonNull public android.net.NetworkTemplate.Builder setOemManaged(int);














    method @NonNull public android.net.NetworkTemplate.Builder setRatType(int);














    method @NonNull public android.net.NetworkTemplate.Builder setRoaming(int);














    method @NonNull public android.net.NetworkTemplate.Builder setSubscriberIds(@NonNull java.util.Set<java.lang.String>);














    method @NonNull public android.net.NetworkTemplate.Builder setWifiNetworkKeys(@NonNull java.util.Set<java.lang.String>);














  }


























  public class NetworkWatchlistManager {







  public class NetworkWatchlistManager {











    method @Nullable public byte[] getWatchlistConfigHash();







    method @Nullable public byte[] getWatchlistConfigHash();











  }







  }










@@ -342,6 +379,10 @@ package android.os {









    method @Nullable public android.os.IBinder getOrThrow() throws android.os.StatsServiceManager.ServiceNotFoundException;







    method @Nullable public android.os.IBinder getOrThrow() throws android.os.StatsServiceManager.ServiceNotFoundException;











  }







  }


































  public final class StrictMode {














    method public static void noteUntaggedSocket();














  }


























  public class SystemConfigManager {







  public class SystemConfigManager {











    method @NonNull public java.util.List<android.content.ComponentName> getEnabledComponentOverrides(@NonNull String);







    method @NonNull public java.util.List<android.content.ComponentName> getEnabledComponentOverrides(@NonNull String);











  }







  }

































core/api/system-current.txt



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -8092,13 +8092,17 @@ package android.net {









    method @NonNull public android.net.NetworkStats subtract(@NonNull android.net.NetworkStats);







    method @NonNull public android.net.NetworkStats subtract(@NonNull android.net.NetworkStats);











    method public void writeToParcel(@NonNull android.os.Parcel, int);







    method public void writeToParcel(@NonNull android.os.Parcel, int);











    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStats> CREATOR;







    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStats> CREATOR;














    field public static final int DEFAULT_NETWORK_ALL = -1; // 0xffffffff











    field public static final int DEFAULT_NETWORK_NO = 0; // 0x0







    field public static final int DEFAULT_NETWORK_NO = 0; // 0x0











    field public static final int DEFAULT_NETWORK_YES = 1; // 0x1







    field public static final int DEFAULT_NETWORK_YES = 1; // 0x1











    field public static final String IFACE_VT = "vt_data0";







    field public static final String IFACE_VT = "vt_data0";














    field public static final int METERED_ALL = -1; // 0xffffffff











    field public static final int METERED_NO = 0; // 0x0







    field public static final int METERED_NO = 0; // 0x0











    field public static final int METERED_YES = 1; // 0x1







    field public static final int METERED_YES = 1; // 0x1














    field public static final int ROAMING_ALL = -1; // 0xffffffff











    field public static final int ROAMING_NO = 0; // 0x0







    field public static final int ROAMING_NO = 0; // 0x0











    field public static final int ROAMING_YES = 1; // 0x1







    field public static final int ROAMING_YES = 1; // 0x1














    field public static final int SET_ALL = -1; // 0xffffffff











    field public static final int SET_DEFAULT = 0; // 0x0







    field public static final int SET_DEFAULT = 0; // 0x0











    field public static final int SET_FOREGROUND = 1; // 0x1







    field public static final int SET_FOREGROUND = 1; // 0x1











    field public static final int TAG_NONE = 0; // 0x0







    field public static final int TAG_NONE = 0; // 0x0

























core/java/android/net/NetworkPolicy.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -339,7 +339,8 @@ public class NetworkPolicy implements Parcelable, Comparable<NetworkPolicy> {





























        out.writeInt(template.getMatchRule());







        out.writeInt(template.getMatchRule());











        BackupUtils.writeString(out, template.getSubscriberIds().iterator().next());







        BackupUtils.writeString(out, template.getSubscriberIds().iterator().next());











        BackupUtils.writeString(out, template.getWifiNetworkKey());







        BackupUtils.writeString(out, template.getWifiNetworkKeys().isEmpty()














                ? null : template.getWifiNetworkKeys().iterator().next());











        out.writeInt(template.getMeteredness());







        out.writeInt(template.getMeteredness());































        return baos.toByteArray();







        return baos.toByteArray();

































core/java/android/os/StrictMode.java



+9
−0




























Original line number
Original line
Diff line number
Diff line








@@ -15,10 +15,13 @@









 */







 */











package android.os;







package android.os;


































import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;


























import android.animation.ValueAnimator;







import android.animation.ValueAnimator;











import android.annotation.IntDef;







import android.annotation.IntDef;











import android.annotation.NonNull;







import android.annotation.NonNull;











import android.annotation.Nullable;







import android.annotation.Nullable;














import android.annotation.SystemApi;











import android.annotation.TestApi;







import android.annotation.TestApi;











import android.app.ActivityManager;







import android.app.ActivityManager;











import android.app.ActivityThread;







import android.app.ActivityThread;










@@ -2690,6 +2693,12 @@ public final class StrictMode {









        ((AndroidBlockGuardPolicy) policy).onCustomSlowCall(name);







        ((AndroidBlockGuardPolicy) policy).onCustomSlowCall(name);











    }







    }


































    /** @hide */














    @SystemApi(client = MODULE_LIBRARIES)














    public static void noteUntaggedSocket() {














        if (vmUntaggedSocketEnabled()) onUntaggedSocket();














    }


























    /**







    /**











     * For code to note that a resource was obtained using a type other than its defined type. This







     * For code to note that a resource was obtained using a type other than its defined type. This











     * is a no-op unless the current thread's {@link android.os.StrictMode.ThreadPolicy} has {@link







     * is a no-op unless the current thread's {@link android.os.StrictMode.ThreadPolicy} has {@link