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

Commit fa2bd6e5 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android Git Automerger
Browse files

am 5eef9d48: Merge "Restore OP_READ_PHONE_STATE check" into mnc-dev 

* commit '5eef9d48':
  Restore OP_READ_PHONE_STATE check
parents 9056b2a8 5eef9d48

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

+2 −5
Original line number Original line Diff line number Diff line
@@ -369,10 +369,7 @@ public class PhoneSubInfo { 
        mContext.enforceCallingOrSelfPermission(

        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.READ_PHONE_STATE, message);

                android.Manifest.permission.READ_PHONE_STATE, message);





        return true;

        return mAppOps.noteOp(AppOpsManager.OP_READ_PHONE_STATE, Binder.getCallingUid(),

        // TODO b/21726452 enforce OP_READ_PHONE_STATE once

                callingPackage) == AppOpsManager.MODE_ALLOWED;

        // PhoneInterfaceManager.getMergedSubscriberIds got fixed

        // return mAppOps.noteOp(AppOpsManager.OP_READ_PHONE_STATE, Binder.getCallingUid(),

        // callingPackage) == AppOpsManager.MODE_ALLOWED;

    }

    }

}
 
}