diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkPolicy.java | 3 | ||||
| -rw-r--r-- | core/java/android/os/StrictMode.java | 9 | ||||
| -rw-r--r-- | core/java/android/os/SystemClock.java | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkPolicy.java b/core/java/android/net/NetworkPolicy.java index f4b427959f11..596f4317dce3 100644 --- a/core/java/android/net/NetworkPolicy.java +++ b/core/java/android/net/NetworkPolicy.java @@ -339,7 +339,8 @@ public class NetworkPolicy implements Parcelable, Comparable<NetworkPolicy> { out.writeInt(template.getMatchRule()); 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()); return baos.toByteArray(); diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index dbb5a2c5af63..70aaa5e52c44 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -15,10 +15,13 @@ */ package android.os; +import static android.annotation.SystemApi.Client.MODULE_LIBRARIES; + import android.animation.ValueAnimator; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SystemApi; import android.annotation.TestApi; import android.app.ActivityManager; import android.app.ActivityThread; @@ -2690,6 +2693,12 @@ public final class StrictMode { ((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 * is a no-op unless the current thread's {@link android.os.StrictMode.ThreadPolicy} has {@link diff --git a/core/java/android/os/SystemClock.java b/core/java/android/os/SystemClock.java index d8f63444dd1c..b9252d643810 100644 --- a/core/java/android/os/SystemClock.java +++ b/core/java/android/os/SystemClock.java @@ -311,7 +311,6 @@ public final class SystemClock { * time or throw. * * @throws DateTimeException when no accurate network time can be provided. - * @hide */ public static @NonNull Clock currentNetworkTimeClock() { return new SimpleClock(ZoneOffset.UTC) { |