commit c29791d56abbbbaef9786f5d25ecc6c32975bd9f
author Andreas Gampe <agampe@google.com> Mon Apr 27 15:06:46 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 27 15:06:48 2015 +0000
tree 83f82317164f5cadd8ef4830a5f1833cba67a2ac
parent cf6fc5ee13e549c6ce1a6a4fc417aa13fc0dfa17
parent a876b35d485008b690578889d11e69b40d4e7170

Merge "Frameworks/base: Add debug.gencfi property"

core/java/android/net/Uri.java

diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
index fb2f445..5453283 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -1657,7 +1657,7 @@
     /**
      * Searches the query string for the first value with the given key.
      *
-     * <p><strong>Warning:</strong> Prior to Ice Cream Sandwich, this decoded
+     * <p><strong>Warning:</strong> Prior to Jelly Bean, this decoded
      * the '+' character as '+' rather than ' '.
      *
      * @param key which will be encoded

libs/androidfw/ObbFile.cpp

diff --git a/libs/androidfw/ObbFile.cpp b/libs/androidfw/ObbFile.cpp
index 195fa9a..95332a3 100644
--- a/libs/androidfw/ObbFile.cpp
+++ b/libs/androidfw/ObbFile.cpp
@@ -337,7 +337,9 @@
         return false;
     }
 
-    ftruncate(fd, mFooterStart);
+    if (ftruncate(fd, mFooterStart) == -1) {
+        return false;
+    }
 
     return true;
 }