From 50d1c044b5ce4b6fef532dc6e083cef903f554b2 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 29 Feb 2016 16:34:46 -0700 Subject: [PATCH] Parcelable classes should always be final. Also hide ConnectivityMetricsEvent which isn't being used yet. Bug: 27415331 Change-Id: Iacdccddda504f3f669185f807b4f35b8dc2b0212 --- api/current.txt | 25 ++++++------------- api/removed.txt | 2 +- api/system-current.txt | 25 ++++++------------- api/system-removed.txt | 2 +- api/test-current.txt | 25 ++++++------------- api/test-removed.txt | 2 +- core/java/android/app/AutomaticZenRule.java | 2 +- core/java/android/auditing/SecurityLog.java | 2 +- core/java/android/bluetooth/OobData.java | 2 +- .../android/net/ConnectivityMetricsEvent.java | 5 ++-- core/java/android/net/DataUsageRequest.java | 2 +- .../android/os/storage/StorageVolume.java | 2 +- media/java/android/media/AudioFormat.java | 2 +- .../media/AudioRecordConfiguration.java | 2 +- 14 files changed, 33 insertions(+), 67 deletions(-) diff --git a/api/current.txt b/api/current.txt index f7a316d063e5b..1ba9a4b253dce 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 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 CREATOR; @@ -29428,7 +29417,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); diff --git a/api/removed.txt b/api/removed.txt index 50a24f6dfd934..115224ce49a61 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -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(); } diff --git a/api/system-current.txt b/api/system-current.txt index b2b59826f3bcb..921dd389781eb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 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 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 CREATOR; @@ -31799,7 +31788,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); diff --git a/api/system-removed.txt b/api/system-removed.txt index 7347aa3f21106..9ebc484e6dd77 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -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(); } diff --git a/api/test-current.txt b/api/test-current.txt index 472daf698b749..2b7a038f5a485 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 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 CREATOR; @@ -29438,7 +29427,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); diff --git a/api/test-removed.txt b/api/test-removed.txt index 50a24f6dfd934..115224ce49a61 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -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(); } diff --git a/core/java/android/app/AutomaticZenRule.java b/core/java/android/app/AutomaticZenRule.java index b7eaf3947a425..ceec62f74a250 100644 --- a/core/java/android/app/AutomaticZenRule.java +++ b/core/java/android/app/AutomaticZenRule.java @@ -27,7 +27,7 @@ import java.util.Objects; /** * Rule instance information for zen mode. */ -public class AutomaticZenRule implements Parcelable { +public final class AutomaticZenRule implements Parcelable { private boolean enabled = false; private String name; diff --git a/core/java/android/auditing/SecurityLog.java b/core/java/android/auditing/SecurityLog.java index 829685b83b5bb..13823a23f43bd 100644 --- a/core/java/android/auditing/SecurityLog.java +++ b/core/java/android/auditing/SecurityLog.java @@ -116,7 +116,7 @@ public class SecurityLog { /** * A class representing a security event log entry. */ - public static class SecurityEvent implements Parcelable { + public static final class SecurityEvent implements Parcelable { private Event mEvent; /** @hide */ diff --git a/core/java/android/bluetooth/OobData.java b/core/java/android/bluetooth/OobData.java index 01f72efb22ac4..2822df7318a26 100644 --- a/core/java/android/bluetooth/OobData.java +++ b/core/java/android/bluetooth/OobData.java @@ -24,7 +24,7 @@ import android.util.Log; /** * Out Of Band Data for Bluetooth device. */ -public class OobData implements Parcelable { +public final class OobData implements Parcelable { private byte[] securityManagerTk; public byte[] getSecurityManagerTk() { diff --git a/core/java/android/net/ConnectivityMetricsEvent.java b/core/java/android/net/ConnectivityMetricsEvent.java index d040a8563440a..098f1e6947a3a 100644 --- a/core/java/android/net/ConnectivityMetricsEvent.java +++ b/core/java/android/net/ConnectivityMetricsEvent.java @@ -16,12 +16,11 @@ package android.net; -import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -@SystemApi -public class ConnectivityMetricsEvent implements Parcelable { +/** {@hide} */ +public final class ConnectivityMetricsEvent implements Parcelable { /** The time when this event was collected, as returned by System.currentTimeMillis(). */ final public long timestamp; diff --git a/core/java/android/net/DataUsageRequest.java b/core/java/android/net/DataUsageRequest.java index 5e96cc1fe04ac..8526584d640d6 100644 --- a/core/java/android/net/DataUsageRequest.java +++ b/core/java/android/net/DataUsageRequest.java @@ -29,7 +29,7 @@ import java.util.Objects; * If no {@code uid}s are set, callbacks are restricted to device-owners, * carrier-privileged apps, or system apps. */ -public class DataUsageRequest implements Parcelable { +public final class DataUsageRequest implements Parcelable { /** * @hide diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java index d860c7d8ad2e2..54d20d361a268 100644 --- a/core/java/android/os/storage/StorageVolume.java +++ b/core/java/android/os/storage/StorageVolume.java @@ -76,7 +76,7 @@ import java.io.File; */ // NOTE: This is a legacy specialization of VolumeInfo which describes the volume for a specific // user, but is now part of the public API. -public class StorageVolume implements Parcelable { +public final class StorageVolume implements Parcelable { private final String mId; private final int mStorageId; diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index b0411a2b63f59..abb6f4e9964cb 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -212,7 +212,7 @@ import java.util.Objects; * AudioTrack.getPlaybackHeadPosition()}), * depending on the context where audio frame is used. */ -public class AudioFormat implements Parcelable { +public final class AudioFormat implements Parcelable { //--------------------------------------------------------- // Constants diff --git a/media/java/android/media/AudioRecordConfiguration.java b/media/java/android/media/AudioRecordConfiguration.java index c2cd9b3d06371..2fc8ee82efa96 100644 --- a/media/java/android/media/AudioRecordConfiguration.java +++ b/media/java/android/media/AudioRecordConfiguration.java @@ -29,7 +29,7 @@ import java.util.Objects; * {@link AudioManager#getActiveRecordConfigurations()} method. * */ -public class AudioRecordConfiguration implements Parcelable { +public final class AudioRecordConfiguration implements Parcelable { private final static String TAG = new String("AudioRecordConfiguration"); private final int mSessionId;