Commit Graph

7336 Commits

Author SHA1 Message Date
Greg Hackmann 5ae67bebc4 am c042bb01: am e25864b7: am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"
* commit 'c042bb01df9046a4aa7afeefe6d9b14a5bbc2ca2':
  rootdir: add permissions for /dev/rtc0
2013-12-18 00:28:45 +00:00
Greg Hackmann f1da46d293 am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"
* commit 'd27498cbef862fccb857d7d8970418b893f550ca':
  toolbox: date: use RTC subsystem on devices without /dev/alarm
2013-12-17 16:26:57 -08:00
Greg Hackmann e34618a24c am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"
* commit 'd2ac1d8caa3eaf811df3a4f50c78a281c27f69a2':
  toolbox: date: fix parameter type warnings
2013-12-18 00:26:09 +00:00
Greg Hackmann 9d1de8a812 am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"
* commit '0e23a3d4830e6a45bf9b4968da7553fab79205a8':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm
2013-12-18 00:26:08 +00:00
Greg Hackmann 70f22d6b76 am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"
* commit '066a3862a38957fdcd5f20caa63c7931e9a0f433':
  toolbox: uptime: fix unused parameter warnings
2013-12-18 00:26:07 +00:00
Greg Hackmann 7510fa3e71 am d38ca369: am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"
* commit 'd38ca369c07744abeb5477c6a524a683fb9a4927':
  SystemClock: use clock_gettime() on devices without /dev/alarm
2013-12-18 00:26:07 +00:00
Greg Hackmann c042bb01df am e25864b7: am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"
* commit 'e25864b752db0bc8ddc55f2c22cf1b8bcb2602bf':
  rootdir: add permissions for /dev/rtc0
2013-12-18 00:26:06 +00:00
Greg Hackmann d2ac1d8caa am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"
* commit 'eb3e9dafbd7f1c4f13bdcafe1a30f9da3bed9108':
  toolbox: date: fix parameter type warnings
2013-12-17 16:23:34 -08:00
Greg Hackmann 0e23a3d483 am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"
* commit '215f78ae55b479ca6a78f9762ea9920fea16cf45':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm
2013-12-17 16:23:33 -08:00
Greg Hackmann 066a3862a3 am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"
* commit '83a766373f4ee2036fe3824623b7881156fd2ee8':
  toolbox: uptime: fix unused parameter warnings
2013-12-17 16:23:32 -08:00
Greg Hackmann d38ca369c0 am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"
* commit '9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337':
  SystemClock: use clock_gettime() on devices without /dev/alarm
2013-12-17 16:23:32 -08:00
Greg Hackmann e25864b752 am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"
* commit '537f53b682eb0d99e90da2a3e7389ea474bc583d':
  rootdir: add permissions for /dev/rtc0
2013-12-17 16:23:31 -08:00
Greg Hackmann d27498cbef Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm" 2013-12-18 00:19:21 +00:00
Greg Hackmann eb3e9dafbd Merge "toolbox: date: fix parameter type warnings" 2013-12-18 00:18:24 +00:00
Greg Hackmann 215f78ae55 Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm" 2013-12-18 00:18:03 +00:00
Greg Hackmann 83a766373f Merge "toolbox: uptime: fix unused parameter warnings" 2013-12-18 00:17:36 +00:00
Greg Hackmann 9ade11c1c5 Merge "SystemClock: use clock_gettime() on devices without /dev/alarm" 2013-12-18 00:17:26 +00:00
Greg Hackmann 537f53b682 Merge "rootdir: add permissions for /dev/rtc0" 2013-12-18 00:17:01 +00:00
Greg Hackmann 4a7bc60071 toolbox: date: use RTC subsystem on devices without /dev/alarm
Change-Id: I48c0fd1f4cffef936afb8d48d6d93babf006004d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann c057503aaf toolbox: date: fix parameter type warnings
Change-Id: I810a9abee8bc0061c5007fe08197384f2b85754b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann fa66f1e494 toolbox: uptime: use clock_gettime() on devices without /dev/alarm
Change-Id: Id7287ca179cc0b8390c054803a25a961dd550a34
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann 7f625ed026 toolbox: uptime: fix unused parameter warnings
Change-Id: Id240ce85bf09e1a81f4e2e2a7496ac7952edbf38
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann 64289760a2 SystemClock: use clock_gettime() on devices without /dev/alarm
On devices with an up-to-date kernel, the back-in-time bug affecting
clock_gettime() has been fixed and it can safely be used as an
alternative to the ANDROID_ALARM_GET_TIME ioctl.  To ensure consistent
behavior on existing devices, make clock_gettime() a fallback for when
the alarm driver isn't available.

Change-Id: I384af5e7ec9e73e0bad4b6b0f987a8ea4583cba6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Greg Hackmann a585e662e0 rootdir: add permissions for /dev/rtc0
Change-Id: If9d853bdae2399b1e7434f45df375ba1fd6dbe9c
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-17 14:45:39 -08:00
Elliott Hughes d9f2f8a1b2 am 417e7467: am 286ab6ce: am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
* commit '417e7467703e637f384530f23850cb2bf852e61b':
  libdiskconfig: Use uintptr_t instead of uint32_t
2013-12-17 21:28:41 +00:00
Elliott Hughes 417e746770 am 286ab6ce: am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
* commit '286ab6ce08acb5585ccc02ddf54d7654118fe11b':
  libdiskconfig: Use uintptr_t instead of uint32_t
