Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I11c8750cc9c8cb4c13370f0b30ed087c84629fa5
This commit is contained in:
Jack Nudelman
2021-03-23 13:29:37 +00:00
committed by Automerger Merge Worker
parent cf8c92b0d7 d3b14cf1fe
commit 6176649cce
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -14570,7 +14570,12 @@ public class TelephonyManager {
* DataThrottlingRequest#DATA_THROTTLING_ACTION_NO_DATA_THROTTLING} can still be requested in * DataThrottlingRequest#DATA_THROTTLING_ACTION_NO_DATA_THROTTLING} can still be requested in
* order to undo the mitigations above it (i.e {@link * order to undo the mitigations above it (i.e {@link
* ThermalMitigationRequest#THERMAL_MITIGATION_ACTION_VOICE_ONLY} and/or {@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 * @param thermalMitigationRequest Thermal mitigation request. See {@link
* ThermalMitigationRequest} for details. * ThermalMitigationRequest} for details.
@@ -14589,7 +14594,8 @@ public class TelephonyManager {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
return telephony.sendThermalMitigationRequest(getSubId(), thermalMitigationRequest); return telephony.sendThermalMitigationRequest(getSubId(), thermalMitigationRequest,
getOpPackageName());
} }
throw new IllegalStateException("telephony service is null."); throw new IllegalStateException("telephony service is null.");
} catch (RemoteException ex) { } catch (RemoteException ex) {

4
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -2236,10 +2236,12 @@ interface ITelephony {
* *
* @param subId the id of the subscription * @param subId the id of the subscription
* @param thermalMitigationRequest holds the parameters necessary for the request. * @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. * @throws InvalidThermalMitigationRequestException if the parametes are invalid.
*/ */
int sendThermalMitigationRequest(int subId, int sendThermalMitigationRequest(int subId,
in ThermalMitigationRequest thermalMitigationRequest); in ThermalMitigationRequest thermalMitigationRequest,
String callingPackage);
/** /**
* Get the Generic Bootstrapping Architecture authentication keys * Get the Generic Bootstrapping Architecture authentication keys