124705 Commits

Author SHA1 Message Date
Jason Sams
659a05a25c am edf0b79d: am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."
* commit 'edf0b79d55df17fddb6b96de32f34ffccc8ec2d4':
  Validate objects are from the correct context.
2014-03-06 02:29:06 +00:00
Fabrice Di Meglio
5cdb8d1d99 am 9c918534: (-s ours) am db3e7782: am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '9c9185348ad2487aad043c565fe221b4a56ef0b9':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 02:29:01 +00:00
Fabrice Di Meglio
2af0f354f5 am dfb76305: (-s ours) am 1eb5c055: am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit 'dfb76305c78ac596cf025e3410a04bd8221cfeab':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 02:28:58 +00:00
Filip Gruszczyński
b50cea0267 resolved conflicts for merge of 1569d61f to master
Change-Id: I5bc751a2ae52a8d7542b5b49d27fc90b4a1c7673
2014-03-05 17:56:40 -08:00
Christopher Tate
cb20740ee1 Fix build. Silly gits.
Change-Id: I8f21b7239621da500d9a73eb17d350e06dda9b20
2014-03-05 17:22:25 -08:00
Jason Sams
edf0b79d55 am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."
* commit '24ea88a986cfb6de7197b213ad933a6eb6f0e285':
  Validate objects are from the correct context.
2014-03-06 01:03:09 +00:00
Jason Sams
24ea88a986 am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."
* commit '9a9916b58fb22da735d18a03beffb24b4d5cd9a3':
  Validate objects are from the correct context.
2014-03-06 00:59:17 +00:00
David 'Digit' Turner
fd2c77ca24 am 4bd720c2: am a05e7526: am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
* commit '4bd720c2c63b2400437db971ac96616693a8fe3b':
  aidl: Support building with updated host sysroot.
2014-03-06 00:59:15 +00:00
Dianne Hackborn
f0dd80f673 am a984c582: am 75870cf3: am 75374879: am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump.
* commit 'a984c5828749185ce560aa1e29661a5dadc93fbd':
  Issue #13308712: Add --checkin to package manager dump.
2014-03-06 00:59:12 +00:00
Svetoslav
58af2ac338 am 28ba546c: am 8c6ed03c: am 1caa092f: Allow click listener registration in NumberPicker.
* commit '28ba546c91418978f18a3da5e265e27d57d4f14e':
  Allow click listener registration in NumberPicker.
2014-03-06 00:59:09 +00:00
Jason Sams
9a9916b58f am 2383f220: Merge "Validate objects are from the correct context."
* commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa':
  Validate objects are from the correct context.
2014-03-05 16:56:02 -08:00
Jason Sams
2383f2200a Merge "Validate objects are from the correct context." 2014-03-06 00:50:24 +00:00
Fabrice Di Meglio
9c9185348a am db3e7782: am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit 'db3e77825d339cbe8840486bffbf7e03a53c1c4c':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:45:47 +00:00
Fabrice Di Meglio
dfb76305c7 am 1eb5c055: am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit '1eb5c0551f98b0340db37525f1f490c2d100cf38':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:45:44 +00:00
Chris Craik
dc66ee2103 Merge "Fix warnings in hwui" 2014-03-06 00:44:06 +00:00
Fabrice Di Meglio
db3e77825d am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '71c3a3d9474e1ce4210209bbd68055f3b780057d':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:42:36 +00:00
Fabrice Di Meglio
1eb5c0551f am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit 'cf33fe683d2cd9ea25fa83f5354c682a788ec074':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:42:33 +00:00
Fabrice Di Meglio
71c3a3d947 am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '6c3a45d7df0dc708e3981c79df32b5bb3fb1758a':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:38:57 +00:00
Fabrice Di Meglio
cf33fe683d am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit 'e1190a994e7d86ae7ad6f4680b7cd58d50d4a770':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:38:52 +00:00
Chris Craik
eea6ef9c76 Fix warnings in hwui
Change-Id: I6ad6b78531cc0426dc2ea82a32775f7b0265b5b1
2014-03-05 16:37:35 -08:00
Fabrice Di Meglio
6c3a45d7df am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '57f8a4b4ed48ae3e2488bb3bafcd40137c71ec18':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:35:40 +00:00
Fabrice Di Meglio
e1190a994e am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit 'cb6dcd7af2d015b7a3d49f1224936241747bcb43':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:35:36 +00:00
John Reck
1f3c72c5e2 Merge "Detach disappearing children in onDetach" 2014-03-06 00:35:14 +00:00
Filip Gruszczyński
1569d61f66 am d54530e9: am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev
* commit 'd54530e9cecda7bc69d6479bae4c48189bcf50e9':
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
2014-03-06 00:33:32 +00:00
Fabrice Di Meglio
57f8a4b4ed am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev
* commit '1ff2df6194148f487ccb014a7c5302fa8ffe2571':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
2014-03-06 00:32:30 +00:00
Fabrice Di Meglio
cb6dcd7af2 am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev
* commit '2b58a29f825e6442d8767a36adaf1770b86d5725':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
2014-03-06 00:32:27 +00:00
John Reck
ca7a9da76d Detach disappearing children in onDetach
Bug: 13324881

