ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
42,206 Commits 2 Branches 0 Tags 54 MiB
b947b40f21
Commit Graph

42206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
b947b40f21 Merge "Use the carrier-given dns addrs for tethering." 2011-12-12 14:02:02 -08:00
Gilles Debunne
0bc83f24f0 am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 
* commit 'afa0a714acb45e90bdda3fd72b529a817a25f2d1':
  Fixed SpellCheckerSessions leak in TextView
 2011-12-12 13:15:53 -08:00
Gilles Debunne
df7e6c5f4f am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1 
* commit 'e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
  Re-use SpanSets in TextLine
 2011-12-12 13:15:46 -08:00
Joe Malin
aa932891f5 am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-12 13:15:36 -08:00
Chia-chi Yeh
168eaf1481 am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 
* commit 'fa71962fe4595f484071ac0deb23f68d44932d83':
  VPN: delete the "abort" file before starting VPN daemons.
 2011-12-12 13:15:34 -08:00
Irfan Sheriff
568a6fce2a am c34306e4: am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1 
* commit 'c34306e46e0f53a9478216c2d5fd3129a3bc6f8e':
  Fix wifi bring up at boot up
 2011-12-12 12:35:12 -08:00
Jake Hamby
49a5fc6c4d am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 
* commit '555fe79cdf037e7250f04591e60ecc8cff0cb95e':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
 2011-12-12 12:35:09 -08:00
Romain Guy
9e212ebc0f Merge "Code cleanup" 2011-12-12 11:44:43 -08:00
Romain Guy
d3e5f4e5df Merge "Free up resources by deleting shaders early on" 2011-12-12 11:44:32 -08:00
Amith Yamasani
f074f7e101 Merge "Show the current stream's volume in the volume panel." 2011-12-12 09:56:26 -08:00
Andreas Huber
fc829f73a0 Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" 2011-12-12 08:32:28 -08:00
Ben Murdoch
ddf9a54596 Merge "Clear the WebView picture when a new load starts." 2011-12-12 03:13:46 -08:00
Makoto Onuki
a5c08d1157 Merge "MCC detection fixes for CountryDetector" 2011-12-10 13:23:59 -08:00
Andreas Huber
6ddc5e610f am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-09 18:09:21 -08:00
Andreas Huber
93796f5124 am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 
* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
 2011-12-09 18:09:19 -08:00
Svetoslav Ganov
85bfd59774 am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 
* commit '33a3b2cecf174cb14097498214131fcfb32ec04c':
  NumberPicker getting stuck if scroll wheel not wrapable.
 2011-12-09 18:09:16 -08:00
Irfan Sheriff
20b65d5a8b am a3c7c358: am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1 
* commit 'a3c7c35873235486787d58fa8310eebd87508bc9':
  Handle emergency call back mode correctly
 2011-12-09 18:09:07 -08:00
Gilles Debunne
9a02eaff39 am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1 
* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
  Make the Next key navigate between TextViews
 2011-12-09 18:09:03 -08:00
Gilles Debunne
abc3f0ba7b resolved conflicts for merge of 5371a165 to master 
Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7
 2011-12-09 18:06:34 -08:00
Claudia de Veaux
b7eb84f110 Merge "Edit to string to change "double-touch" to "double-tap" per standard language." 2011-12-09 16:42:11 -08:00
Steven Ross
d651ce7314 Merge "Checking whether screen is on in constructor fixes 5658742" 2011-12-09 16:28:39 -08:00
Eric Fischer
1136e9bc2a am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '8430094cd9ecfcb932014ed5ae2d3db095bc7382':
  Import revised translations. DO NOT MERGE
 2011-12-09 14:58:10 -08:00
The Android Open Source Project
9c31b9e723 am abe0ed49: am 641a5624: Reconcile with ics-mr0-release 
* commit 'abe0ed4916537bf7244a4723e374591bfcf7e967':
 2011-12-09 14:58:07 -08:00
The Android Open Source Project
001e423026 am 54854d31: Reconcile with ics-mr0-release ics-mr1-release 
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
 2011-12-09 14:57:48 -08:00
