commit e4c453dd1e48ce1f986bc3e0e0df6f15cbeef55a
author Jason Sams <rjsams@android.com> Tue Jan 04 23:17:31 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 04 23:17:31 2011 -0800
tree 760e038b87c7a3ed057721778b582da16f220853
parent a01ac783c23070e07a260b90723d2ffe2a0ab224
parent cfc2330c4eb42c8e71d00d1a13e84089adcbd595

Merge "fix build"

core/java/android/content/pm/PackageParser.java

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 9cfe2db..ad74707 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1508,18 +1508,12 @@
             ai.nonLocalizedLabel = v.coerceToString();
         }
 
-        int defaultTheme = 0;
-        if (owner.applicationInfo.targetSdkVersion >= android.os.Build.VERSION_CODES.HONEYCOMB) {
-            // As of honeycomb, the default application theme is holographic.
-            defaultTheme = android.R.style.Theme_Holo;
-        }
-
         ai.icon = sa.getResourceId(
                 com.android.internal.R.styleable.AndroidManifestApplication_icon, 0);
         ai.logo = sa.getResourceId(
                 com.android.internal.R.styleable.AndroidManifestApplication_logo, 0);
         ai.theme = sa.getResourceId(
-                com.android.internal.R.styleable.AndroidManifestApplication_theme, defaultTheme);
+                com.android.internal.R.styleable.AndroidManifestApplication_theme, 0);
         ai.descriptionRes = sa.getResourceId(
                 com.android.internal.R.styleable.AndroidManifestApplication_description, 0);
 

core/java/android/view/ContextThemeWrapper.java

diff --git a/core/java/android/view/ContextThemeWrapper.java b/core/java/android/view/ContextThemeWrapper.java
index 2045a98..ae938e7 100644
--- a/core/java/android/view/ContextThemeWrapper.java
+++ b/core/java/android/view/ContextThemeWrapper.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.res.Resources;
+import android.os.Build;
 
 /**
  * A ContextWrapper that allows you to modify the theme from what is in the 
@@ -56,7 +57,10 @@
         }
 
         if (mThemeResource == 0) {
-            mThemeResource = com.android.internal.R.style.Theme;
+            mThemeResource = (getApplicationInfo().targetSdkVersion
+                    >= Build.VERSION_CODES.HONEYCOMB)
+                            ? com.android.internal.R.style.Theme_Holo
+                            : com.android.internal.R.style.Theme;
         }
         initializeTheme();
 

libs/camera/Camera.cpp

diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp
index 450971d..ab626ad 100644
--- a/libs/camera/Camera.cpp
+++ b/libs/camera/Camera.cpp
@@ -80,8 +80,9 @@
         c->mStatus = NO_ERROR;
         c->mCamera = camera;
         camera->asBinder()->linkToDeath(c);
+        return c;
     }
-    return c;
+    return 0;
 }
 
 void Camera::init()