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

40622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Ng
9f4ac1a0be am a50c859d: Merge "Color balancing framework assets" into ics-mr1 
* commit 'a50c859d3f071b9d405bf461e34f11d40f20561e':
  Color balancing framework assets
 2011-11-07 21:44:33 +00:00
Peter Ng
68d563b546 Merge "Color balancing framework assets" into ics-mr1 2011-11-07 13:40:45 -08:00
Eric Fischer
e0e07988c4 am 08be43a6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '08be43a6d912fe1f34596d5e90df6b497424af02':
  Import revised translations.  DO NOT MERGE
 2011-11-07 20:41:00 +00:00
Eric Fischer
16364a0796 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-07 12:36:02 -08:00
Amith Yamasani
be37dde787 am 7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1 
* commit '7919bfb12365b3f84e232235c35df957039995b7':
  Don't show the submit button when it isn't enabled.
 2011-11-07 19:01:22 +00:00
Amith Yamasani
6532722306 Merge "Don't show the submit button when it isn't enabled." into ics-mr1 2011-11-07 10:57:17 -08:00
Winson Chung
009477d633 am 19c86cac: Merge "Fixing screenshot border asset." into ics-mr1 
* commit '19c86cacb2f0ba04cc93084ba474662afb17d88f':
  Fixing screenshot border asset.
 2011-11-07 18:24:01 +00:00
Winson Chung
8241bb39c6 Merge "Fixing screenshot border asset." into ics-mr1 2011-11-07 10:20:37 -08:00
Daniel Sandler
656fa46a87 am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1 
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
 2011-11-07 18:15:30 +00:00
Daniel Sandler
70404410db Merge changes I0da0f04f,I93197665 into ics-mr1 
* changes:
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
 2011-11-07 10:11:52 -08:00
Alex Sakhartchouk
90e26fdf93 Merge "Properly passing an unused variable through." 2011-11-07 09:53:28 -08:00
The Android Open Source Project
a2d9f79b91 Reconcile with ics-mr1-release 
Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
 2011-11-07 08:30:54 -08:00
The Android Open Source Project
abe7ebb497 am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit '064975c27cbca412e682fa152ce00af14027ab4f':
  Fix a leak in Parcel::writeBlob.
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
 2011-11-07 16:28:26 +00:00
The Android Open Source Project
2642a74b99 Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
 2011-11-07 08:22:56 -08:00
Dianne Hackborn
6ce371d6bb am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0 
* commit '6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
  Print out memory info when we get into a low memory situation.
 2011-11-07 15:51:38 +00:00
Mathias Agopian
d192bba3f8 am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1 
* commit '3f24589edd860618ccf65d6653b002d13810e78b':
  workaround to set the WM refresh rate to 48 Hz for tuna devices only
 2011-11-07 15:51:33 +00:00
Jeff Brown
c17f56fdf1 am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob. 
* commit '88061d6b38cfb4bf374039846b753a3b21ac61e1':
  Fix a leak in Parcel::writeBlob.
 2011-11-07 15:51:31 +00:00
Steve Block
2d3f094611 Merge changes If1bdd547,Ie43c16ae,I62b45f8b,I32b7fdc0 
* changes:
  Add tests for the fields of objects in the WebView's Java Bridge.
  Adds a set of basic test for WebView's Java Bridge
  Add tests for returning values from WebView's Java Bridge
  Adds a new test for type coercion in WebView's Java Bridge
 2011-11-07 07:37:53 -08:00
The Android Automerger
0f41ede842 merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:46:10 -08:00
The Android Automerger
0689c381b7 merge in ics-mr0-release history after reset to ics-mr0 2011-11-06 06:28:19 -08:00
Romain Guy
a55886f987 am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1 
* commit '2ccc47b89868d4f39683e0e2bd057ce95d7d1217':
  Memory optimizations for libhwui Bug #5566149
 2011-11-05 19:33:49 +00:00
Robert Greenwalt
ffe419babe am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
  Start using IP tool for advanced routing.
 2011-11-05 19:33:46 +00:00
Jamie Gennis
472e79ce10 am 2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1 
* commit '2ab7ec90e4a6f21bee7cbfebbd751d32d4cf9e03':
  EGL: Add stubs for EGL_ANDROID_blob_cache
 2011-11-05 19:33:42 +00:00
Dianne Hackborn
3f95c7588b am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0 
* commit '960177ae394a466d765a2dc171e136f9fdea06b6':
  DO NOT MERGE.  Integrate: Include showmap output in bug report.
 2011-11-05 19:33:39 +00:00
Dave Burke
50581d6585 am a3af4c94: am 3ee47188: Frame rate to 48 fps 
* commit 'a3af4c94dfbf3336004a38011f6453bfcd7fd638':
  Frame rate to 48 fps
 2011-11-05 19:33:33 +00:00
Mathias Agopian
b077d00714 am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1 
* commit '515c6b44d57b829792267594a355cd2831582197':
  fix an issue where SensorService could request an invalid sensor delay
 2011-11-05 19:33:18 +00:00
Irfan Sheriff
91e4897511 am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1 
* commit '45a04db3f95755829b24043d30d7da7182b4f33b':
  Avoid quick shutdown after a  driver start
 2011-11-05 19:33:16 +00:00
Narayan Kamath
2d0671b098 am eaa17b76: Merge "Add an API for querying / enabling network TTS support." into ics-mr1 
* commit 'eaa17b768fcd2624cb5d46a76ade24ebe7e56957':
  Add an API for querying / enabling network TTS support.
 2011-11-05 19:33:11 +00:00
Chet Haase
77c09f847b resolved conflicts for merge of aa4d2f69 to master 
Change-Id: Iadb63ecf52d8bd2911276fa3db55a43c9c378620
 2011-11-05 12:01:51 -07:00
Dianne Hackborn
34d145d85f am 55fe6763: Merge "Include showmap output in bug report." into ics-mr1 
* commit '55fe6763d29cb0e899b2541497f4d8bc1bbd14ba':
  Include showmap output in bug report.
 2011-11-05 16:40:10 +00:00
Amith Yamasani
8598650f49 am d69c203c: Merge "Close suggestions cursor when SearchView is detached." into ics-mr1 
* commit 'd69c203cd48c1d0d3be92fb0396656ee8adc1185':
  Close suggestions cursor when SearchView is detached.
 2011-11-05 16:40:07 +00:00
Flavio Lerda
f99fcaf58e am 8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics-mr1 
* commit '8f7d88cc67e1c89c960b932ceafc60d378aa2ad6':
  Add a query parameter to look-up a SIP address.
 2011-11-05 16:40:01 +00:00
Eric Laurent
db68ff1d2e resolved conflicts for merge of 914972be to master 
Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
 2011-11-05 09:32:35 -07:00
Eric Laurent
67340ae174 Merge "resolved conflicts for merge of 79178b8b to master" 2011-11-05 08:56:06 -07:00
Eric Laurent
69dbcd018d resolved conflicts for merge of 79178b8b to master 
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
 2011-11-05 08:52:20 -07:00
Dianne Hackborn
1f0509b675 am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0 
* commit '7311bd4b709750384b058d8e988e2e983c97b3f2':
  Print out memory info when we get into a low memory situation.
 2011-11-05 07:34:03 +00:00
The Android Automerger
d17aaaee47 merge in ics-mr0-release history after reset to ics-mr0 2011-11-05 00:33:21 -07:00
Dianne Hackborn
d119913c7f Merge "Print out memory info when we get into a low memory situation." into ics-mr0 2011-11-05 00:31:17 -07:00
Jeff Brown
06234b37e3 Fix a leak in Parcel::writeBlob. 
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in.  It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.

Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
 2011-11-04 22:16:39 -07:00
Jeff Brown
343c59cc8d Merge "Slight change to the unwinder API." 2011-11-04 20:06:42 -07:00
Mathias Agopian
2b0b7a92fc Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1 2011-11-04 19:57:59 -07:00
Jeff Brown
efd912c05c am 5462bc63: Fix a leak in Parcel::writeBlob. 
* commit '5462bc6318b4b70e7a58c66994e2bd79f59d9739':
  Fix a leak in Parcel::writeBlob.
 2011-11-05 02:35:57 +00:00
Jeff Brown
93ff1f985e Fix a leak in Parcel::writeBlob. 
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in.  It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.

Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
 2011-11-04 19:26:03 -07:00
Mathias Agopian
385977f6d6 workaround to set the WM refresh rate to 48 Hz for tuna devices only 
this is TEMPORARY until we can do this properly.

Bug: 5572464
Change-Id: I6537706d636a83a4a50e2900d6b829dd89b6f245
 2011-11-04 18:46:11 -07:00
Romain Guy
60e2245b63 Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1 2011-11-04 16:35:35 -07:00
Robert Greenwalt
7972d26cec am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
  Start using IP tool for advanced routing.
 2011-11-04 22:55:30 +00:00
Robert Greenwalt
edc0bf5536 Merge "Start using IP tool for advanced routing." into ics-mr0 2011-11-04 15:53:37 -07:00
The Android Automerger
31f4de3e67 merge in ics-mr0-release history after reset to ics-mr0 2011-11-04 15:40:13 -07:00
Jamie Gennis
33e55a9545 Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1 2011-11-04 15:10:11 -07:00
Jamie Gennis
aca51c06f3 EGL: Add stubs for EGL_ANDROID_blob_cache 
This change adds a stub cache implementation that gets passed to the
underlying EGL implementation at initialization time.

Change-Id: I14437c5b6f91b7a34a19bb02ad802e6e54f88d2a
 2011-11-04 15:01:51 -07:00