Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2438894d authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 5849606d: merge from open-source master 

Merge commit '5849606d' into kraken

* commit '5849606d':
  Fix typos in comment.
  CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.
parents f29c7d4d 5849606d

graphics/java/android/graphics/Color.java

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ import java.util.Locale; 
 * (green << 8) | blue. Each component ranges between 0..255 with 0

 * meaning no contribution for that component, and 255 meaning 100%

 * contribution. Thus opaque-black would be 0xFF000000 (100% opaque but

 * no contributes from red, gree, blue, and opaque-white would be 0xFFFFFFFF

 * no contributions from red, green, or blue), and opaque-white would be

 * 0xFFFFFFFF

 */

public class Color {

    public static final int BLACK       = 0xFF000000;