ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,997 Commits 2 Branches 0 Tags 54 MiB
89c06fce6f
Commit Graph

40997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
89c06fce6f am 9a176507: am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1 
* commit '9a176507a96ceb3640a56a5449e96fc3e406a765':
  Unhide the key to retriever location information in 3gp/mp4 files
 2011-11-11 11:51:19 -08:00
Andreas Huber
1b63f90617 am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 
* commit '8a0654231ff36d938bc3451190cf67231195f1d0':
  Didn't mean to check this in...
 2011-11-11 11:51:17 -08:00
Robert Greenwalt
61a0c393aa am 2c41bce3: am 424781e2: Fix NPE in ConnectivityService. 
* commit '2c41bce3f2134159ce64d589ff1bb298b9939178':
  Fix NPE in ConnectivityService.
 2011-11-11 11:51:16 -08:00
Eric Laurent
9fe7088b82 am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 
* commit '2c29a5cf1658532bca4e34f816fa30312241a336':
  visualizer: reset buffer if playback is idle
 2011-11-11 11:51:14 -08:00
Andreas Huber
78ed664799 am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1 
* commit '40461ee70161d8568663332f72be2353b04c34e7':
  Instead of asserting, signal a runtime error if the session doesn't contain
 2011-11-11 11:51:12 -08:00
Andreas Huber
2a484e15af am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 
* commit '9a87a838028f3911a066a729cdb5ec688903a5ae':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets
 2011-11-11 11:51:11 -08:00
Andreas Huber
21b916fae7 am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 
* commit '9c981cd3d53238f10842368c1cd82d625b701a47':
  Disconnect on socket error on the RTSP control connection.
 2011-11-11 11:51:09 -08:00
Narayan Kamath
a3ade07889 am 405fcc87: am 754c72ed: Notifiy callers when a speech synthesis error occurs. 
* commit '405fcc87b247d91ce2b54623f351e91b740813c0':
  Notifiy callers when a speech synthesis error occurs.
 2011-11-11 11:51:07 -08:00
James Dong
32ec7224b0 am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1 
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
  Unhide the key to retriever location information in 3gp/mp4 files
 2011-11-11 11:48:27 -08:00
Andreas Huber
86a7311ab6 am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 
* commit '23217182743521063655c6fb1b1580d3558cfbe7':
  Didn't mean to check this in...
 2011-11-11 11:48:16 -08:00
Robert Greenwalt
4eb211e21b am 424781e2: Fix NPE in ConnectivityService. 
* commit '424781e2e1a1f1447eea733ffd1dc0f8006b628e':
  Fix NPE in ConnectivityService.
 2011-11-11 11:48:11 -08:00
Eric Laurent
86167c8032 am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 
* commit '1f8c621279ddb163ee3d63bf32d79955679db0c5':
  visualizer: reset buffer if playback is idle
 2011-11-11 11:48:05 -08:00
Andreas Huber
a3d4049fcb am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1 
* commit 'cd556b82fd12dceb49e9d6543f80212721b220ec':
  Instead of asserting, signal a runtime error if the session doesn't contain
 2011-11-11 11:48:00 -08:00
Andreas Huber
2d4a178249 am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 
* commit '5d42075e450a49af2bb37ca3a9610921df7607f2':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets
 2011-11-11 11:47:58 -08:00
Andreas Huber
9ba00d8284 am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 
* commit 'd9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
  Disconnect on socket error on the RTSP control connection.
 2011-11-11 11:47:57 -08:00
Narayan Kamath
8063f8b346 am 754c72ed: Notifiy callers when a speech synthesis error occurs. 
* commit '754c72ed9e8e83e5a913aa7552fc2e1b1b5277e0':
  Notifiy callers when a speech synthesis error occurs.
 2011-11-11 11:47:54 -08:00
Matthew Xie
92d4cfe4a0 Merge "Add more comments to the file header to explain the state diagram" 2011-11-11 11:20:43 -08:00
James Dong
f6de140cb9 Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1 2011-11-11 10:49:24 -08:00
Andreas Huber
bd667dd719 Merge "Didn't mean to check this in..." into ics-mr1 2011-11-11 10:46:02 -08:00
Scott Main
9915dcceef Merge "docs: some helpful javadocs for network info" 2011-11-11 09:49:23 -08:00
Jesse Wilson
59fa20937c Merge "Document our potentially suprising behavior on date ranges ending at midnight." 2011-11-11 09:38:46 -08:00
Jesse Wilson
ad805ea909 Merge "Warn about changed behavior around '+' characters." 2011-11-11 08:22:33 -08:00
Eric Laurent
3c1afaaf79 Merge "visualizer: reset buffer if playback is idle" into ics-mr1 2011-11-11 08:17:22 -08:00
Andreas Huber
849c30071d Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1 2011-11-11 07:39:25 -08:00
Andreas Huber
2373ecfc11 Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 2011-11-11 07:39:18 -08:00
Andreas Huber
6d7a5bddb1 Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 2011-11-11 07:39:11 -08:00
James Dong
4738b8bee0 am 510180f1: am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 
* commit '510180f162dee3ae5416a98caa07f58a754f4b3f':
  Add support for retrieving location information in mp4/3gpp files
 2011-11-11 15:34:21 +00:00
