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

Commit ef6b720f authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Do not check permission multiple times. 

ag/827318 on L should have been DO NOT MERGE. As a result of
automerge this bug got introduced in M which leads to duplicate
permission checks.

Bug: 29233690
Change-Id: Ifb2c8773c6fa404b747ba3a6c2f0e7fce3c90cb2
parent 5523cc4c

src/java/com/android/internal/telephony/PhoneSubInfoController.java

+0 −3
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 
        }

        final Phone phone = mPhone[phoneId];

        if (phone != null) {

            phone.getContext().enforceCallingOrSelfPermission(

                    android.Manifest.permission.READ_PHONE_STATE,

                    "Requires READ_PHONE_STATE");

            return phone.getDeviceId();

        } else {

            loge("getDeviceIdForPhone phone " + phoneId + " is null");