Merge "Delete ITelephonyDebug and ITelephonyDebugSubscriber" into nyc-dev (5b2e5316) · Commits · e / os / android_frameworks_base

Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -442,8 +442,6 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/ISms.aidl \
		telephony/java/com/android/internal/telephony/ISub.aidl \
		telephony/java/com/android/internal/telephony/ITelephony.aidl \
		telephony/java/com/android/internal/telephony/ITelephonyDebug.aidl \
		telephony/java/com/android/internal/telephony/ITelephonyDebugSubscriber.aidl \
		telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
		telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \

telephony/java/com/android/internal/telephony/ITelephonyDebug.aidl

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony;

		import com.android.internal.telephony.ITelephonyDebugSubscriber;

		import android.os.Bundle;

		/**
		* Interface used to interact with the Telephony debug service.
		*
		* {@hide}
		*/
		interface ITelephonyDebug {

		/**
		* Write telephony event
		* @param timestamp returned by System.currentTimeMillis()
		* @param phoneId for which event is written
		* @param tag constant defined in TelephonyEventLog
		* @param param1 optional
		* @param param2 optional
		* @param data optional
		*/
		void writeEvent(long timestamp, int phoneId, int tag, int param1, int param2, in Bundle data);

		void subscribe(in ITelephonyDebugSubscriber subscriber);
		void unsubscribe(in ITelephonyDebugSubscriber subscriber);
		}

telephony/java/com/android/internal/telephony/ITelephonyDebugSubscriber.aidl

deleted100644 → 0

+0 −34

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony;

		import com.android.internal.telephony.TelephonyEvent;

		import android.os.Bundle;

		/**
		* Interface used to subscribe for events from Telephony debug service.
		*
		* {@hide}
		*/
		oneway interface ITelephonyDebugSubscriber {

		/**
		* Called when Telephony debug service has events.
		*/
		void onEvents(in TelephonyEvent[] events);
		}

telephony/java/com/android/internal/telephony/TelephonyEvent.aidl

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony;

		parcelable TelephonyEvent;

telephony/java/com/android/internal/telephony/TelephonyEvent.java

deleted100644 → 0

+0 −84

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.telephony;

		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* A parcelable used in ITelephonyDebugSubscriber.aidl
		*/
		public class TelephonyEvent implements Parcelable {

		final public long timestamp;
		final public int phoneId;
		final public int tag;
		final public int param1;
		final public int param2;
		final public Bundle data;

		public TelephonyEvent(long timestamp, int phoneId, int tag,
		int param1, int param2, Bundle data) {
		this.timestamp = timestamp;
		this.phoneId = phoneId;
		this.tag = tag;
		this.param1 = param1;
		this.param2 = param2;
		this.data = data;
		}

		/** Implement the Parcelable interface */
		public static final Parcelable.Creator<TelephonyEvent> CREATOR
		= new Parcelable.Creator<TelephonyEvent> (){
		public TelephonyEvent createFromParcel(Parcel source) {
		final long timestamp = source.readLong();
		final int phoneId = source.readInt();
		final int tag = source.readInt();
		final int param1 = source.readInt();
		final int param2 = source.readInt();
		final Bundle data = source.readBundle();
		return new TelephonyEvent(timestamp, phoneId, tag, param1, param2, data);
		}

		public TelephonyEvent[] newArray(int size) {
		return new TelephonyEvent[size];
		}
		};

		/** Implement the Parcelable interface */
		@Override
		public int describeContents() {
		return 0;
		}

		/** Implement the Parcelable interface */
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeLong(timestamp);
		dest.writeInt(phoneId);
		dest.writeInt(tag);
		dest.writeInt(param1);
		dest.writeInt(param2);
		dest.writeBundle(data);
		}

		public String toString() {
		return String.format("%d,%d,%d,%d,%d,%s",
		timestamp, phoneId, tag, param1, param2, data);
		}
		}