Akwasi Boateng
fea0c08ea5 am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 
* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
  Make the overridden ImageView#setVisibility remotable
  Clamp non-monotonic stats instead of dropping.
  DO NOT MERGE. Fix leak in LayoutTransition
  Fix lastVisible/global rects
  Fix Wimax-less build.
  Fix leak in LayoutTransition
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
  Terminate EGL when an app goes in the background
  boot animation is dithered and scaled
  Fix NdefRecord byte-stream constructor.
  PopupWindow dismiss() can get into a recursive loop.
  Fold WiMAX state into the mobile RSSI.
  Remove dedicated wimax icon to fix RSSI layout.
 2011-11-11 15:34:19 +00:00
Jamie Gennis
147a91395b am 0c71e5ed: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit '0c71e5ed820350a4ae0517dc73d1f46cd3534b55':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 15:34:19 +00:00
James Dong
e23eb3e23f am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 
* commit '08e42967b9e459b7beb22e859f1f1eba0546741b':
  Add support for retrieving location information in mp4/3gpp files
 2011-11-11 15:28:32 +00:00
Akwasi Boateng
19353c4193 Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 2011-11-11 15:20:20 +00:00
Svetoslav Ganov
5965359aef am d00e75e9: am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0 
* commit 'd00e75e94d1aa5cee740a06a4ce760e49016f7f6':
  PopupWindow dismiss() can get into a recursive loop.
 2011-11-11 15:12:58 +00:00
Chet Haase
b8ed17f5f1 am ab51626f: am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition 
* commit 'ab51626f22259e27ef376cbbc1d127524a57459d':
  DO NOT MERGE. Fix leak in LayoutTransition
 2011-11-11 15:12:56 +00:00
Jamie Gennis
509ec438cf am 787e2c27: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit '787e2c276a5645ffbaddc5c23f4deb66d182e80d':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 15:12:55 +00:00
Jeff Sharkey
6a025c40de am 51c00a57: Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1 
* commit '51c00a57f4f956b4b0ce9562fa571b475ee6f6ae':
  Clamp non-monotonic stats instead of dropping.
 2011-11-11 15:12:51 +00:00
Daniel Sandler
d9887d464d am 992e77af: Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1 
* commit '992e77af1168ddce232b9b7702d01e5ccc7a249b':
  Fold WiMAX state into the mobile RSSI.
 2011-11-11 15:12:49 +00:00
Daniel Sandler
f150b45d11 am 8b50bd8c: Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1 
* commit '8b50bd8c9ba594e2516014fcc4b950b8deb36312':
  Remove dedicated wimax icon to fix RSSI layout.
 2011-11-11 15:12:48 +00:00
Adam Powell
d43a2ef564 am 0ddcad0b: Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1 
* commit '0ddcad0b4e203fe56aeca74547b13f6063ccb13b':
  Make the overridden ImageView#setVisibility remotable
 2011-11-11 15:12:46 +00:00
Adam Cohen
9e9ac8c334 am d562d300: Merge "Deferring wallpaper update to improve workspace scrolling (issue 5506959)" into ics-mr1 
* commit 'd562d300cde63ae023f09fc3c7ded0988dead5d1':
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
 2011-11-11 15:12:45 +00:00
John Reck
571668ac49 am 9490fe40: Merge "Fix lastVisible/global rects" into ics-mr1 
* commit '9490fe4095171b9af380812b895101f8142d3cd5':
  Fix lastVisible/global rects
 2011-11-11 15:12:41 +00:00
Martijn Coenen
86f9d8af31 am 99898de9: Merge "Fix NdefRecord byte-stream constructor." into ics-mr1 
* commit '99898de902c36687be126b33ee8a4858d26871ac':
  Fix NdefRecord byte-stream constructor.
 2011-11-11 15:12:36 +00:00
Chet Haase
7ea9cec879 am 692fda9d: Merge "Fix leak in LayoutTransition" into ics-mr1 
* commit '692fda9da31e2a25fd295140ec0d8b6cd0a934ee':
  Fix leak in LayoutTransition
 2011-11-11 15:12:35 +00:00
Robert Greenwalt
bd6f283b2a am 7c9f8005: Merge "Fix Wimax-less build." into ics-mr1 
* commit '7c9f8005e20af0bb741e36d8239f301371ba5f7f':
  Fix Wimax-less build.
 2011-11-11 15:12:33 +00:00
Romain Guy
07432365ce am 50a66f0e: Merge "Terminate EGL when an app goes in the background" into ics-mr1 
* commit '50a66f0e9c5a85a6af4a99eb66656a69eba24572':
  Terminate EGL when an app goes in the background
 2011-11-11 15:12:31 +00:00
Mathias Agopian
87e69f0aba am de62d9cb: Merge "boot animation is dithered and scaled" into ics-mr1 
* commit 'de62d9cbe00d0fcac24af9a3d89ba7a125e56eaa':
  boot animation is dithered and scaled
 2011-11-11 15:12:28 +00:00
Jamie Gennis
ad9bb6df07 am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 14:46:21 +00:00
James Dong
714fb46074 Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 2011-11-11 01:44:06 -08:00
Svetoslav Ganov
aefd78ef93 am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0 
* commit '7b8bec280f20e8a5863d8214bbc195497335eba6':
  PopupWindow dismiss() can get into a recursive loop.
 2011-11-11 08:02:27 +00:00
Chet Haase
131f20c4cf am 30f03ac6: (-s ours) DO NOT MERGE. Fix leak in LayoutTransition 
* commit '30f03ac650f2ffaafe9cc49942a4a8a7858dbd88':
  DO NOT MERGE. Fix leak in LayoutTransition
 2011-11-11 08:02:27 +00:00
Jamie Gennis
255d499dec am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0 
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
  SystemUI: Disable HW acceleration for status bar
 2011-11-11 08:02:26 +00:00