Merge "Remove System APIs not required for R" (f5f137b9) · Commits · e / os / android_frameworks_base

api/module-lib-current.txt

+0 −147

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		package android.app.timedetector {

		public final class PhoneTimeSuggestion implements android.os.Parcelable {
		method public void addDebugInfo(@NonNull String);
		method public void addDebugInfo(@NonNull java.util.List<java.lang.String>);
		method public int describeContents();
		method @NonNull public java.util.List<java.lang.String> getDebugInfo();
		method public int getSlotIndex();
		method @Nullable public android.os.TimestampedValue<java.lang.Long> getUtcTime();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.timedetector.PhoneTimeSuggestion> CREATOR;
		}

		public static final class PhoneTimeSuggestion.Builder {
		ctor public PhoneTimeSuggestion.Builder(int);
		method @NonNull public android.app.timedetector.PhoneTimeSuggestion.Builder addDebugInfo(@NonNull String);
		method @NonNull public android.app.timedetector.PhoneTimeSuggestion build();
		method @NonNull public android.app.timedetector.PhoneTimeSuggestion.Builder setUtcTime(@Nullable android.os.TimestampedValue<java.lang.Long>);
		}

		public interface TimeDetector {
		method @RequiresPermission("android.permission.SUGGEST_PHONE_TIME_AND_ZONE") public void suggestPhoneTime(@NonNull android.app.timedetector.PhoneTimeSuggestion);
		}

		}

		package android.app.timezonedetector {

		public final class PhoneTimeZoneSuggestion implements android.os.Parcelable {
		method public void addDebugInfo(@NonNull String);
		method public void addDebugInfo(@NonNull java.util.List<java.lang.String>);
		method @NonNull public static android.app.timezonedetector.PhoneTimeZoneSuggestion createEmptySuggestion(int, @NonNull String);
		method public int describeContents();
		method @NonNull public java.util.List<java.lang.String> getDebugInfo();
		method public int getMatchType();
		method public int getQuality();
		method public int getSlotIndex();
		method @Nullable public String getZoneId();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.timezonedetector.PhoneTimeZoneSuggestion> CREATOR;
		field public static final int MATCH_TYPE_EMULATOR_ZONE_ID = 4; // 0x4
		field public static final int MATCH_TYPE_NA = 0; // 0x0
		field public static final int MATCH_TYPE_NETWORK_COUNTRY_AND_OFFSET = 3; // 0x3
		field public static final int MATCH_TYPE_NETWORK_COUNTRY_ONLY = 2; // 0x2
		field public static final int MATCH_TYPE_TEST_NETWORK_OFFSET_ONLY = 5; // 0x5
		field public static final int QUALITY_MULTIPLE_ZONES_WITH_DIFFERENT_OFFSETS = 3; // 0x3
		field public static final int QUALITY_MULTIPLE_ZONES_WITH_SAME_OFFSET = 2; // 0x2
		field public static final int QUALITY_NA = 0; // 0x0
		field public static final int QUALITY_SINGLE_ZONE = 1; // 0x1
		}

		public static final class PhoneTimeZoneSuggestion.Builder {
		ctor public PhoneTimeZoneSuggestion.Builder(int);
		method @NonNull public android.app.timezonedetector.PhoneTimeZoneSuggestion.Builder addDebugInfo(@NonNull String);
		method @NonNull public android.app.timezonedetector.PhoneTimeZoneSuggestion build();
		method @NonNull public android.app.timezonedetector.PhoneTimeZoneSuggestion.Builder setMatchType(int);
		method @NonNull public android.app.timezonedetector.PhoneTimeZoneSuggestion.Builder setQuality(int);
		method @NonNull public android.app.timezonedetector.PhoneTimeZoneSuggestion.Builder setZoneId(@Nullable String);
		}

		public interface TimeZoneDetector {
		method @RequiresPermission("android.permission.SUGGEST_PHONE_TIME_AND_ZONE") public void suggestPhoneTimeZone(@NonNull android.app.timezonedetector.PhoneTimeZoneSuggestion);
		}

		}

		package android.os {

		public final class TimestampedValue<T> implements android.os.Parcelable {
		ctor public TimestampedValue(long, @Nullable T);
		method public int describeContents();
		method public long getReferenceTimeMillis();
		method @Nullable public T getValue();
		method public static long referenceTimeDifference(@NonNull android.os.TimestampedValue<?>, @NonNull android.os.TimestampedValue<?>);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.os.TimestampedValue<?>> CREATOR;
		}

		}

		package android.timezone {

		public final class CountryTimeZones {
		method @Nullable public android.icu.util.TimeZone getDefaultTimeZone();
		method @Nullable public String getDefaultTimeZoneId();
		method @NonNull public java.util.List<android.timezone.CountryTimeZones.TimeZoneMapping> getEffectiveTimeZoneMappingsAt(long);
		method public boolean hasUtcZone(long);
		method public boolean isDefaultTimeZoneBoosted();
		method @Nullable public android.timezone.CountryTimeZones.OffsetResult lookupByOffsetWithBias(int, @Nullable Boolean, @Nullable Integer, long, @Nullable android.icu.util.TimeZone);
		method public boolean matchesCountryCode(@NonNull String);
		}

		public static final class CountryTimeZones.OffsetResult {
		ctor public CountryTimeZones.OffsetResult(@NonNull android.icu.util.TimeZone, boolean);
		method @NonNull public android.icu.util.TimeZone getTimeZone();
		method public boolean isOnlyMatch();
		}

		public static final class CountryTimeZones.TimeZoneMapping {
		method @NonNull public android.icu.util.TimeZone getTimeZone();
		method @NonNull public String getTimeZoneId();
		}

		public final class TelephonyLookup {
		method @NonNull public static android.timezone.TelephonyLookup getInstance();
		method @Nullable public android.timezone.TelephonyNetworkFinder getTelephonyNetworkFinder();
		}

		public final class TelephonyNetwork {
		method @NonNull public String getCountryIsoCode();
		method @NonNull public String getMcc();
		method @NonNull public String getMnc();
		}

		public final class TelephonyNetworkFinder {
		method @Nullable public android.timezone.TelephonyNetwork findNetworkByMccMnc(@NonNull String, @NonNull String);
		}

		public final class TimeZoneFinder {
		method @Nullable public String getIanaVersion();
		method @NonNull public static android.timezone.TimeZoneFinder getInstance();
		method @Nullable public android.timezone.CountryTimeZones lookupCountryTimeZones(@NonNull String);
		}

		public final class TzDataSetVersion {
		method public static int currentFormatMajorVersion();
		method public static int currentFormatMinorVersion();
		method public int getFormatMajorVersion();
		method public int getFormatMinorVersion();
		method public int getRevision();
		method @NonNull public String getRulesVersion();
		method public static boolean isCompatibleWithThisDevice(android.timezone.TzDataSetVersion);
		method @NonNull public static android.timezone.TzDataSetVersion read() throws java.io.IOException, android.timezone.TzDataSetVersion.TzDataSetException;
		}

		public static final class TzDataSetVersion.TzDataSetException extends java.lang.Exception {
		ctor public TzDataSetVersion.TzDataSetException(String);
		ctor public TzDataSetVersion.TzDataSetException(String, Throwable);
		}

		public final class ZoneInfoDb {
		method @NonNull public static android.timezone.ZoneInfoDb getInstance();
		method @NonNull public String getVersion();
		}

		}

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,6 @@ package android {
		field public static final String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";
		field public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME";
		field public static final String SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON = "android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON";
		field public static final String SUGGEST_PHONE_TIME_AND_ZONE = "android.permission.SUGGEST_PHONE_TIME_AND_ZONE";
		field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS";
		field public static final String TETHER_PRIVILEGED = "android.permission.TETHER_PRIVILEGED";
		field public static final String TV_INPUT_HARDWARE = "android.permission.TV_INPUT_HARDWARE";

core/java/android/app/timedetector/PhoneTimeSuggestion.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package android.app.timedetector;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.TimestampedValue;
		@@ -51,11 +50,9 @@ import java.util.Objects;
		*
		* @hide
		*/
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public final class PhoneTimeSuggestion implements Parcelable {

		/** @hide */
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public static final @NonNull Parcelable.Creator<PhoneTimeSuggestion> CREATOR =
		new Parcelable.Creator<PhoneTimeSuggestion>() {
		public PhoneTimeSuggestion createFromParcel(Parcel in) {
		@@ -188,7 +185,6 @@ public final class PhoneTimeSuggestion implements Parcelable {
		*
		* @hide
		*/
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public static final class Builder {
		private final int mSlotIndex;
		@Nullable private TimestampedValue<Long> mUtcTime;

core/java/android/app/timedetector/TimeDetector.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package android.app.timedetector;

		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.content.Context;
		import android.os.SystemClock;
		@@ -29,7 +28,6 @@ import android.os.TimestampedValue;
		*
		* @hide
		*/
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@SystemService(Context.TIME_DETECTOR_SERVICE)
		public interface TimeDetector {

core/java/android/app/timezonedetector/PhoneTimeZoneSuggestion.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package android.app.timezonedetector;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -57,11 +56,9 @@ import java.util.Objects;
		*
		* @hide
		*/
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public final class PhoneTimeZoneSuggestion implements Parcelable {

		/** @hide */
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		@NonNull
		public static final Creator<PhoneTimeZoneSuggestion> CREATOR =
		new Creator<PhoneTimeZoneSuggestion>() {
		@@ -297,7 +294,6 @@ public final class PhoneTimeZoneSuggestion implements Parcelable {
		*
		* @hide
		*/
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public static final class Builder {
		private final int mSlotIndex;
		@Nullable private String mZoneId;