Merge "Parcelable classes should always be final." into nyc-dev (753c347e) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −18

Original line number	Diff line number	Diff line
		@@ -4126,7 +4126,7 @@ package android.app {
		field public java.lang.String serviceDetails;
		}

		public class AutomaticZenRule implements android.os.Parcelable {
		public final class AutomaticZenRule implements android.os.Parcelable {
		ctor public AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean);
		ctor public AutomaticZenRule(android.os.Parcel);
		method public int describeContents();
		@@ -6591,7 +6591,7 @@ package android.auditing {
		field public static final int TAG_SYNC_SEND_FILE = 210004; // 0x33454
		}

		public static class SecurityLog.SecurityEvent implements android.os.Parcelable {
		public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {
		method public int describeContents();
		method public java.lang.Object getData();
		method public int getTag();
		@@ -7335,7 +7335,7 @@ package android.bluetooth {
		field public static final int TYPE_SCO = 2; // 0x2
		}

		public class OobData implements android.os.Parcelable {
		public final class OobData implements android.os.Parcelable {
		ctor public OobData();
		method public int describeContents();
		method public byte[] getSecurityManagerTk();
		@@ -19708,7 +19708,7 @@ package android.media {
		field public static final int TYPE_WIRED_HEADSET = 3; // 0x3
		}

		public class AudioFormat implements android.os.Parcelable {
		public final class AudioFormat implements android.os.Parcelable {
		method public int describeContents();
		method public int getChannelCount();
		method public int getChannelIndexMask();
		@@ -20008,7 +20008,7 @@ package android.media {
		method public abstract void onRoutingChanged(android.media.AudioRecord);
		}

		public class AudioRecordConfiguration implements android.os.Parcelable {
		public final class AudioRecordConfiguration implements android.os.Parcelable {
		method public int describeContents();
		method public android.media.AudioDeviceInfo getAudioDevice();
		method public int getClientAudioSessionId();
		@@ -23523,17 +23523,6 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public class ConnectivityMetricsEvent implements android.os.Parcelable {
		ctor public ConnectivityMetricsEvent(long, int, int, android.os.Parcelable);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.ConnectivityMetricsEvent> CREATOR;
		field public final int componentTag;
		field public final android.os.Parcelable data;
		field public final int eventTag;
		field public final long timestamp;
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();
		@@ -23541,7 +23530,7 @@ package android.net {
		method public int getUid();
		}

		public class DataUsageRequest implements android.os.Parcelable {
		public final class DataUsageRequest implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.DataUsageRequest> CREATOR;
		@@ -29429,7 +29418,7 @@ package android.os.storage {
		method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
		}

		public class StorageVolume implements android.os.Parcelable {
		public final class StorageVolume implements android.os.Parcelable {
		method public android.content.Intent createAccessIntent(java.lang.String);
		method public int describeContents();
		method public java.lang.String getDescription(android.content.Context);

api/removed.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ package android.database {

		package android.media {

		public class AudioFormat implements android.os.Parcelable {
		public final class AudioFormat implements android.os.Parcelable {
		ctor public AudioFormat();
		}

api/system-current.txt

+7 −18

Original line number	Diff line number	Diff line
		@@ -4252,7 +4252,7 @@ package android.app {
		field public java.lang.String serviceDetails;
		}

		public class AutomaticZenRule implements android.os.Parcelable {
		public final class AutomaticZenRule implements android.os.Parcelable {
		ctor public AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean);
		ctor public AutomaticZenRule(android.os.Parcel);
		method public int describeContents();
		@@ -6858,7 +6858,7 @@ package android.auditing {
		field public static final int TAG_SYNC_SEND_FILE = 210004; // 0x33454
		}

		public static class SecurityLog.SecurityEvent implements android.os.Parcelable {
		public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {
		method public int describeContents();
		method public java.lang.Object getData();
		method public int getTag();
		@@ -7610,7 +7610,7 @@ package android.bluetooth {
		field public static final int TYPE_SCO = 2; // 0x2
		}

		public class OobData implements android.os.Parcelable {
		public final class OobData implements android.os.Parcelable {
		ctor public OobData();
		method public int describeContents();
		method public byte[] getSecurityManagerTk();
		@@ -21204,7 +21204,7 @@ package android.media {
		field public static final android.os.Parcelable.Creator<android.media.AudioFocusInfo> CREATOR;
		}

		public class AudioFormat implements android.os.Parcelable {
		public final class AudioFormat implements android.os.Parcelable {
		method public int describeContents();
		method public int getChannelCount();
		method public int getChannelIndexMask();
		@@ -21516,7 +21516,7 @@ package android.media {
		method public abstract void onRoutingChanged(android.media.AudioRecord);
		}

		public class AudioRecordConfiguration implements android.os.Parcelable {
		public final class AudioRecordConfiguration implements android.os.Parcelable {
		method public int describeContents();
		method public android.media.AudioDeviceInfo getAudioDevice();
		method public int getClientAudioSessionId();
		@@ -25344,17 +25344,6 @@ package android.net {
		method public void onTetheringStarted();
		}

		public class ConnectivityMetricsEvent implements android.os.Parcelable {
		ctor public ConnectivityMetricsEvent(long, int, int, android.os.Parcelable);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.ConnectivityMetricsEvent> CREATOR;
		field public final int componentTag;
		field public final android.os.Parcelable data;
		field public final int eventTag;
		field public final long timestamp;
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();
		@@ -25362,7 +25351,7 @@ package android.net {
		method public int getUid();
		}

		public class DataUsageRequest implements android.os.Parcelable {
		public final class DataUsageRequest implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.DataUsageRequest> CREATOR;
		@@ -31800,7 +31789,7 @@ package android.os.storage {
		method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
		}

		public class StorageVolume implements android.os.Parcelable {
		public final class StorageVolume implements android.os.Parcelable {
		method public android.content.Intent createAccessIntent(java.lang.String);
		method public int describeContents();
		method public java.lang.String getDescription(android.content.Context);

api/system-removed.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ package android.database {

		package android.media {

		public class AudioFormat implements android.os.Parcelable {
		public final class AudioFormat implements android.os.Parcelable {
		ctor public AudioFormat();
		}

api/test-current.txt

+7 −18

Original line number	Diff line number	Diff line
		@@ -4126,7 +4126,7 @@ package android.app {
		field public java.lang.String serviceDetails;
		}

		public class AutomaticZenRule implements android.os.Parcelable {
		public final class AutomaticZenRule implements android.os.Parcelable {
		ctor public AutomaticZenRule(java.lang.String, android.content.ComponentName, android.net.Uri, int, boolean);
		ctor public AutomaticZenRule(android.os.Parcel);
		method public int describeContents();
		@@ -6593,7 +6593,7 @@ package android.auditing {
		field public static final int TAG_SYNC_SEND_FILE = 210004; // 0x33454
		}

		public static class SecurityLog.SecurityEvent implements android.os.Parcelable {
		public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {
		method public int describeContents();
		method public java.lang.Object getData();
		method public int getTag();
		@@ -7337,7 +7337,7 @@ package android.bluetooth {
		field public static final int TYPE_SCO = 2; // 0x2
		}

		public class OobData implements android.os.Parcelable {
		public final class OobData implements android.os.Parcelable {
		ctor public OobData();
		method public int describeContents();
		method public byte[] getSecurityManagerTk();
		@@ -19717,7 +19717,7 @@ package android.media {
		field public static final int TYPE_WIRED_HEADSET = 3; // 0x3
		}

		public class AudioFormat implements android.os.Parcelable {
		public final class AudioFormat implements android.os.Parcelable {
		method public int describeContents();
		method public int getChannelCount();
		method public int getChannelIndexMask();
		@@ -20017,7 +20017,7 @@ package android.media {
		method public abstract void onRoutingChanged(android.media.AudioRecord);
		}

		public class AudioRecordConfiguration implements android.os.Parcelable {
		public final class AudioRecordConfiguration implements android.os.Parcelable {
		method public int describeContents();
		method public android.media.AudioDeviceInfo getAudioDevice();
		method public int getClientAudioSessionId();
		@@ -23532,17 +23532,6 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public class ConnectivityMetricsEvent implements android.os.Parcelable {
		ctor public ConnectivityMetricsEvent(long, int, int, android.os.Parcelable);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.ConnectivityMetricsEvent> CREATOR;
		field public final int componentTag;
		field public final android.os.Parcelable data;
		field public final int eventTag;
		field public final long timestamp;
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();
		@@ -23550,7 +23539,7 @@ package android.net {
		method public int getUid();
		}

		public class DataUsageRequest implements android.os.Parcelable {
		public final class DataUsageRequest implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.DataUsageRequest> CREATOR;
		@@ -29439,7 +29428,7 @@ package android.os.storage {
		method public boolean unmountObb(java.lang.String, boolean, android.os.storage.OnObbStateChangeListener);
		}

		public class StorageVolume implements android.os.Parcelable {
		public final class StorageVolume implements android.os.Parcelable {
		method public android.content.Intent createAccessIntent(java.lang.String);
		method public int describeContents();
		method public java.lang.String getDescription(android.content.Context);