commit b3f35041aa50839e5d8ed3a4ad72e6eef2cb4ea6
author Android (Google) Code Review <android-gerrit@google.com> Tue Nov 17 14:23:36 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 17 14:23:36 2009 -0800
tree d98cae1b6cc0d11b646207c6b265763dbc10d80a
parent df7dbb68d330eae88c1ca6d03390dc8c18386871
parent 05df33ea748d1c497206302f62886f73c7ff1f93

Merge change I86db22ef into eclair

* changes:
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.

services/java/com/android/server/status/StatusBarService.java

diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java
index 8d73904..1db20df 100644
--- a/services/java/com/android/server/status/StatusBarService.java
+++ b/services/java/com/android/server/status/StatusBarService.java
@@ -85,10 +85,8 @@
 public class StatusBarService extends IStatusBar.Stub
 {
     static final String TAG = "StatusBar";
-    static final boolean DEBUG = false;
     static final boolean SPEW = false;
-    static final boolean DBG = false;
-        
+
     static final int EXPANDED_LEAVE_ALONE = -10000;
     static final int EXPANDED_FULL_OPEN = -10001;
 
@@ -656,7 +654,7 @@
 
     /* private */ void performAddUpdateIcon(IBinder key, IconData data, NotificationData n)
                         throws StatusBarException {
-        if (DBG) {
+        if (SPEW) {
             Log.d(TAG, "performAddUpdateIcon icon=" + data + " notification=" + n + " key=" + key);
         }
         // notification
@@ -748,7 +746,7 @@
 
     /* private */ void performSetIconVisibility(IBinder key, boolean visible) {
         synchronized (mIconMap) {
-            if (DBG) {
+            if (SPEW) {
                 Log.d(TAG, "performSetIconVisibility key=" + key + " visible=" + visible);
             }
             StatusBarIcon icon = mIconMap.get(key);
@@ -758,7 +756,7 @@
     
     /* private */ void performRemoveIcon(IBinder key) {
         synchronized (this) {
-            if (DBG) {
+            if (SPEW) {
                 Log.d(TAG, "performRemoveIcon key=" + key);
             }
             StatusBarIcon icon = mIconMap.remove(key);
@@ -997,7 +995,7 @@
     }
     
     void performExpand() {
-        if (SPEW) Log.d(TAG, "Perform expand: expanded=" + mExpanded);
+        if (SPEW) Log.d(TAG, "performExpand: mExpanded=" + mExpanded);
         if ((mDisabled & StatusBarManager.DISABLE_EXPAND) != 0) {
             return ;
         }
@@ -1022,8 +1020,8 @@
     }
 
     void performCollapse() {
-        if (SPEW) Log.d(TAG, "Perform collapse: expanded=" + mExpanded
-                + " expanded visible=" + mExpandedVisible);
+        if (SPEW) Log.d(TAG, "performCollapse: mExpanded=" + mExpanded
+                + " mExpandedVisible=" + mExpandedVisible);
         
         if (!mExpandedVisible) {
             return;
@@ -1668,7 +1666,7 @@
         // act accordingly
         if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {
             if ((net & StatusBarManager.DISABLE_EXPAND) != 0) {
-                performCollapse();
+                animateCollapse();
             }
         }
         if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {