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

Merge "Parcelable classes should always be final." into nyc-dev

Browse Source 
am: 753c347efd

* commit '753c347efd0a03ee0187e9c98c9978e43104c257':
  Parcelable classes should always be final.
This commit is contained in:
Jeff Sharkey
2016-03-01 00:08:21 +00:00
committed by android-build-merger
parent 8b80f0940a 753c347efd
commit 620ef3f226
14 changed files with 33 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
api/current.txt
View File

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

2
api/removed.txt
View File

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

25
api/system-current.txt
View File

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

2
api/system-removed.txt
View File

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

25
api/test-current.txt
View File

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

2
api/test-removed.txt
View File

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

2
core/java/android/app/AutomaticZenRule.java
View File

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

2
core/java/android/auditing/SecurityLog.java
View File

@@ -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 */

2
core/java/android/bluetooth/OobData.java
View File

@@ -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() {

5
core/java/android/net/ConnectivityMetricsEvent.java
View File

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

2
core/java/android/net/DataUsageRequest.java
View File

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

2
core/java/android/os/storage/StorageVolume.java
View File

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

2
media/java/android/media/AudioFormat.java
View File

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

2
media/java/android/media/AudioRecordConfiguration.java
View File

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