Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tidy up module-lib API and locks" am: 98ab83c37d am: 779b5c6ee0

Browse Source 
Change-Id: If558e1d5f1a438eedefaae4c8b7f8eda7862ee7b
This commit is contained in:
Automerger Merge Worker
2020-01-29 14:21:29 +00:00
parent f8a4287915 779b5c6ee0
commit 1fc568f878
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/module-lib-current.txt
View File

@@ -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);
}

4
core/java/android/timezone/TelephonyLookup.java
View File

@@ -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;

2
core/java/android/timezone/TelephonyNetwork.java
View File

@@ -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;

2
core/java/android/timezone/TelephonyNetworkFinder.java
View File

@@ -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;

2
core/java/android/timezone/TimeZoneFinder.java
View File

@@ -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;

2
core/java/android/timezone/TzDataSetVersion.java
View File

@@ -89,7 +89,7 @@ public final class TzDataSetVersion {
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public static class TzDataSetException extends Exception {
public static final class TzDataSetException extends Exception {
/** Creates an instance with a message. */
public TzDataSetException(String message) {

2
core/java/android/timezone/ZoneInfoDb.java
View File

@@ -32,7 +32,7 @@ import java.util.Objects;
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public final class ZoneInfoDb {
private static Object sLock = new Object();
private static final Object sLock = new Object();
@GuardedBy("sLock")
private static ZoneInfoDb sInstance;