Remove all the extra accessor methods added by javac in support-media-compat.
Change private methods to be package protected to avoid extra methods
that get added to be able to access them from inner classes.
This CL saves 95 methods in our jar.
Bug: 31075707
Change-Id: I109e85d38ab39c66b55482e2a69030c5f0d6a462
diff --git a/media-compat/java/android/support/v4/media/MediaBrowserCompat.java b/media-compat/java/android/support/v4/media/MediaBrowserCompat.java
index b06c8e7..f7a8f19 100644
--- a/media-compat/java/android/support/v4/media/MediaBrowserCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaBrowserCompat.java
@@ -59,8 +59,8 @@
* </p>
*/
public final class MediaBrowserCompat {
- private static final String TAG = "MediaBrowserCompat";
- private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+ static final String TAG = "MediaBrowserCompat";
+ static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
/**
* Used as an int extra field to denote the page number to subscribe.
@@ -388,7 +388,7 @@
/**
* Private constructor.
*/
- private MediaItem(Parcel in) {
+ MediaItem(Parcel in) {
mFlags = in.readInt();
mDescription = MediaDescriptionCompat.CREATOR.createFromParcel(in);
}
@@ -470,7 +470,7 @@
*/
public static class ConnectionCallback {
final Object mConnectionCallbackObj;
- private ConnectionCallbackInternal mConnectionCallbackInternal;
+ ConnectionCallbackInternal mConnectionCallbackInternal;
public ConnectionCallback() {
if (Build.VERSION.SDK_INT >= 21) {
@@ -511,6 +511,9 @@
}
private class StubApi21 implements MediaBrowserCompatApi21.ConnectionCallback {
+ StubApi21() {
+ }
+
@Override
public void onConnected() {
if (mConnectionCallbackInternal != null) {
@@ -543,7 +546,7 @@
public static abstract class SubscriptionCallback {
private final Object mSubscriptionCallbackObj;
private final IBinder mToken;
- private WeakReference<Subscription> mSubscriptionRef;
+ WeakReference<Subscription> mSubscriptionRef;
public SubscriptionCallback() {
if (Build.VERSION.SDK_INT >= 24 || BuildCompat.isAtLeastN()) {
@@ -614,6 +617,9 @@
}
private class StubApi21 implements MediaBrowserCompatApi21.SubscriptionCallback {
+ StubApi21() {
+ }
+
@Override
public void onChildrenLoaded(@NonNull String parentId, List<?> children) {
Subscription sub = mSubscriptionRef == null ? null : mSubscriptionRef.get();
@@ -667,6 +673,9 @@
private class StubApi24 extends StubApi21
implements MediaBrowserCompatApi24.SubscriptionCallback {
+ StubApi24() {
+ }
+
@Override
public void onChildrenLoaded(@NonNull String parentId, List<?> children,
@NonNull Bundle options) {
@@ -712,6 +721,9 @@
}
private class StubApi23 implements MediaBrowserCompatApi23.ItemCallback {
+ StubApi23() {
+ }
+
@Override
public void onItemLoaded(Parcel itemParcel) {
itemParcel.setDataPosition(0);
@@ -750,22 +762,22 @@
static class MediaBrowserImplBase
implements MediaBrowserImpl, MediaBrowserServiceCallbackImpl {
- private static final int CONNECT_STATE_DISCONNECTED = 0;
- private static final int CONNECT_STATE_CONNECTING = 1;
+ static final int CONNECT_STATE_DISCONNECTED = 0;
+ static final int CONNECT_STATE_CONNECTING = 1;
private static final int CONNECT_STATE_CONNECTED = 2;
- private static final int CONNECT_STATE_SUSPENDED = 3;
+ static final int CONNECT_STATE_SUSPENDED = 3;
- private final Context mContext;
- private final ComponentName mServiceComponent;
- private final ConnectionCallback mCallback;
- private final Bundle mRootHints;
- private final CallbackHandler mHandler = new CallbackHandler(this);
+ final Context mContext;
+ final ComponentName mServiceComponent;
+ final ConnectionCallback mCallback;
+ final Bundle mRootHints;
+ final CallbackHandler mHandler = new CallbackHandler(this);
private final ArrayMap<String, Subscription> mSubscriptions = new ArrayMap<>();
- private int mState = CONNECT_STATE_DISCONNECTED;
- private MediaServiceConnection mServiceConnection;
- private ServiceBinderWrapper mServiceBinderWrapper;
- private Messenger mCallbacksMessenger;
+ int mState = CONNECT_STATE_DISCONNECTED;
+ MediaServiceConnection mServiceConnection;
+ ServiceBinderWrapper mServiceBinderWrapper;
+ Messenger mCallbacksMessenger;
private String mRootId;
private MediaSessionCompat.Token mMediaSessionToken;
private Bundle mExtras;
@@ -880,7 +892,7 @@
* for a clean shutdown, but everywhere else is a dirty shutdown and should
* notify the app.
*/
- private void forceCloseConnection() {
+ void forceCloseConnection() {
if (mServiceConnection != null) {
mContext.unbindService(mServiceConnection);
}
@@ -1183,6 +1195,9 @@
* ServiceConnection to the other app.
*/
private class MediaServiceConnection implements ServiceConnection {
+ MediaServiceConnection() {
+ }
+
@Override
public void onServiceConnected(final ComponentName name, final IBinder binder) {
postOrRun(new Runnable() {
@@ -1274,7 +1289,7 @@
/**
* Return true if this is the current ServiceConnection. Also logs if it's not.
*/
- private boolean isCurrent(String funcName) {
+ boolean isCurrent(String funcName) {
if (mServiceConnection != this) {
if (mState != CONNECT_STATE_DISCONNECTED) {
// Check mState, because otherwise this log is noisy.
diff --git a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
index 091cf35..616e992 100644
--- a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
@@ -96,8 +96,8 @@
* </pre>
*/
public abstract class MediaBrowserServiceCompat extends Service {
- private static final String TAG = "MBServiceCompat";
- private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+ static final String TAG = "MBServiceCompat";
+ static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private MediaBrowserServiceImpl mImpl;
@@ -113,16 +113,16 @@
*/
public static final String KEY_MEDIA_ITEM = "media_item";
- private static final int RESULT_FLAG_OPTION_NOT_HANDLED = 0x00000001;
+ static final int RESULT_FLAG_OPTION_NOT_HANDLED = 0x00000001;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(flag=true, value = { RESULT_FLAG_OPTION_NOT_HANDLED })
private @interface ResultFlags { }
- private final ArrayMap<IBinder, ConnectionRecord> mConnections = new ArrayMap<>();
- private ConnectionRecord mCurConnection;
- private final ServiceHandler mHandler = new ServiceHandler();
+ final ArrayMap<IBinder, ConnectionRecord> mConnections = new ArrayMap<>();
+ ConnectionRecord mCurConnection;
+ final ServiceHandler mHandler = new ServiceHandler();
MediaSessionCompat.Token mSession;
interface MediaBrowserServiceImpl {
@@ -400,6 +400,9 @@
private final class ServiceHandler extends Handler {
private final ServiceBinderImpl mServiceBinderImpl = new ServiceBinderImpl();
+ ServiceHandler() {
+ }
+
@Override
public void handleMessage(Message msg) {
Bundle data = msg.getData();
@@ -470,6 +473,9 @@
ServiceCallbacks callbacks;
BrowserRoot root;
HashMap<String, List<Pair<IBinder, Bundle>>> subscriptions = new HashMap();
+
+ ConnectionRecord() {
+ }
}
/**
@@ -539,6 +545,9 @@
}
private class ServiceBinderImpl {
+ ServiceBinderImpl() {
+ }
+
public void connect(final String pkg, final int uid, final Bundle rootHints,
final ServiceCallbacks callbacks) {
@@ -959,7 +968,7 @@
/**
* Return whether the given package is one of the ones that is owned by the uid.
*/
- private boolean isValidPackage(String pkg, int uid) {
+ boolean isValidPackage(String pkg, int uid) {
if (pkg == null) {
return false;
}
@@ -977,7 +986,7 @@
/**
* Save the subscription and if it is a new subscription send the results.
*/
- private void addSubscription(String id, ConnectionRecord connection, IBinder token,
+ void addSubscription(String id, ConnectionRecord connection, IBinder token,
Bundle options) {
// Save the subscription
List<Pair<IBinder, Bundle>> callbackList = connection.subscriptions.get(id);
@@ -999,7 +1008,7 @@
/**
* Remove the subscription.
*/
- private boolean removeSubscription(String id, ConnectionRecord connection, IBinder token) {
+ boolean removeSubscription(String id, ConnectionRecord connection, IBinder token) {
if (token == null) {
return connection.subscriptions.remove(id) != null;
}
@@ -1025,7 +1034,7 @@
* <p>
* Callers must make sure that this connection is still connected.
*/
- private void performLoadChildren(final String parentId, final ConnectionRecord connection,
+ void performLoadChildren(final String parentId, final ConnectionRecord connection,
final Bundle options) {
final Result<List<MediaBrowserCompat.MediaItem>> result
= new Result<List<MediaBrowserCompat.MediaItem>>(parentId) {
@@ -1066,7 +1075,7 @@
}
}
- private List<MediaBrowserCompat.MediaItem> applyOptions(List<MediaBrowserCompat.MediaItem> list,
+ List<MediaBrowserCompat.MediaItem> applyOptions(List<MediaBrowserCompat.MediaItem> list,
final Bundle options) {
if (list == null) {
return null;
@@ -1087,7 +1096,7 @@
return list.subList(fromIndex, toIndex);
}
- private void performLoadItem(String itemId, ConnectionRecord connection,
+ void performLoadItem(String itemId, ConnectionRecord connection,
final ResultReceiver receiver) {
final Result<MediaBrowserCompat.MediaItem> result =
new Result<MediaBrowserCompat.MediaItem>(itemId) {
diff --git a/media-compat/java/android/support/v4/media/MediaDescriptionCompat.java b/media-compat/java/android/support/v4/media/MediaDescriptionCompat.java
index a9c5819..502ac65 100644
--- a/media-compat/java/android/support/v4/media/MediaDescriptionCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaDescriptionCompat.java
@@ -145,7 +145,7 @@
*/
private Object mDescriptionObj;
- private MediaDescriptionCompat(String mediaId, CharSequence title, CharSequence subtitle,
+ MediaDescriptionCompat(String mediaId, CharSequence title, CharSequence subtitle,
CharSequence description, Bitmap icon, Uri iconUri, Bundle extras, Uri mediaUri) {
mMediaId = mediaId;
mTitle = title;
@@ -157,7 +157,7 @@
mMediaUri = mediaUri;
}
- private MediaDescriptionCompat(Parcel in) {
+ MediaDescriptionCompat(Parcel in) {
mMediaId = in.readString();
mTitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
mSubtitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
diff --git a/media-compat/java/android/support/v4/media/MediaMetadataCompat.java b/media-compat/java/android/support/v4/media/MediaMetadataCompat.java
index 1b98922..ce640c1 100644
--- a/media-compat/java/android/support/v4/media/MediaMetadataCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaMetadataCompat.java
@@ -269,11 +269,11 @@
@Retention(RetentionPolicy.SOURCE)
public @interface RatingKey {}
- private static final int METADATA_TYPE_LONG = 0;
- private static final int METADATA_TYPE_TEXT = 1;
- private static final int METADATA_TYPE_BITMAP = 2;
- private static final int METADATA_TYPE_RATING = 3;
- private static final ArrayMap<String, Integer> METADATA_KEYS_TYPE;
+ static final int METADATA_TYPE_LONG = 0;
+ static final int METADATA_TYPE_TEXT = 1;
+ static final int METADATA_TYPE_BITMAP = 2;
+ static final int METADATA_TYPE_RATING = 3;
+ static final ArrayMap<String, Integer> METADATA_KEYS_TYPE;
static {
METADATA_KEYS_TYPE = new ArrayMap<String, Integer>();
@@ -330,15 +330,15 @@
METADATA_KEY_ALBUM_ART_URI
};
- private final Bundle mBundle;
+ final Bundle mBundle;
private Object mMetadataObj;
private MediaDescriptionCompat mDescription;
- private MediaMetadataCompat(Bundle bundle) {
+ MediaMetadataCompat(Bundle bundle) {
mBundle = new Bundle(bundle);
}
- private MediaMetadataCompat(Parcel in) {
+ MediaMetadataCompat(Parcel in) {
mBundle = in.readBundle();
}
diff --git a/media-compat/java/android/support/v4/media/RatingCompat.java b/media-compat/java/android/support/v4/media/RatingCompat.java
index ee25ad4..129fff9 100644
--- a/media-compat/java/android/support/v4/media/RatingCompat.java
+++ b/media-compat/java/android/support/v4/media/RatingCompat.java
@@ -96,7 +96,7 @@
private Object mRatingObj; // framework Rating object
- private RatingCompat(@Style int ratingStyle, float rating) {
+ RatingCompat(@Style int ratingStyle, float rating) {
mRatingStyle = ratingStyle;
mRatingValue = rating;
}
diff --git a/media-compat/java/android/support/v4/media/session/MediaControllerCompat.java b/media-compat/java/android/support/v4/media/session/MediaControllerCompat.java
index ff23aed..266a4d1 100644
--- a/media-compat/java/android/support/v4/media/session/MediaControllerCompat.java
+++ b/media-compat/java/android/support/v4/media/session/MediaControllerCompat.java
@@ -52,7 +52,7 @@
* introduced after API level 4 in a backwards compatible fashion.
*/
public final class MediaControllerCompat {
- private static final String TAG = "MediaControllerCompat";
+ static final String TAG = "MediaControllerCompat";
private final MediaControllerImpl mImpl;
private final MediaSessionCompat.Token mToken;
@@ -343,9 +343,9 @@
*/
public static abstract class Callback implements IBinder.DeathRecipient {
private final Object mCallbackObj;
- private MessageHandler mHandler;
+ MessageHandler mHandler;
- private boolean mRegistered = false;
+ boolean mRegistered = false;
public Callback() {
if (android.os.Build.VERSION.SDK_INT >= 21) {
@@ -441,6 +441,9 @@
}
private class StubApi21 implements MediaControllerCompatApi21.Callback {
+ StubApi21() {
+ }
+
@Override
public void onSessionDestroyed() {
Callback.this.onSessionDestroyed();
@@ -487,6 +490,9 @@
private class StubCompat extends IMediaControllerCallback.Stub {
+ StubCompat() {
+ }
+
@Override
public void onEvent(String event, Bundle extras) throws RemoteException {
mHandler.post(MessageHandler.MSG_EVENT, event, extras);
diff --git a/media-compat/java/android/support/v4/media/session/MediaSessionCompat.java b/media-compat/java/android/support/v4/media/session/MediaSessionCompat.java
index a383e2d..5e93cef 100644
--- a/media-compat/java/android/support/v4/media/session/MediaSessionCompat.java
+++ b/media-compat/java/android/support/v4/media/session/MediaSessionCompat.java
@@ -80,7 +80,7 @@
* backwards compatible fashion.
*/
public class MediaSessionCompat {
- private static final String TAG = "MediaSessionCompat";
+ static final String TAG = "MediaSessionCompat";
private final MediaSessionImpl mImpl;
private final MediaControllerCompat mController;
@@ -163,7 +163,7 @@
private static final int MAX_BITMAP_SIZE_IN_DP = 320;
// Maximum size of the bitmap in px. It shouldn't be changed.
- private static int sMaxBitmapSize;
+ static int sMaxBitmapSize;
/**
* Creates a new session. You must call {@link #release()} when finished with the session.
@@ -773,6 +773,9 @@
private class StubApi21 implements MediaSessionCompatApi21.Callback {
+ StubApi21() {
+ }
+
@Override
public void onCommand(String command, Bundle extras, ResultReceiver cb) {
Callback.this.onCommand(command, extras, cb);
@@ -871,6 +874,9 @@
private class StubApi23 extends StubApi21 implements MediaSessionCompatApi23.Callback {
+ StubApi23() {
+ }
+
@Override
public void onPlayFromUri(Uri uri, Bundle extras) {
Callback.this.onPlayFromUri(uri, extras);
@@ -879,6 +885,9 @@
private class StubApi24 extends StubApi23 implements MediaSessionCompatApi24.Callback {
+ StubApi24() {
+ }
+
@Override
public void onPrepare() {
Callback.this.onPrepare();
@@ -1043,7 +1052,7 @@
mItem = queueItem;
}
- private QueueItem(Parcel in) {
+ QueueItem(Parcel in) {
mDescription = MediaDescriptionCompat.CREATOR.createFromParcel(in);
mId = in.readLong();
}
@@ -1252,34 +1261,34 @@
private final Object mRccObj;
private final MediaSessionStub mStub;
private final Token mToken;
- private final String mPackageName;
- private final String mTag;
- private final AudioManager mAudioManager;
+ final String mPackageName;
+ final String mTag;
+ final AudioManager mAudioManager;
- private final Object mLock = new Object();
- private final RemoteCallbackList<IMediaControllerCallback> mControllerCallbacks
+ final Object mLock = new Object();
+ final RemoteCallbackList<IMediaControllerCallback> mControllerCallbacks
= new RemoteCallbackList<>();
private MessageHandler mHandler;
- private boolean mDestroyed = false;
+ boolean mDestroyed = false;
private boolean mIsActive = false;
private boolean mIsRccRegistered = false;
private boolean mIsMbrRegistered = false;
- private volatile Callback mCallback;
+ volatile Callback mCallback;
- private @SessionFlags int mFlags;
+ @SessionFlags int mFlags;
- private MediaMetadataCompat mMetadata;
- private PlaybackStateCompat mState;
- private PendingIntent mSessionActivity;
- private List<QueueItem> mQueue;
- private CharSequence mQueueTitle;
- private @RatingCompat.Style int mRatingType;
- private Bundle mExtras;
+ MediaMetadataCompat mMetadata;
+ PlaybackStateCompat mState;
+ PendingIntent mSessionActivity;
+ List<QueueItem> mQueue;
+ CharSequence mQueueTitle;
+ @RatingCompat.Style int mRatingType;
+ Bundle mExtras;
- private int mVolumeType;
- private int mLocalStream;
- private VolumeProviderCompat mVolumeProvider;
+ int mVolumeType;
+ int mLocalStream;
+ VolumeProviderCompat mVolumeProvider;
private VolumeProviderCompat.Callback mVolumeCallback
= new VolumeProviderCompat.Callback() {
@@ -1381,15 +1390,15 @@
}
}
- private void postToHandler(int what) {
+ void postToHandler(int what) {
postToHandler(what, null);
}
- private void postToHandler(int what, Object obj) {
+ void postToHandler(int what, Object obj) {
postToHandler(what, obj, null);
}
- private void postToHandler(int what, Object obj, Bundle extras) {
+ void postToHandler(int what, Object obj, Bundle extras) {
synchronized (mLock) {
if (mHandler != null) {
mHandler.post(what, obj, extras);
@@ -1653,7 +1662,7 @@
return registeredRcc;
}
- private void adjustVolume(int direction, int flags) {
+ void adjustVolume(int direction, int flags) {
if (mVolumeType == MediaControllerCompat.PlaybackInfo.PLAYBACK_TYPE_REMOTE) {
if (mVolumeProvider != null) {
mVolumeProvider.onAdjustVolume(direction);
@@ -1663,7 +1672,7 @@
}
}
- private void setVolumeTo(int value, int flags) {
+ void setVolumeTo(int value, int flags) {
if (mVolumeType == MediaControllerCompat.PlaybackInfo.PLAYBACK_TYPE_REMOTE) {
if (mVolumeProvider != null) {
mVolumeProvider.onSetVolumeTo(value);
@@ -1673,7 +1682,7 @@
}
}
- private PlaybackStateCompat getStateWithUpdatedPosition() {
+ PlaybackStateCompat getStateWithUpdatedPosition() {
PlaybackStateCompat state;
long duration = -1;
synchronized (mLock) {
@@ -1710,7 +1719,7 @@
return result == null ? state : result;
}
- private void sendVolumeInfoChanged(ParcelableVolumeInfo info) {
+ void sendVolumeInfoChanged(ParcelableVolumeInfo info) {
int size = mControllerCallbacks.beginBroadcast();
for (int i = size - 1; i >= 0; i--) {
IMediaControllerCallback cb = mControllerCallbacks.getBroadcastItem(i);
diff --git a/media-compat/java/android/support/v4/media/session/PlaybackStateCompat.java b/media-compat/java/android/support/v4/media/session/PlaybackStateCompat.java
index 51f248b..4442939 100644
--- a/media-compat/java/android/support/v4/media/session/PlaybackStateCompat.java
+++ b/media-compat/java/android/support/v4/media/session/PlaybackStateCompat.java
@@ -337,20 +337,20 @@
return KeyEvent.KEYCODE_UNKNOWN;
}
- private final int mState;
- private final long mPosition;
- private final long mBufferedPosition;
- private final float mSpeed;
- private final long mActions;
- private final CharSequence mErrorMessage;
- private final long mUpdateTime;
- private List<PlaybackStateCompat.CustomAction> mCustomActions;
- private final long mActiveItemId;
- private final Bundle mExtras;
+ final int mState;
+ final long mPosition;
+ final long mBufferedPosition;
+ final float mSpeed;
+ final long mActions;
+ final CharSequence mErrorMessage;
+ final long mUpdateTime;
+ List<PlaybackStateCompat.CustomAction> mCustomActions;
+ final long mActiveItemId;
+ final Bundle mExtras;
private Object mStateObj;
- private PlaybackStateCompat(int state, long position, long bufferedPosition,
+ PlaybackStateCompat(int state, long position, long bufferedPosition,
float rate, long actions, CharSequence errorMessage, long updateTime,
List<PlaybackStateCompat.CustomAction> customActions,
long activeItemId, Bundle extras) {
@@ -366,7 +366,7 @@
mExtras = extras;
}
- private PlaybackStateCompat(Parcel in) {
+ PlaybackStateCompat(Parcel in) {
mState = in.readInt();
mPosition = in.readLong();
mSpeed = in.readFloat();
@@ -638,14 +638,14 @@
/**
* Use {@link PlaybackStateCompat.CustomAction.Builder#build()}.
*/
- private CustomAction(String action, CharSequence name, int icon, Bundle extras) {
+ CustomAction(String action, CharSequence name, int icon, Bundle extras) {
mAction = action;
mName = name;
mIcon = icon;
mExtras = extras;
}
- private CustomAction(Parcel in) {
+ CustomAction(Parcel in) {
mAction = in.readString();
mName = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
mIcon = in.readInt();