2013-12-17 21:25:34 +00:00
Elliott Hughes 286ab6ce08 am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
* commit '3278af85f984a1b6df56b010a93589f6068514e0':
  libdiskconfig: Use uintptr_t instead of uint32_t
2013-12-17 21:22:16 +00:00
Elliott Hughes 3278af85f9 am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
* commit '30f9b5092062a0c8b61356496128feaaf8cd4237':
  libdiskconfig: Use uintptr_t instead of uint32_t
2013-12-17 13:19:42 -08:00
Elliott Hughes 30f9b50920 Merge "libdiskconfig: Use uintptr_t instead of uint32_t" 2013-12-17 21:15:42 +00:00
Ashok Bhat 35539affd8 libdiskconfig: Use uintptr_t instead of uint32_t
Use uintptr_t instead of uint32_t when pointer is cast
to an integer type.

Change-Id: I03dd4c7ff66611661af466dfb7b393d461bb2d7d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-17 12:43:41 +00:00
Elliott Hughes fed76f8515 am 63824e92: am 980093ca: am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"
* commit '63824e923aca6fe15942beee00b258ea6119e459':
  AArch64: Correction of struct surface_t
2013-12-16 20:03:17 +00:00
Elliott Hughes 63824e923a am 980093ca: am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"
* commit '980093ca5923d2a3a69075ca156c4b90e0ea6d39':
  AArch64: Correction of struct surface_t
2013-12-16 20:02:08 +00:00
Elliott Hughes 980093ca59 am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t"
* commit '348856fadb03cd0d93d0af3f78c11555a343e97f':
  AArch64: Correction of struct surface_t
2013-12-16 19:59:28 +00:00
Elliott Hughes 348856fadb am 532f4658: Merge "AArch64: Correction of struct surface_t"
* commit '532f46582362f6b14d5e2a19600c2930385cdc30':
  AArch64: Correction of struct surface_t
2013-12-16 11:56:33 -08:00
Elliott Hughes c29664284b am 49a88c3c: am 410a1966: am fd382f2e: am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."
* commit '49a88c3cf38e9c17a756434880fb01971018a9c6':
  Pixelflinger: Add AArch64 support to pixelflinger JIT.
2013-12-16 19:55:21 +00:00
Elliott Hughes 49a88c3cf3 am 410a1966: am fd382f2e: am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."
* commit '410a1966df94cefbb2fb38448cbe95de6b335ceb':
  Pixelflinger: Add AArch64 support to pixelflinger JIT.
2013-12-16 19:52:00 +00:00
Elliott Hughes 532f465823 Merge "AArch64: Correction of struct surface_t" 2013-12-16 19:50:17 +00:00
Elliott Hughes 410a1966df am fd382f2e: am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."
* commit 'fd382f2e2f27377e0a61f442bff196b66b188293':
  Pixelflinger: Add AArch64 support to pixelflinger JIT.
2013-12-16 19:49:33 +00:00
Elliott Hughes fd382f2e2f am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."
* commit 'fd7eabe4429ee6bbc18796b0c76033902fa63497':
  Pixelflinger: Add AArch64 support to pixelflinger JIT.
2013-12-16 11:47:14 -08:00
Elliott Hughes fd7eabe442 Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT." 2013-12-16 19:42:55 +00:00
Elliott Hughes dd2b85221b am cec9ac9b: am f64b4a6a: am 7fe10ded: am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
* commit 'cec9ac9b36c463f48f8447b8d4118845ea73a4d7':
  Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
2013-12-16 19:08:26 +00:00
Elliott Hughes cec9ac9b36 am f64b4a6a: am 7fe10ded: am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
* commit 'f64b4a6a84ee706f1bf3b089ced834c958dd9ec6':
  Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
2013-12-16 19:05:17 +00:00
Elliott Hughes f64b4a6a84 am 7fe10ded: am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
* commit '7fe10dedfdefe952602d3507db3109eaa94d4068':
  Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
2013-12-16 19:02:53 +00:00
Elliott Hughes 7fe10dedfd am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"
* commit 'cadb10c9578c39e7f886a1fce11536258b2cac4e':
  Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
2013-12-16 10:59:19 -08:00
Elliott Hughes cadb10c957 Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler" 2013-12-16 18:55:09 +00:00
Nick Kralevich f7f823e46b am 8b0d10c8: am a24e9a86: am 02ad8700: am e4335483: Merge "Relabel /data/misc/zoneinfo"
* commit '8b0d10c870efbe8254f407e02c406c05bedfa0b5':
  Relabel /data/misc/zoneinfo
2013-12-16 17:12:22 +00:00
Nick Kralevich 8b0d10c870 am a24e9a86: am 02ad8700: am e4335483: Merge "Relabel /data/misc/zoneinfo"
* commit 'a24e9a8655187b13eb15fdfde17f53677f203bb3':
  Relabel /data/misc/zoneinfo
2013-12-16 17:10:18 +00:00
Nick Kralevich a24e9a8655 am 02ad8700: am e4335483: Merge "Relabel /data/misc/zoneinfo"
* commit '02ad8700dd22d5bf5d73c638e3a45c35d5ef3d1d':
  Relabel /data/misc/zoneinfo
2013-12-16 17:07:12 +00:00
Nick Kralevich 02ad8700dd am e4335483: Merge "Relabel /data/misc/zoneinfo"
* commit 'e4335483e78292800e27c7bf0a67d23bee47dc84':
  Relabel /data/misc/zoneinfo
2013-12-16 09:04:04 -08:00
Nick Kralevich e4335483e7 Merge "Relabel /data/misc/zoneinfo" 2013-12-16 16:59:19 +00:00