Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'e48569a87057e46a30d3dcbb2d788a4e4da7f21c':
  Guard against null Context in attachInfo().
This commit is contained in:
Jeff Sharkey
2013-09-17 15:40:56 -07:00
committed by Android Git Automerger
parent 144835aef8 e48569a870
commit cf4052f6b5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/ContentProvider.java
View File

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