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

Commit 36a75595 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Tidy up module-lib API and locks" am: 98ab83c3 am: 779b5c6e am: 1fc568f8 

Change-Id: I4c7039b54aa185447108622b0608689ddf45bc2f
parents fdb676b4 1fc568f8

api/module-lib-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -102,18 +102,18 @@ package android.timezone { 
    method @NonNull public String getTimeZoneId();

  }



  public class TelephonyLookup {

  public final class TelephonyLookup {

    method @NonNull public static android.timezone.TelephonyLookup getInstance();

    method @Nullable public android.timezone.TelephonyNetworkFinder getTelephonyNetworkFinder();

  }



  public class TelephonyNetwork {

  public final class TelephonyNetwork {

    method @NonNull public String getCountryIsoCode();

    method @NonNull public String getMcc();

    method @NonNull public String getMnc();

  }



  public class TelephonyNetworkFinder {

  public final class TelephonyNetworkFinder {

    method @Nullable public android.timezone.TelephonyNetwork findNetworkByMccMnc(@NonNull String, @NonNull String);

  }
@@ -134,7 +134,7 @@ package android.timezone { 
    method @NonNull public static android.timezone.TzDataSetVersion read() throws java.io.IOException, android.timezone.TzDataSetVersion.TzDataSetException;

  }



  public static class TzDataSetVersion.TzDataSetException extends java.lang.Exception {

  public static final class TzDataSetVersion.TzDataSetException extends java.lang.Exception {

    ctor public TzDataSetVersion.TzDataSetException(String);

    ctor public TzDataSetVersion.TzDataSetException(String, Throwable);

  }

core/java/android/timezone/TelephonyLookup.java

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ import java.util.Objects; 
 * @hide

 */

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

public class TelephonyLookup {

public final class TelephonyLookup {



    private static Object sLock = new Object();

    private static final Object sLock = new Object();

    @GuardedBy("sLock")

    private static TelephonyLookup sInstance;

core/java/android/timezone/TelephonyNetwork.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import java.util.Objects; 
 * @hide

 */

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

public class TelephonyNetwork {

public final class TelephonyNetwork {



    @NonNull

    private final libcore.timezone.TelephonyNetwork mDelegate;

core/java/android/timezone/TelephonyNetworkFinder.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import java.util.Objects; 
 * @hide

 */

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

public class TelephonyNetworkFinder {

public final class TelephonyNetworkFinder {



    @NonNull

    private final libcore.timezone.TelephonyNetworkFinder mDelegate;

core/java/android/timezone/TimeZoneFinder.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.Objects; 
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

public final class TimeZoneFinder {



    private static Object sLock = new Object();

    private static final Object sLock = new Object();

    @GuardedBy("sLock")

    private static TimeZoneFinder sInstance;