Merge \\"CalendarProvider2: log failures to get the cached calling package.\\" into nyc-dev am: bcc65b8d27

am: e34e1daee9

Change-Id: I4531bcbb4c564f5eda603738f8acd57b26a3da80

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java
index cfc1269..5b78b50 100644
--- a/src/com/android/providers/calendar/CalendarProvider2.java
+++ b/src/com/android/providers/calendar/CalendarProvider2.java
@@ -436,6 +436,8 @@ public class CalendarProvider2 extends SQLiteContentProvider implements OnAccoun
     /** set to 'true' to enable debug logging for recurrence exception code */
     private static final boolean DEBUG_EXCEPTION = false;
 
+    private final ThreadLocal<Boolean> mCallingPackageErrorLogged = new ThreadLocal<Boolean>();
+
     private Context mContext;
     private ContentResolver mContentResolver;
 
@@ -5083,7 +5085,10 @@ public class CalendarProvider2 extends SQLiteContentProvider implements OnAccoun
             // If the calling package is null, use the best available as a fallback.
             return getCachedCallingPackage();
         }
-
+        if (!Boolean.TRUE.equals(mCallingPackageErrorLogged.get())) {
+            Log.e(TAG, "Failed to get the cached calling package.", new Throwable());
+            mCallingPackageErrorLogged.set(Boolean.TRUE);
+        }
         final PackageManager pm = getContext().getPackageManager();
         final int uid = Binder.getCallingUid();
         final String[] packages = pm.getPackagesForUid(uid);