Merge changes from topics "getLine1Number fix", "sms_corruption", "Initial RCS CL" am: 1e8399f1ab (62f9aa44) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -546,6 +546,7 @@ java_defaults {
		"telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl",
		"telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl",
		"telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl",
		"telephony/java/com/android/internal/telephony/IRcs.aidl",
		"telephony/java/com/android/internal/telephony/ISms.aidl",
		"telephony/java/com/android/internal/telephony/ISub.aidl",
		"telephony/java/com/android/internal/telephony/IAns.aidl",

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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 android.telephony;

		import android.os.RemoteException;
		import android.os.ServiceManager;

		import com.android.internal.telephony.IRcs;

		/**
		* RcsManager is the application interface to RcsProvider and provides access methods to
		* RCS related database tables.
		* @hide - TODO make this public
		*/
		public class RcsManager {
		private static final String TAG = "RcsManager";
		private static final boolean VDBG = false;

		/**
		* Delete the RcsThread identified by the given threadId.
		* @param threadId threadId of the thread to be deleted.
		*/
		public void deleteThread(int threadId) {
		if (VDBG) logd("deleteThread: threadId: " + threadId);
		try {
		IRcs iRcs = IRcs.Stub.asInterface(ServiceManager.getService("ircs"));
		if (iRcs != null) {
		iRcs.deleteThread(threadId);
		}
		} catch (RemoteException re) {

		}
		}

		private static void logd(String msg) {
		Rlog.d(TAG, msg);
		}
		}

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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;

		interface IRcs {
		void deleteThread(int threadId);
		}
		No newline at end of file

+12 −2

Original line number	Diff line number	Diff line
		@@ -491,4 +491,14 @@ public class TelephonyIntents {
		*/
		public static final String ACTION_CARRIER_CERTIFICATE_DOWNLOAD =
		"com.android.internal.telephony.ACTION_CARRIER_CERTIFICATE_DOWNLOAD";

		/**
		* Broadcast action to indicate an error related to Line1Number has been detected.
		*
		* Requires the READ_PRIVILEGED_PHONE_STATE permission.
		*
		* @hide
		*/
		public static final String ACTION_LINE1_NUMBER_ERROR_DETECTED =
		"com.android.internal.telephony.ACTION_LINE1_NUMBER_ERROR_DETECTED";
		}