Change-Id: Iba6501b164842c5786a6f4763e334e6c80c6fa41
2014-03-06 00:31:34 +00:00
Filip Gruszczyński
d54530e9ce am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev
* commit '1ae480a24deed18cb1ca95344995150f3a3f5c98':
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
2014-03-06 00:30:17 +00:00
Fabrice Di Meglio
1ff2df6194 Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 2014-03-06 00:29:35 +00:00
Fabrice Di Meglio
2b58a29f82 Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 2014-03-06 00:29:20 +00:00
Filip Gruszczyński
1ae480a24d Merge changes I2104037d,I125c4a00 into klp-modular-dev
* changes:
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
2014-03-06 00:27:40 +00:00
Christopher Tate
9941a289b7 Merge "am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev" 2014-03-06 00:19:14 +00:00
Christopher Tate
ff8b037c10 am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev
* commit '777b8a808ee76401429f7210ebb7194632040d45':
  Adapt to underlying changes in the PBKDF2 implementation

Change-Id: Ia68694a03e52693fceaedc6740dbd8e690e21257
2014-03-05 16:17:34 -08:00
Robert Greenwalt
ea3bfc68ea am 2d07e8d6: am c1ca3bac: am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev
* commit '2d07e8d60e44e320b0c39d63e763d79a7befadf3':
  Only apply tcp buffer sizes for default net
2014-03-06 00:14:30 +00:00
Christopher Tate
bba8fbc9bd am 943cdf7e: (-s ours) am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev
* commit '943cdf7e221b867978416024526fe851c248972d':
  Adapt to underlying changes in the PBKDF2 implementation
2014-03-06 00:14:27 +00:00
Jason Sams
678cc7fe9f Validate objects are from the correct context.
Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
2014-03-05 16:09:02 -08:00
John Reck
2665f6e9f5 Merge "Remove invalid usage of DisplayList.isValid()" 2014-03-06 00:07:29 +00:00
David 'Digit' Turner
4bd720c2c6 am a05e7526: am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
* commit 'a05e752615fbfb50196d59dfb9c96dc7cf6c63f1':
  aidl: Support building with updated host sysroot.
2014-03-05 23:20:36 +00:00
Dianne Hackborn
a984c58287 am 75870cf3: am 75374879: am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump.
* commit '75870cf391eb6f1ec91f512e0a6f28840093d413':
  Issue #13308712: Add --checkin to package manager dump.
2014-03-05 23:20:33 +00:00
David 'Digit' Turner
a05e752615 am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
* commit '9c6f41e3eb2258d52480be04dd8916a10f8be8db':
  aidl: Support building with updated host sysroot.
2014-03-05 23:18:20 +00:00
Dianne Hackborn
75870cf391 am 75374879: am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump.
* commit '75374879938c1767b0266132672361487f2f58d4':
  Issue #13308712: Add --checkin to package manager dump.
2014-03-05 23:17:40 +00:00
David 'Digit' Turner
9c6f41e3eb am be7b8f4f: Merge "aidl: Support building with updated host sysroot."
* commit 'be7b8f4f4c62239ad20202e4bbe8120d5e3dcf82':
  aidl: Support building with updated host sysroot.
2014-03-05 15:14:31 -08:00
Dianne Hackborn
7537487993 am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump.
* commit 'ea391750fbf78b395b414147dba6426ad907431d':
  Issue #13308712: Add --checkin to package manager dump.
2014-03-05 23:14:04 +00:00
Dianne Hackborn
ea391750fb am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump.
* commit '5e578e17f4392d1baf41772ab45347bc8bcccc38':
  Issue #13308712: Add --checkin to package manager dump.
2014-03-05 23:11:07 +00:00
David 'Digit' Turner
be7b8f4f4c Merge "aidl: Support building with updated host sysroot." 2014-03-05 23:10:45 +00:00
Dianne Hackborn
5e578e17f4 am 40a26004: Issue #13308712: Add --checkin to package manager dump.
* commit '40a26004810623f02546a31cb0ce49a0502bdff7':
  Issue #13308712: Add --checkin to package manager dump.
2014-03-05 23:07:45 +00:00
John Reck
7558aa7081 Remove invalid usage of DisplayList.isValid()
Bug: 13324734

 Editor was using isValid as a mechanism to track whether or not it
 needed to re-record the DisplayList. This is not correct as isValid()
 is not a general-purpose dirty bit. Add an explicit dirty bit for
 Editor to use instead

Change-Id: I5608b151791870fca3681056b5507bd39ee48f52
2014-03-05 15:01:04 -08:00
Svetoslav
28ba546c91 am 8c6ed03c: am 1caa092f: Allow click listener registration in NumberPicker.
* commit '8c6ed03c8fb991ef5bf8c4e2fd79a1582bafc90f':
  Allow click listener registration in NumberPicker.
2014-03-05 22:58:43 +00:00
David 'Digit' Turner
ea6d2197ba aidl: Support building with updated host sysroot.
This patch fixes tools/aidl/Type.cpp to compile with
a more recent SDK host toolchain sysroot (that has not
been submitted yet).

The main issue is that the code uses ssize_t which is
defined in <sys/types.h>, but didn't include the header
directly.

Apparently, this no longer compiles when using the Ubuntu
10.04 libc6-dev headers (the current SDK toolchain is
based on Ubuntu 8.04), so perform an explicit include
to fix this.

NOTE: This doesn't break the Windows SDK build.

Change-Id: Idcacf8f8d1c606b39bf8aa75ab409aa0c2a3cd5a
2014-03-05 23:57:46 +01:00
Svetoslav
8c6ed03c8f am 1caa092f: Allow click listener registration in NumberPicker.
* commit '1caa092f94aaa4b9b7b382263dfd13581d92d2de':
  Allow click listener registration in NumberPicker.
2014-03-05 22:55:58 +00:00