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

Commit e48569a8 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Guard against null Context in attachInfo()." into klp-dev

parents f03ceff2 10cb312e

core/java/android/content/ContentProvider.java

+4 −2
Original line number Diff line number Diff line
@@ -1573,8 +1573,10 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
         */

        if (mContext == null) {

            mContext = context;

            mTransport.mAppOpsManager = (AppOpsManager) mContext.getSystemService(

            if (context != null) {

                mTransport.mAppOpsManager = (AppOpsManager) context.getSystemService(

                        Context.APP_OPS_SERVICE);

            }

            mMyUid = Process.myUid();

            if (info != null) {

                setReadPermission(info.readPermission);