merge in nyc-release history after reset to nyc-dev
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 @@
/** 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 @@
// 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);
diff --git a/src/com/android/providers/calendar/SQLiteContentProvider.java b/src/com/android/providers/calendar/SQLiteContentProvider.java
index 01afb23..53fc7e7 100644
--- a/src/com/android/providers/calendar/SQLiteContentProvider.java
+++ b/src/com/android/providers/calendar/SQLiteContentProvider.java
@@ -29,6 +29,7 @@
import android.os.Binder;
import android.os.Process;
import android.provider.CalendarContract;
+import android.util.Log;
import java.util.ArrayList;
@@ -304,8 +305,7 @@
String callingPackage = getCallingPackage();
mCallingPackage.set(callingPackage);
} catch (SecurityException e) {
- // If this exception is thrown, clearCallingIdentity has already been called, and
- // calling package is already available.
+ Log.e(TAG, "Error getting the calling package.", e);
}
}
