Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev (cb9dc98c) · Commits · e / os / android_frameworks_base

core/java/android/service/carrier/CarrierService.java

+3 −23

Original line number	Diff line number	Diff line
		@@ -17,13 +17,10 @@ package android.service.carrier;
		import android.annotation.CallSuper;
		import android.app.Service;
		import android.content.Intent;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.PersistableBundle;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.ServiceManager;
		import android.util.Log;

		import com.android.internal.telephony.ITelephonyRegistry;

		@@ -51,8 +48,6 @@ import com.android.internal.telephony.ITelephonyRegistry;
		*/
		public abstract class CarrierService extends Service {

		private static final String LOG_TAG = "CarrierService";

		public static final String CARRIER_SERVICE_INTERFACE = "android.service.carrier.CarrierService";

		private static ITelephonyRegistry sRegistry;
		@@ -138,26 +133,11 @@ public abstract class CarrierService extends Service {
		/**
		* A wrapper around ICarrierService that forwards calls to implementations of
		* {@link CarrierService}.
		* @hide
		*/
		public class ICarrierServiceWrapper extends ICarrierService.Stub {
		/** @hide */
		public static final int RESULT_OK = 0;
		/** @hide */
		public static final int RESULT_ERROR = 1;
		/** @hide */
		public static final String KEY_CONFIG_BUNDLE = "config_bundle";

		private class ICarrierServiceWrapper extends ICarrierService.Stub {
		@Override
		public void getCarrierConfig(CarrierIdentifier id, ResultReceiver result) {
		try {
		Bundle data = new Bundle();
		data.putParcelable(KEY_CONFIG_BUNDLE, CarrierService.this.onLoadConfig(id));
		result.send(RESULT_OK, data);
		} catch (Exception e) {
		Log.e(LOG_TAG, "Error in onLoadConfig: " + e.getMessage(), e);
		result.send(RESULT_ERROR, null);
		}
		public PersistableBundle getCarrierConfig(CarrierIdentifier id) {
		return CarrierService.this.onLoadConfig(id);
		}
		}
		}

core/java/android/service/carrier/ICarrierService.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package android.service.carrier;

		import android.os.PersistableBundle;
		import android.os.ResultReceiver;
		import android.service.carrier.CarrierIdentifier;

		/**
		@@ -29,5 +28,5 @@ import android.service.carrier.CarrierIdentifier;
		interface ICarrierService {

		/** @see android.service.carrier.CarrierService#onLoadConfig */
		oneway void getCarrierConfig(in CarrierIdentifier id, in ResultReceiver result);
		PersistableBundle getCarrierConfig(in CarrierIdentifier id);
		}