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

36653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chia-chi Yeh
cc9b3691f2 Merge "ip-up-vpn: Create proper states for pppd and racoon." 2011-07-14 14:53:58 -07:00
John Wang
11dc831372 am 74c425d3: am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 
* commit '74c425d3e95ed0f47b1a5d447007886d01d7ff56':
  Show SIM blocked after 10 time puk wrong entries.
 2011-07-14 14:03:11 -07:00
John Wang
76652989ac am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 
* commit '54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
  Show SIM blocked after 10 time puk wrong entries.
 2011-07-14 14:00:58 -07:00
John Wang
1acde887d5 Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 2011-07-14 13:59:10 -07:00
Eino-Ville Talvala
c958b87606 Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera." 2011-07-14 13:38:55 -07:00
Elliott Hughes
bc612a0254 Merge "Fix aidl to cope with multiple collection types per method." 2011-07-14 13:28:00 -07:00
Andreas Huber
c8105b1941 Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error" 2011-07-14 13:22:45 -07:00
Romain Guy
3f5f248676 Merge "Force bitmaps to load in ARGB8888 by default. Bug #5024993" 2011-07-14 12:45:23 -07:00
Philip Milne
2989e23704 Merge "Rationalize API after adding maximum size feature." 2011-07-14 11:32:09 -07:00
Narayan Kamath
2ac5e40251 Merge "Minor documentation updates for the AudioTrack class." 2011-07-14 11:13:07 -07:00
Glenn Kasten
92c5663426 Merge "Add MEDIA_UID" 2011-07-14 10:59:40 -07:00
Wink Saville
8f06479025 am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 
* commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
  Remove STOPSHIP but allow seamless Handoff when possible.
 2011-07-14 10:55:58 -07:00
Jaikumar Ganesh
1ecf9d3e28 am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp 
* commit '6dd4531639157191e6224d3f8af5c9d099ca945f':
  Bluetooth: correcting return value from cancelDiscovery
 2011-07-14 10:55:55 -07:00
John Wang
b62a5356ff am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE 
* commit '28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
  Add getImei() to Phone interface.
 2011-07-14 10:49:38 -07:00
Dianne Hackborn
93efe80b13 Merge "Improve handling of low memory." 2011-07-14 10:48:01 -07:00
Jaikumar Ganesh
21ac6a6842 Merge "Remove Car audio class from auto pairing." 2011-07-14 10:08:41 -07:00
James Dong
4d17a026ba Merge "Support profile and level query for SW video decoders" 2011-07-14 09:59:24 -07:00
Jeff Hamilton
5bfa057ed9 Merge "unhide public apis" 2011-07-14 09:53:08 -07:00
Andreas Huber
56c2b4d5e3 Merge "Include all supported mime types when querying decoder profile/level support." 2011-07-14 09:09:14 -07:00
Andreas Huber
4d29cb39ea Merge "Remove legacy http support from stagefright, chromium is the new hotness." 2011-07-14 09:09:07 -07:00
Narayan Kamath
0dbd3b0427 Merge "Minor cleanups to TextToSpeech." 2011-07-14 08:44:39 -07:00
Glenn Kasten
139617a39c Merge "OMX CallbackDispatcher uses C++ Thread not pthread" 2011-07-14 07:54:34 -07:00
Jeff Brown
8f114f602f Merge "Refactor input dispatcher use of window/app handles." 2011-07-14 04:20:56 -07:00
Jeff Brown
c172d197f9 Merge "Fix invalid JNI call signature. Bug: 5029536" 2011-07-14 04:12:51 -07:00
Jeff Brown
8a1d693e59 Provide more descriptive name for InputChannel ashmem. 
Change-Id: I4307de9f717ac4810b1b91ee0c1a3899325acf71
 2011-07-13 22:27:37 -07:00
Adam Powell
42b12e1c76 Merge "Preserve spacing for icons in menus" 2011-07-13 20:07:41 -07:00
Svetoslav Ganov
f82d42de44 Merge "Touch exploration gesture events change the window id." 2011-07-13 17:23:41 -07:00
Mike Lockwood
9ceb5ff5c0 Merge "Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build" 2011-07-13 16:46:50 -07:00
Mike Lockwood
c2be743a9c Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build 
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-13 19:45:44 -04:00
Jason Sams
ec266daec3 Merge "Fix native crash when GL driver fails to initialize." 2011-07-13 16:43:27 -07:00
Dave Santoro
89c03508bc Merge "Contacts contract update for display photos." 2011-07-13 16:23:44 -07:00
Kenny Root
d8940dcb28 Merge "Add StorageVolume list to MountService dump" 2011-07-13 15:53:12 -07:00
Kenny Root
0ad4ea2cf2 Merge "Fix debugging for hwui caches" 2011-07-13 15:53:03 -07:00
Daniel Lehmann
fd7d7a11b9 Merge "Allow a sync adapter to provide an OPEN action for a group" 2011-07-13 15:40:03 -07:00
Christopher Tate
a9122b65a7 Merge "Compress the backup output stream" 2011-07-13 15:37:21 -07:00
Christopher Tate
a100c02b8d Compress the backup output stream 
Zlib compression, with a full flush between each application's
data.  Encryption will be performed on the already-compressed data
once that's implemented.

On restore, the streamed data is similarly uncompressed on the fly.

Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
 2011-07-13 15:30:41 -07:00
Jeff Sharkey
89dd4b5beb Merge "Control socket tagging through Settings.Secure." 2011-07-13 15:28:06 -07:00
Andreas Huber
e984b07c50 Merge "Remove old-style software decoders." 2011-07-13 15:19:44 -07:00
David 'Digit' Turner
a74e2aa3bc am 0814a9aa: am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp 
* commit '0814a9aa0c8f89f084ba37df05b3735274d78420':
  NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
  Fix missing NL
 2011-07-13 14:55:20 -07:00
Scott Main
8ca5b5e007 am 9b446cd6: am bc047bb0: am e32c49ab: docs: de-new sidenavs 
* commit '9b446cd6b4d3d2c2e2517d95937750da0d3b2df1':
  docs: de-new sidenavs
 2011-07-13 14:55:15 -07:00
Robert Ly
b045e1e69c am 4e400158: am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a 
* commit '4e4001589911b971d56c72acee140526d4575dac':
  cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
 2011-07-13 14:54:44 -07:00
Scott Main
856b69f4d4 am 22f4e8f6: am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard 
* commit '22f4e8f627e3f54b418da422eadcf0c43caa3499':
  docs: fix date on opengl dashboard
 2011-07-13 14:54:24 -07:00
Xavier Ducrohet
8d6b8ef68c am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1. 
* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
  Merge 36a3a392 from mr1.
 2011-07-13 14:53:54 -07:00
Mike Lockwood
801a6dfa8a Merge "MediaScanner: fix breakage in updates" 2011-07-13 14:33:13 -07:00
Robert Ly
1ba8f1ddc7 Merge "docs: fix for bug 3186839" 2011-07-13 14:28:52 -07:00
Svetoslav Ganov
e9ac0770ca Merge "Polish of the ActivityChooserView and ShareActionProvider." 2011-07-13 14:19:33 -07:00
Wink Saville
91249c1ef7 am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.
 2011-07-13 14:19:12 -07:00
Wink Saville
a411e3d108 Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 2011-07-13 14:15:19 -07:00
repo sync
4de78aa114 Merge "Add REFER handling." 2011-07-13 14:09:33 -07:00
Chris Craik
5fc4e6db41 Merge "Tile profiling interface" 2011-07-13 14:08:11 -07:00