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

Commit e2bd6024 authored by Jack Nudelman's avatar Jack Nudelman Committed by Automerger Merge Worker
Browse files

Merge "Require calling package to be allowlisted for thermal mitigation." am:... 

Merge "Require calling package to be allowlisted for thermal mitigation." am: fdad0e26 am: d3b14cf1 am: 6176649c am: 74230cc4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634481

Change-Id: Ic40e9eacc54658bb2852478e7f5e5711a6fe574c
parents 96c7dead 74230cc4

telephony/java/android/telephony/TelephonyManager.java

+8 −2
Original line number Diff line number Diff line
@@ -15077,7 +15077,12 @@ public class TelephonyManager { 
     * DataThrottlingRequest#DATA_THROTTLING_ACTION_NO_DATA_THROTTLING} can still be requested in

     * order to undo the mitigations above it (i.e {@link

     * ThermalMitigationRequest#THERMAL_MITIGATION_ACTION_VOICE_ONLY} and/or {@link

     * ThermalMitigationRequest#THERMAL_MITIGATION_ACTION_RADIO_OFF}).

     * ThermalMitigationRequest#THERMAL_MITIGATION_ACTION_RADIO_OFF}). </p>

     *

     * <p> In addition to the {@link Manifest.permission#MODIFY_PHONE_STATE} permission, callers of

     * this API must also be listed in the device configuration as an authorized app in

     * {@code packages/services/Telephony/res/values/config.xml} under the

     * {@code thermal_mitigation_allowlisted_packages} key. </p>

     *

     * @param thermalMitigationRequest Thermal mitigation request. See {@link

     * ThermalMitigationRequest} for details.
@@ -15096,7 +15101,8 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.sendThermalMitigationRequest(getSubId(), thermalMitigationRequest);

                return telephony.sendThermalMitigationRequest(getSubId(), thermalMitigationRequest,

                        getOpPackageName());

            }

            throw new IllegalStateException("telephony service is null.");

        } catch (RemoteException ex) {

telephony/java/com/android/internal/telephony/ITelephony.aidl

+3 −1
Original line number Diff line number Diff line
@@ -2250,10 +2250,12 @@ interface ITelephony { 
     *

     * @param subId the id of the subscription

     * @param thermalMitigationRequest holds the parameters necessary for the request.

     * @param callingPackage the package name of the calling package.

     * @throws InvalidThermalMitigationRequestException if the parametes are invalid.

     */

    int sendThermalMitigationRequest(int subId,

            in ThermalMitigationRequest thermalMitigationRequest);

            in ThermalMitigationRequest thermalMitigationRequest,

            String callingPackage);



    /**

     * get the Generic Bootstrapping Architecture authentication keys