Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9888af1d authored Jul 12, 2017 by Hall Liu Committed by android-build-merger Jul 12, 2017

Merge "Implement getDownloadStatus and add permission" am: 2fa880d0

am: d45a0072

Change-Id: I31e9dddaf3086f885f1a75c88583953da95c8191

parents 47088d2d d45a0072

Android.mk

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -615,7 +615,6 @@ include $(CLEAR_VARS)

	aidl_files := \		aidl_files := \
	frameworks/base/telephony/java/android/telephony/mbms/DownloadRequest.aidl \		frameworks/base/telephony/java/android/telephony/mbms/DownloadRequest.aidl \
	frameworks/base/telephony/java/android/telephony/mbms/DownloadStatus.aidl \
	frameworks/base/telephony/java/android/telephony/mbms/FileInfo.aidl \		frameworks/base/telephony/java/android/telephony/mbms/FileInfo.aidl \
	frameworks/base/telephony/java/android/telephony/mbms/FileServiceInfo.aidl \		frameworks/base/telephony/java/android/telephony/mbms/FileServiceInfo.aidl \
	frameworks/base/telephony/java/android/telephony/mbms/ServiceInfo.aidl \		frameworks/base/telephony/java/android/telephony/mbms/ServiceInfo.aidl \

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -121,6 +121,7 @@ package android {
	field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";		field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";
	field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES";		field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES";
	field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";		field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
			field public static final java.lang.String SEND_EMBMS_INTENTS = "android.permission.SEND_EMBMS_INTENTS";
	field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";		field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
	field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";		field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";
	field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";		field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -221,6 +221,7 @@ package android {
	field public static final java.lang.String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT";		field public static final java.lang.String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT";
	field public static final java.lang.String REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS";		field public static final java.lang.String REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS";
	field public static final java.lang.String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS";		field public static final java.lang.String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS";
			field public static final java.lang.String SEND_EMBMS_INTENTS = "android.permission.SEND_EMBMS_INTENTS";
	field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";		field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
	field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";		field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";
	field public static final java.lang.String SEND_SMS_NO_CONFIRMATION = "android.permission.SEND_SMS_NO_CONFIRMATION";		field public static final java.lang.String SEND_SMS_NO_CONFIRMATION = "android.permission.SEND_SMS_NO_CONFIRMATION";

api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -121,6 +121,7 @@ package android {
	field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";		field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";
	field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES";		field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES";
	field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";		field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
			field public static final java.lang.String SEND_EMBMS_INTENTS = "android.permission.SEND_EMBMS_INTENTS";
	field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";		field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
	field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";		field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";
	field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";		field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

core/res/AndroidManifest.xml

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1671,6 +1671,10 @@
	<permission android:name="android.permission.RECEIVE_STK_COMMANDS"		<permission android:name="android.permission.RECEIVE_STK_COMMANDS"
	android:protectionLevel="signature\|privileged" />		android:protectionLevel="signature\|privileged" />

			<!-- Allows an application to send EMBMS download intents to apps-->
			<permission android:name="android.permission.SEND_EMBMS_INTENTS"
			android:protectionLevel="signature\|privileged" />

	<!-- Must be required by an ImsService to ensure that only the		<!-- Must be required by an ImsService to ensure that only the
	system can bind to it.		system can bind to it.
	<p>Protection level: signature\|privileged		<p>Protection level: signature\|privileged