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

Commit 19b49f6c authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Implement getDownloadStatus and add permission" am: 2fa880d0 am: d45a0072 am: 9888af1d 

am: 81d9c6fe

Change-Id: Ida7f8cfd440553658108688b84f866dddafa3166
parents 1ecf426f 81d9c6fe

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -644,7 +644,6 @@ include $(CLEAR_VARS) 


aidl_files := \

        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/FileServiceInfo.aidl \

        frameworks/base/telephony/java/android/telephony/mbms/ServiceInfo.aidl \

api/current.txt

+1 −0
Original line number 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_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 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_SMS = "android.permission.SEND_SMS";

    field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,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 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 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_SMS = "android.permission.SEND_SMS";

    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 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_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 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_SMS = "android.permission.SEND_SMS";

    field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -1694,6 +1694,10 @@ 
    <permission android:name="android.permission.RECEIVE_STK_COMMANDS"

        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

         system can bind to it.

         <p>Protection level: signature|privileged