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

Commit ad6db4f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not check permission multiple times." into nyc-mr1-dev

parents 232c49a3 ef6b720f

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");