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

Commit a793dee4 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

(Backport) No need to use PermissionChecker when checking own permission

Test: Built
Change-Id: Ib5ddcf6912808e1e61967858e5119cfbf7056b3e
Merged-In: I9041d426bd892a997777ea31c869746671ee16af
parent 84045fbe
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

package com.android.internal.telephony;

import static android.content.PermissionChecker.PERMISSION_GRANTED;
import static android.provider.Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG;

import android.Manifest;
@@ -27,7 +26,6 @@ import android.app.AppOpsManager;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.content.PermissionChecker;
import android.content.pm.PackageManager;
import android.location.Location;
import android.location.LocationListener;
@@ -37,6 +35,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.os.Process;
import android.os.UserHandle;
import android.provider.Settings;
import android.provider.Telephony;
@@ -415,8 +414,8 @@ public class CellBroadcastHandler extends WakeLockStateMachine {
        }

        private boolean hasPermission(String permission) {
            return PermissionChecker.checkCallingOrSelfPermissionForDataDelivery(mContext,
                    permission) == PERMISSION_GRANTED;
        return mContext.checkPermission(permission, Process.myPid(), Process.myUid())
                    == PackageManager.PERMISSION_GRANTED;
        }

        private final LocationListener mLocationListener = new LocationListener() {