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

Commit 10cb312e authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Guard against null Context in attachInfo(). 

Some CTS tests were running into this.

Bug: 10805216
Change-Id: I425d2a0064612af70a64f457e159498cb6257a28
parent 6df7d4a5

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