Nick Pelly
3a51491c7e Merge "Add BluetoothAdapter.getRemoteDevice(byte[])" 2011-12-09 14:37:05 -08:00
Nick Pelly
bcf60e2fb3 Merge "Fix BasicNfcEeTest java package." 2011-12-09 14:36:23 -08:00
Gilles Debunne
73f964f15e am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1 
* commit 'aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
  IOOB is Suggestions
 2011-12-09 14:25:55 -08:00
Gilles Debunne
2d288fd5a5 am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1 
* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
  Prevent NPE in SuggestionSpan
 2011-12-09 14:25:53 -08:00
Jeff Tinker
bdb7342098 am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-09 14:25:49 -08:00
Jeff Brown
f1154c79c1 am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1 
* commit '03e634270d880407316b51fac2278e604fc82703':
  Shortcut keys should be handled on down, not up.
 2011-12-09 14:25:41 -08:00
Jeff Brown
10fc3b07a0 am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1 
* commit '944c985b4199e6e029568ea87004c9727e469cc0':
  Fix system hotkey handling.
 2011-12-09 14:25:38 -08:00
Jack Palevich
5cf2844870 Merge "Fix convert8To4, convert8To5" 2011-12-09 14:19:39 -08:00
Jack Palevich
2b93f0bf44 Fix convert8To4, convert8To5 
See b/5680952 "Compilation warnings in etc1.cpp" for discussion.

Fixes b/5680952

Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
 2011-12-09 14:06:07 -08:00
Irfan Sheriff
992f67b2c5 Merge "Change RSSI notification levels to 5 in framework" 2011-12-09 12:43:28 -08:00
Romain Guy
f647099b58 Merge "Enable dirty regions on newly created EGL surfaces" 2011-12-09 12:28:46 -08:00
Kristian Monsen
9479f3bb08 Merge "Update string lengths, fix for bug 5732776" 2011-12-09 10:12:41 -08:00
Alex Sakhartchouk
a662e2ee63 Merge "Making UI a bit more responsive." 2011-12-09 10:04:27 -08:00
Narayan Kamath
8ed4c98940 Merge "Remove BlockingMediaPlayer." 2011-12-09 06:30:14 -08:00
Romain Guy
b634cd3f13 Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917" 2011-12-08 18:51:03 -08:00
Romain Guy
870165d2a2 GenerationCache::get would return a random value instead of NULL 
Bug #5401917

This was causing a ton of random crashes in apps.

Change-Id: I9069a060824ec89115cd3bcd38beaeb9ecc4488e
 2011-12-08 18:50:27 -08:00
Gilles Debunne
fb33136654 am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 
* commit 'df3722895172e03c81787f62d922daabaad3e20b':
  Fixed SpellCheckerSessions leak in TextView
 2011-12-08 18:19:57 -08:00
Gilles Debunne
61685f375f Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 2011-12-08 18:18:25 -08:00
Gilles Debunne
94c12ded11 am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1 
* commit '316ca5059ebd7270a04da5649d25653c355e158d':
  Re-use SpanSets in TextLine
 2011-12-08 18:00:12 -08:00
Gilles Debunne
4ef3648be8 Merge "Re-use SpanSets in TextLine" into ics-mr1 2011-12-08 17:58:24 -08:00
Joe Malin
9045e2e3c8 am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '556e4ca54161be17333ec98fadc113485120a6e8':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-08 17:46:44 -08:00
Joe Malin
2cbbddc0e1 am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-08 17:44:34 -08:00
Joe Malin
4eb44fe66d Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 2011-12-08 17:42:36 -08:00
Chia-chi Yeh
87f89d1850 am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 
* commit '46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
  VPN: delete the "abort" file before starting VPN daemons.
 2011-12-08 17:24:16 -08:00
Chia-chi Yeh
0c18a10c10 Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 2011-12-08 17:22:16 -08:00
Irfan Sheriff
7e4d6371a7 am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1 
* commit '97ff7893321362020211fae3c5a52b95c3ec19e1':
  Fix wifi bring up at boot up
 2011-12-08 16:01:59 -08:00