Merge branch 'LA.UM.5.5_rb1.10' of... (a416705e) · Commits · e / os / android_frameworks_opt_telephony

Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src/java) \
		$(call all-Iaidl-files-under, src/java) \
		$(call all-logtags-files-under, src/java)

		LOCAL_JAVA_LIBRARIES := voip-common ims-common
		LOCAL_JAVA_LIBRARIES := voip-common ims-common telephony-ext
		LOCAL_STATIC_JAVA_LIBRARIES := ims-ext-common
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE := telephony-common

resources/Android.mk

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_PACKAGE_NAME := telresources
		LOCAL_CERTIFICATE := platform
		LOCAL_MODULE_TAGS := optional eng
		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
		include $(BUILD_PACKAGE)
		include $(call all-makefiles-under,$(LOCAL_PATH))

resources/AndroidManifest.xml

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>

		<!-- Copyright (c) 2015, The Linux Foundation. All rights reserved.

		Redistribution and use in source and binary forms, with or without
		modification, are permitted provided that the following conditions are
		met:
		* Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
		* Redistributions in binary form must reproduce the above
		copyright notice, this list of conditions and the following
		disclaimer in the documentation and/or other materials provided
		with the distribution.
		* Neither the name of The Linux Foundation nor the names of its
		contributors may be used to endorse or promote products derived
		from this software without specific prior written permission.

		THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
		WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
		ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
		BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
		BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
		OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.frameworks.telresources"
		coreApp="true">

		<application android:process="com.qualcomm.telephony">
		</application>
		</manifest>

resources/res/values/config.xml

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (c) 2015, The Linux Foundation. All rights reserved.

		Redistribution and use in source and binary forms, with or without
		modification, are permitted provided that the following conditions are
		met:
		* Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
		* Redistributions in binary form must reproduce the above
		copyright notice, this list of conditions and the following
		disclaimer in the documentation and/or other materials provided
		with the distribution.
		* Neither the name of The Linux Foundation nor the names of its
		contributors may be used to endorse or promote products derived
		from this software without specific prior written permission.

		THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
		WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
		MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
		ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
		BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
		BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
		WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
		OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
		IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		-->

		<!-- These resources are around just to allow their values to be customized
		for different hardware and product builds. Do not translate. -->
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

		</resources>

src/java/android/provider/Telephony.java

+51 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,13 @@ public final class Telephony {
		* <p>Type: TEXT</p>
		*/
		public static final String CREATOR = "creator";

		/**
		* The priority of the message.
		* <P>Type: INTEGER</P>
		* @hide
		*/
		public static final String PRIORITY = "priority";
		}

		/**
		@@ -299,6 +306,7 @@ public final class Telephony {
		* @hide
		*/
		public static Cursor query(ContentResolver cr, String[] projection) {
		android.util.SeempLog.record(10);
		return cr.query(CONTENT_URI, projection, null, null, DEFAULT_SORT_ORDER);
		}

		@@ -308,6 +316,7 @@ public final class Telephony {
		*/
		public static Cursor query(ContentResolver cr, String[] projection,
		String where, String orderBy) {
		android.util.SeempLog.record(10);
		return cr.query(CONTENT_URI, projection, where,
		null, orderBy == null ? DEFAULT_SORT_ORDER : orderBy);
		}
		@@ -407,6 +416,31 @@ public final class Telephony {
		public static Uri addMessageToUri(int subId, ContentResolver resolver,
		Uri uri, String address, String body, String subject,
		Long date, boolean read, boolean deliveryReport, long threadId) {
		return addMessageToUri(subId, resolver, uri, address, body, subject,
		date, read, deliveryReport, threadId, -1);
		}

		/**
		* Add an SMS to the given URI with priority specified.
		*
		* @param resolver the content resolver to use
		* @param uri the URI to add the message to
		* @param address the address of the sender
		* @param body the body of the message
		* @param subject the psuedo-subject of the message
		* @param date the timestamp for the message
		* @param read true if the message has been read, false if not
		* @param deliveryReport true if a delivery report was requested, false if not
		* @param threadId the thread_id of the message
		* @param subId the sub_id which the message belongs to
		* @param priority the priority of the message
		* @return the URI for the new message
		* @hide
		*/
		public static Uri addMessageToUri(int subId, ContentResolver resolver,
		Uri uri, String address, String body, String subject,
		Long date, boolean read, boolean deliveryReport, long threadId,
		int priority) {
		ContentValues values = new ContentValues(8);
		Rlog.v(TAG,"Telephony addMessageToUri sub id: " + subId);

		@@ -418,6 +452,7 @@ public final class Telephony {
		values.put(READ, read ? Integer.valueOf(1) : Integer.valueOf(0));
		values.put(SUBJECT, subject);
		values.put(BODY, body);
		values.put(PRIORITY, priority);
		if (deliveryReport) {
		values.put(STATUS, STATUS_PENDING);
		}
		@@ -1823,6 +1858,20 @@ public final class Telephony {
		* <P>Type: INTEGER (boolean)</P>
		*/
		public static final String ARCHIVED = "archived";

		/**
		* Indicates the last mms type in the thread.
		* <P>Type: TEXT</P>
		* @hide
		*/
		public static final String ATTACHMENT_INFO = "attachment_info";

		/**
		* Indicates whether this thread is a notification thread.
		* <P>Type: INTEGER</P>
		* @hide
		*/
		public static final String NOTIFICATION = "notification";
		}

		/**
		@@ -1973,6 +2022,7 @@ public final class Telephony {
		*/
		public static Cursor query(
		ContentResolver cr, String[] projection) {
		android.util.SeempLog.record(10);
		return cr.query(CONTENT_URI, projection, null, null, DEFAULT_SORT_ORDER);
		}

		@@ -1983,6 +2033,7 @@ public final class Telephony {
		public static Cursor query(
		ContentResolver cr, String[] projection,
		String where, String orderBy) {
		android.util.SeempLog.record(10);
		return cr.query(CONTENT_URI, projection,
		where, null, orderBy == null ? DEFAULT_SORT_ORDER : orderBy);
		}