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

40764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Xie
cd99c18818 am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 14:35:53 +00:00
Dianne Hackborn
f96004644b am 665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1 
* commit '665e105f145fcb27a54d53c6c9382bebf50a56d7':
  Cleanup remote execution of perf tests.
 2011-11-09 14:35:51 +00:00
The Android Open Source Project
5ae931bb74 am 6dee1a9d: Reconcile with ics-mr0-release 
* commit '6dee1a9d046458134fb019669b5ffe7911dcdb29':
 2011-11-09 14:35:48 +00:00
Adam Cohen
8f002f0ab6 am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
  Making default widget padding public API
 2011-11-09 14:35:45 +00:00
Glenn Kasten
086e2da211 am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit '19998120f53caceb620f138c6eea182f1e693660':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 14:35:18 +00:00
Tom Taylor
52920840e2 am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
  Add new secure setting for controlling Messaging notifications
 2011-11-09 14:34:18 +00:00
Kristian Monsen
422532eb3f Merge "Part of fix for bug 5584571 Add HTTP request header with app name" 2011-11-09 03:35:01 -08:00
David 'Digit' Turner
87b39f8b50 Merge "NDK: ANativeActivity: Fix documentation for 'clazz' member." 2011-11-09 02:18:02 -08:00
Flavio Lerda
9626c08dac Merge "Adding two tests to ensure formatNumber is working correctly with Polish numbers, both valid and invalid." 2011-11-09 02:13:41 -08:00
Jeff Sharkey
a04ca4724f Merge "Make policy data enabled flag static." into ics-mr1 2011-11-08 23:43:12 -08:00
Jeff Brown
fa9478656b Merge "Fix JavaDoc typos." 2011-11-08 20:41:09 -08:00
Jeff Brown
126bd58619 Merge "Delete dead code." 2011-11-08 20:40:55 -08:00
Daniel Sandler
1f272dc236 Merge "Add day of week." into ics-mr1 2011-11-08 20:35:45 -08:00
Mathias Agopian
ad04253386 Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1 2011-11-08 18:01:21 -08:00
Dianne Hackborn
6cd3075925 Merge "Don't crash if there is no connectivity service." into ics-mr1 2011-11-08 17:58:26 -08:00
Svetoslav Ganov
37adec8a7e Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 2011-11-08 17:33:49 -08:00
Glenn Kasten
842caaa0af Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0 2011-11-08 17:31:32 -08:00
Jeff Sharkey
0679ce0ae8 Merge "Avoid inconsistent state when remove fails." into ics-mr1 2011-11-08 17:27:03 -08:00
Jeff Brown
d2ab7ea0c5 Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 2011-11-08 17:22:06 -08:00
Mathias Agopian
d44935fcde Merge "SensorService now always clamps the requested rate" into ics-mr1 2011-11-08 17:20:59 -08:00
Dianne Hackborn
6804efbfc2 Merge "Add drop box reports of low memory." into ics-mr1 2011-11-08 17:01:05 -08:00
Michael Kolb
47a6101d77 Merge "Remove flicker from WebTextView" into ics-mr1 2011-11-08 16:34:53 -08:00
Jamie Gennis
07289f166a Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 2011-11-08 16:15:26 -08:00
Jamie Gennis
63a49a63f7 Merge changes I18e5e789,I5cbaae2d into ics-mr1 
* changes:
  EGL: implement loading and saving the cache
  EGL: use an in-memory the blob cache
 2011-11-08 16:14:44 -08:00
Fabrice Di Meglio
804fe7aab8 Merge "Fix bug #5559439 Bogus tab title in browser" 2011-11-08 15:57:40 -08:00
Mathias Agopian
0fe35d093b Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1 2011-11-08 15:55:55 -08:00
Fabrice Di Meglio
1696a8c564 Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 2011-11-08 15:55:41 -08:00
Jamie Gennis
98c6383580 EGL: implement loading and saving the cache 
This change adds support for saving and loading the contents of the EGL
cache.  It also adds some simple tests for the EGL cache.

Change-Id: I18e5e789e0897a0783d29d1c1e64d26de2dd44c4
 2011-11-08 15:54:36 -08:00
Irfan Sheriff
5036774acd Merge "Convert soft ap config store to state machine" into ics-mr1 2011-11-08 15:51:43 -08:00
Dave Santoro
021ae663a5 Merge "Unhide social stream APIs for Contacts." into ics-mr1 2011-11-08 14:48:21 -08:00
Adam Powell
32dbf75850 Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 2011-11-08 14:32:29 -08:00
Jake Hamby
376193d656 am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 
* commit 'fee5f29b22f99bd2891fb2af54669f20832fb851':
  Fix exception when sending multi-page SMS with Turkish characters.
 2011-11-08 22:02:49 +00:00
Brian Colonna
2e3f265633 am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 
* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
  Fix 5514230: preventing null window token from occurring
 2011-11-08 22:02:48 +00:00
Jake Hamby
9db7f39431 Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 2011-11-08 13:22:34 -08:00
Wei Huang
666a5e7e84 Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 2011-11-08 13:16:02 -08:00
Brian Colonna
211e1d4227 Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 2011-11-08 12:51:36 -08:00
Matthew Xie
371ca8ca49 Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-08 12:19:37 -08:00
Dianne Hackborn
4b91a35a6f Merge "Cleanup remote execution of perf tests." into ics-mr1 2011-11-08 11:52:58 -08:00
The Android Open Source Project
d9a661544e Reconcile with ics-mr0-release 
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
 2011-11-08 11:08:20 -08:00
Adam Cohen
a63aa04653 Merge "Making default widget padding public API" into ics-mr1 2011-11-08 10:53:39 -08:00
Andreas Huber
6304b42833 resolved conflicts for merge of 26f70db9 to master 
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
 2011-11-08 10:40:20 -08:00
Robert Greenwalt
0950014537 Merge "Fix build." into ics-mr1 2011-11-08 10:31:37 -08:00
Adam Powell
ccb01309ea Merge "Fix bug 5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1 2011-11-08 10:06:00 -08:00
Danielle Millett
acc37017ee Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 2011-11-08 10:03:24 -08:00
Robert Greenwalt
12c1aaafd5 Merge "Wimax : wimax framework related open source." into ics-mr1 2011-11-08 10:01:07 -08:00
Tom Taylor
ad5385f1f0 Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 2011-11-08 09:00:22 -08:00
Andreas Huber
4b50a6a902 Merge "Remove surface legacy APIs and code." into ics-mr1 2011-11-08 08:48:31 -08:00
John Reck
a7f4179992 am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1 
* commit '99015a2464a40097c3e23e07cdf69da0f886aa66':
  Remove unnecessary memory allocations
 2011-11-08 16:41:32 +00:00
John Reck
327714950f Merge "Remove unnecessary memory allocations" into ics-mr1 2011-11-08 08:38:07 -08:00
Eric Laurent
b5162170a7 am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1 
* commit 'f3a892ab9347ce733b81ccb4913a91c586f8f367':
  AudioFlinger: mix track only when really ready
 2011-11-08 16:37:11 +00:00