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

Commit 71e1fe23 authored by Xin Li's avatar Xin Li
Browse files

Merge QQ1A.191205.011 into stage-aosp-master 

Bug: 144955631
Merged-In: I62defbbaaf494525c38d7c262c0cd74d3eeb43e2
Change-Id: I367ef12c59131802f4503f99c68a0a2980fe2ef7
parents 766d8c26 d3b8f283

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

+2 −2
Original line number Diff line number Diff line
@@ -398,8 +398,8 @@ public class CellBroadcastHandler extends WakeLockStateMachine { 
        }



        private boolean hasPermission(String permission) {

            return PermissionChecker.checkCallingOrSelfPermissionForDataDelivery(mContext, permission)

                    == PERMISSION_GRANTED;

            return PermissionChecker.checkCallingOrSelfPermissionForDataDelivery(mContext,

                    permission) == PERMISSION_GRANTED;

        }



        private final LocationListener mLocationListener = new LocationListener() {