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

Commit 2fa880d0 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Implement getDownloadStatus and add permission"

parents aff0d1af 55f557dc

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -550,7 +550,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
@@ -114,6 +114,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
@@ -206,6 +206,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
@@ -114,6 +114,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
@@ -1605,6 +1605,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