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

Commit d64fd6ad authored by Arun kumar Voddu's avatar Arun kumar Voddu Committed by Automerger Merge Worker
Browse files

Merge "New hidden API to support the CTS test case that checks the file... 

Merge "New hidden API to support the CTS test case that checks the file contents remains unaltered." into udc-dev am: 0fa26314 am: a0cbcf65

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



Change-Id: I4864b00823f63c3f02dd06d2ff4f8880c33b19e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e4c5a8c a0cbcf65

telephony/java/android/telephony/TelephonyManager.java

+23 −0
Original line number Diff line number Diff line
@@ -13296,6 +13296,29 @@ public class TelephonyManager { 
        }

    }













    /**













     * Test API to verify carrier restriction status allow list i.e.













     * packages/services/Telephony/assets/CarrierRestrictionOperatorDetails.json.













     *













     * @param pkgName : packaga name of the entry to verify













     * @param carrierId : carrier Id of the entry













     * @return {@code List<String>} : list of registered shaIds













     * @hide













     */













    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)













    public List<String> getShaIdFromAllowList(String pkgName, int carrierId) {













        try {













            ITelephony service = getITelephony();













            if (service != null) {













                return service.getShaIdFromAllowList(pkgName, carrierId);













            }













        } catch (RemoteException ex) {













            Rlog.e(TAG, "getShaIdFromAllowList: RemoteException = " + ex);













            throw ex.rethrowAsRuntimeException();













        }













        return Collections.EMPTY_LIST;













    }



























    /**















     * Used to enable or disable carrier data by the system based on carrier signalling or















     * carrier privileged apps. Different from {@link #setDataEnabled(boolean)} which is linked to

























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



+7
−0




























Original line number
Diff line number
Diff line








@@ -3037,4 +3037,11 @@ interface ITelephony {













     * @return {@code true} if the timeout duration is set successfully, {@code false} otherwise.















     */















    boolean setSatelliteDeviceAlignedTimeoutDuration(long timeoutMillis);



























    /**













     * Test method to confirm the file contents are not altered.













     */













     @JavaPassthrough(annotation="@android.annotation.RequiresPermission("













                 + "android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)")













     List<String> getShaIdFromAllowList(String pkgName, int carrierId);















}