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

Commit 8d9edfc3 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-5.1.1_r35' into HEAD 

Android 5.1.1 release 35
Ticket: CYNGNOS-1854

Change-Id: I290bf8b971a1a1ba222ca3ba95eeabab9cab5338
parents 062cafc2 572af2dd

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

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 
    public String getDeviceIdForPhone(int phoneId) {

        Phone phone = getPhone(phoneId);

        if (phone != null) {

            phone.getContext().enforceCallingOrSelfPermission(

                    android.Manifest.permission.READ_PHONE_STATE,

                    "Requires READ_PHONE_STATE");

            return phone.getDeviceId();

        } else {

            Rlog.e(TAG,"getDeviceIdForPhone phone " + phoneId + " is null");