Merge "Make slight API and doc adjustments" am: b7e10650d8 (0f18557d) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/MbmsDownloadManager.java

+17 −6

Original line number	Diff line number	Diff line
		@@ -211,9 +211,9 @@ public class MbmsDownloadManager {
		private int mSubscriptionId = INVALID_SUBSCRIPTION_ID;

		private AtomicReference<IMbmsDownloadService> mService = new AtomicReference<>(null);
		private final IMbmsDownloadManagerCallback mCallback;
		private final MbmsDownloadManagerCallback mCallback;

		private MbmsDownloadManager(Context context, IMbmsDownloadManagerCallback callback, int subId) {
		private MbmsDownloadManager(Context context, MbmsDownloadManagerCallback callback, int subId) {
		mContext = context;
		mCallback = callback;
		mSubscriptionId = subId;
		@@ -221,12 +221,12 @@ public class MbmsDownloadManager {

		/**
		* Create a new MbmsDownloadManager using the system default data subscription ID.
		* See {@link #create(Context, IMbmsDownloadManagerCallback, int)}
		* See {@link #create(Context, MbmsDownloadManagerCallback, int)}
		*
		* @hide
		*/
		public static MbmsDownloadManager create(Context context,
		IMbmsDownloadManagerCallback listener)
		MbmsDownloadManagerCallback listener)
		throws MbmsException {
		return create(context, listener, SubscriptionManager.getDefaultSubscriptionId());
		}
		@@ -247,7 +247,7 @@ public class MbmsDownloadManager {
		* @hide
		*/
		public static MbmsDownloadManager create(Context context,
		IMbmsDownloadManagerCallback listener, int subscriptionId)
		MbmsDownloadManagerCallback listener, int subscriptionId)
		throws MbmsException {
		MbmsDownloadManager mdm = new MbmsDownloadManager(context, listener, subscriptionId);
		mdm.bindAndInitialize();
		@@ -261,11 +261,22 @@ public class MbmsDownloadManager {
		public void onServiceConnected(ComponentName name, IBinder service) {
		IMbmsDownloadService downloadService =
		IMbmsDownloadService.Stub.asInterface(service);
		int result;
		try {
		downloadService.initialize(mSubscriptionId, mCallback);
		result = downloadService.initialize(mSubscriptionId, mCallback);
		} catch (RemoteException e) {
		Log.e(LOG_TAG, "Service died before initialization");
		return;
		} catch (RuntimeException e) {
		Log.e(LOG_TAG, "Runtime exception during initialization");
		mCallback.error(
		MbmsException.InitializationErrors.ERROR_UNABLE_TO_INITIALIZE,
		e.toString());
		return;
		}
		if (result != MbmsException.SUCCESS) {
		mCallback.error(result, "Error returned during initialization");
		return;
		}
		mService.set(downloadService);
		}

telephony/java/android/telephony/MbmsStreamingManager.java

+19 −8

Original line number	Diff line number	Diff line
		@@ -51,10 +51,10 @@ public class MbmsStreamingManager {
		private int mSubscriptionId = INVALID_SUBSCRIPTION_ID;

		/** @hide */
		private MbmsStreamingManager(Context context, MbmsStreamingManagerCallback listener,
		private MbmsStreamingManager(Context context, MbmsStreamingManagerCallback callback,
		int subscriptionId) {
		mContext = context;
		mCallbackToApp = listener;
		mCallbackToApp = callback;
		mSubscriptionId = subscriptionId;
		}

		@@ -66,14 +66,14 @@ public class MbmsStreamingManager {
		* during the initialization or binding process.
		*
		* @param context The {@link Context} to use.
		* @param listener A callback object on which you wish to receive results of asynchronous
		* @param callback A callback object on which you wish to receive results of asynchronous
		* operations.
		* @param subscriptionId The subscription ID to use.
		*/
		public static MbmsStreamingManager create(Context context,
		MbmsStreamingManagerCallback listener, int subscriptionId)
		MbmsStreamingManagerCallback callback, int subscriptionId)
		throws MbmsException {
		MbmsStreamingManager manager = new MbmsStreamingManager(context, listener, subscriptionId);
		MbmsStreamingManager manager = new MbmsStreamingManager(context, callback, subscriptionId);
		manager.bindAndInitialize();
		return manager;
		}
		@@ -83,9 +83,9 @@ public class MbmsStreamingManager {
		* See {@link #create(Context, MbmsStreamingManagerCallback, int)}.
		*/
		public static MbmsStreamingManager create(Context context,
		MbmsStreamingManagerCallback listener)
		MbmsStreamingManagerCallback callback)
		throws MbmsException {
		return create(context, listener, SubscriptionManager.getDefaultSubscriptionId());
		return create(context, callback, SubscriptionManager.getDefaultSubscriptionId());
		}

		/**
		@@ -195,11 +195,22 @@ public class MbmsStreamingManager {
		public void onServiceConnected(ComponentName name, IBinder service) {
		IMbmsStreamingService streamingService =
		IMbmsStreamingService.Stub.asInterface(service);
		int result;
		try {
		streamingService.initialize(mCallbackToApp, mSubscriptionId);
		result = streamingService.initialize(mCallbackToApp, mSubscriptionId);
		} catch (RemoteException e) {
		Log.e(LOG_TAG, "Service died before initialization");
		return;
		} catch (RuntimeException e) {
		Log.e(LOG_TAG, "Runtime exception during initialization");
		mCallbackToApp.error(
		MbmsException.InitializationErrors.ERROR_UNABLE_TO_INITIALIZE,
		e.toString());
		return;
		}
		if (result != MbmsException.SUCCESS) {
		mCallbackToApp.error(result, "Error returned during initialization");
		return;
		}
		mService.set(streamingService);
		}

telephony/java/android/telephony/mbms/MbmsDownloadReceiver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -356,7 +356,7 @@ public class MbmsDownloadReceiver extends BroadcastReceiver {
		intent.getParcelableExtra(MbmsDownloadManager.EXTRA_SERVICE_INFO);
		File tempFileDir = MbmsUtils.getEmbmsTempFileDirForService(context,
		serviceInfo.getServiceId());
		List<Uri> filesInUse =
		final List<Uri> filesInUse =
		intent.getParcelableArrayListExtra(MbmsDownloadManager.EXTRA_TEMP_FILES_IN_USE);
		File[] filesToDelete = tempFileDir.listFiles(new FileFilter() {
		@Override

telephony/java/android/telephony/mbms/StreamingService.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -50,9 +50,14 @@ public class StreamingService {
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({REASON_BY_USER_REQUEST, REASON_END_OF_SESSION, REASON_FREQUENCY_CONFLICT,
		REASON_OUT_OF_MEMORY, REASON_NOT_CONNECTED_TO_HOMECARRIER_LTE,
		REASON_LEFT_MBMS_BROADCAST_AREA})
		REASON_LEFT_MBMS_BROADCAST_AREA, REASON_NONE})
		public @interface StreamingStateChangeReason {}

		/**
		* Indicates that the middleware does not have a reason to provide for the state change.
		*/
		public static final int REASON_NONE = 0;

		/**
		* State changed due to a call to {@link #stopStreaming()} or
		* {@link android.telephony.MbmsStreamingManager#startStreaming(StreamingServiceInfo, StreamingServiceCallback)}
		@@ -167,7 +172,7 @@ public class StreamingService {
		*
		* This may throw a {@link MbmsException} with the error code
		* {@link MbmsException#ERROR_MIDDLEWARE_LOST}
		* May also throw an {@link IllegalArgumentException} or an {@link IllegalStateException}
		* May also throw an {@link IllegalStateException}
		*/
		public void dispose() throws MbmsException {
		if (mService == null) {
		@@ -179,6 +184,8 @@ public class StreamingService {
		} catch (RemoteException e) {
		Log.w(LOG_TAG, "Remote process died");
		throw new MbmsException(MbmsException.ERROR_MIDDLEWARE_LOST);
		} catch (IllegalArgumentException e) {
		throw new IllegalStateException("StreamingService state inconsistent with middleware");
		} finally {
		mService = null;
		}

telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ import android.telephony.mbms.IDownloadProgressListener;
		*/
		interface IMbmsDownloadService
		{
		void initialize(int subId, IMbmsDownloadManagerCallback listener);
		int initialize(int subId, IMbmsDownloadManagerCallback listener);

		int getFileServices(int subId, in List<String> serviceClasses);