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

2013-09-17 22:38:17 +00:00
parent f03ceff2f5 10cb312ecd
commit e48569a870
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -1573,8 +1573,10 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
         */
        if (mContext == null) {
            mContext = context;
-            mTransport.mAppOpsManager = (AppOpsManager) mContext.getSystemService(
-                    Context.APP_OPS_SERVICE);
+            if (context != null) {
+                mTransport.mAppOpsManager = (AppOpsManager) context.getSystemService(
+                        Context.APP_OPS_SERVICE);
+            }
            mMyUid = Process.myUid();
            if (info != null) {
                setReadPermission(info.readPermission);