drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,150 Commits 1 Branch 0 Tags
Commit Graph

120150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ashok Bhat
58fad0bf14 Don't use size_t for variables that store uint32_t value 
The local variables width, height, displayWidth and
displayHeight are set to the corresponding members
of VideoFrame class. As the members of VideoFrame are
uint32_t, the local variables have been changed to
uint32_t.

As these local variables are passed to a java method,
the change of size_t to uint32_t ensures that the size
of the actual parameter (i.e uint32_t) is now same as
the size of the formal parameter (i.e. jint) for all
platforms.

Change-Id: Icd14de0142bfd4e6ba52a3e6aff3d80b323a0de4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-03-06 11:33:20 +00:00
Santos Cordon
2fab2f6367 am 91d59ad1: am 03f0834a: am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit '91d59ad18c441fce65f36314b4bc10aece3c0c4f':
  Update permission description string.
 2014-03-06 02:40:10 +00:00
Griff Hazen
6daf22ca76 am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev 
* commit '47826bfa1627fe84bf2ab5d2ee45845bef7b2ff6':
  Add addExtras and getExtras to Notification.Builder.
 2014-03-06 02:35:56 +00:00
Michael Wright
78e208acce am 6b661fdc: am dd9f7cb2: Add Odie KL file. 
* commit '6b661fdcb6032851b6901a9ff0b82fd79dbbdfb7':
  Add Odie KL file.
 2014-03-06 02:35:53 +00:00
Santos Cordon
91d59ad18c am 03f0834a: am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit '03f0834a03ed8296f31341b6d7b530ea74bc0188':
  Update permission description string.
 2014-03-06 02:35:19 +00:00
Santos Cordon
03f0834a03 am a04a1fd1: am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit 'a04a1fd10304de3f7a471aae6c954548be760c12':
  Update permission description string.
 2014-03-06 02:20:36 +00:00
Griff Hazen
47826bfa16 am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev 
* commit 'c748341af5616e183303dbe3267627a7f08aea37':
  Add addExtras and getExtras to Notification.Builder.
 2014-03-06 02:19:38 +00:00
Michael Wright
6b661fdcb6 am dd9f7cb2: Add Odie KL file. 
* commit 'dd9f7cb2948af46047ab16d44c28a8f91948bdf5':
  Add Odie KL file.
 2014-03-06 02:19:35 +00:00
Santos Cordon
a04a1fd103 am a45bb4be: am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit 'a45bb4be2f12144754aa62a5d44c39db08b21c92':
  Update permission description string.
 2014-03-06 02:14:46 +00:00
Griff Hazen
c748341af5 Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev 2014-03-06 02:05:38 +00:00
Griff Hazen
720042b72f Add addExtras and getExtras to Notification.Builder. 
addExtras allows merging with exiting set extras instead of replacing
them. This matches the similar function putExtras in Intent.

Both functions are useful for multi-stage notification building logic.

Change-Id: Ice3e4a53ec05b7129ebdac14e2084163946273a4
 2014-03-05 18:00:57 -08:00
Santos Cordon
a45bb4be2f am 77a60f00: Merge "Update permission description string." into klp-dev 
* commit '77a60f006f8b7260207043529d3ed004db301bd5':
  Update permission description string.
 2014-03-06 01:56:50 +00:00
Santos Cordon
77a60f006f Merge "Update permission description string." into klp-dev 2014-03-06 01:54:20 +00:00
Michael Wright
dd9f7cb294 Add Odie KL file. 
Change-Id: I74cc90a3c66e876db51da8f9fd8ced3bac373032
 2014-03-05 17:47:54 -08:00
Michael Wright
fa2e53cc9f am 1f762b34: am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '1f762b3490ce3583354ac3bf23732e88ebdb7b81':
  Revert Japanese special case fallback keys.
 2014-03-06 01:07:30 +00:00
Michael Wright
1f762b3490 am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '9aa7c6e583ac18d6c338af8d478512c4ab5293b4':
  Revert Japanese special case fallback keys.
 2014-03-06 01:03:52 +00: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
Michael Wright
9aa7c6e583 am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit 'e4a7179278375f48171746ffe93ca4529a927ecb':
  Revert Japanese special case fallback keys.
 2014-03-06 01:00:43 +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
Michael Wright
e4a7179278 am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '4448f9d7ade3d08a29b1a191e182a403c5584388':
  Revert Japanese special case fallback keys.
 2014-03-06 00:56:59 +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
Michael Wright
4448f9d7ad am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit 'c5dea68e9856698953dafca868eaee7207614641':
  Revert Japanese special case fallback keys.
 2014-03-06 00:53:22 +00:00
Jason Sams
2383f2200a Merge "Validate objects are from the correct context." 2014-03-06 00:50:24 +00:00
Michael Wright
c5dea68e98 Merge "Revert Japanese special case fallback keys." into klp-dev 2014-03-06 00:50:15 +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
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
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
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
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
Jason Sams
678cc7fe9f Validate objects are from the correct context. 
Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
 2014-03-05 16:09:02 -08:00
Dirk Dougherty
f55616cd8b Update permission description string. 
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
(cherry picked from commit 08d7c2861fee205a314c3847ab5f5894617a233b)
 2014-03-05 23:21:41 +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