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

Commit cf4052f6 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

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

* commit 'e48569a8':
  Guard against null Context in attachInfo().
parents 144835ae e48569a8

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);