ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
13,624 Commits 2 Branches 0 Tags 54 MiB
27521d041a
Commit Graph

13624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
27521d041a am 02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo 
Merge commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9' into froyo-plus-aosp

* commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9':
  Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
 2010-03-29 15:39:53 -07:00
Andreas Huber
42d211ff85 Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo 2010-03-29 15:16:20 -07:00
Jim Miller
1cd6aeed3d am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo 
Merge commit 'c6dc5070ef663e514add038b1d2e78761156b0c0' into froyo-plus-aosp

* commit 'c6dc5070ef663e514add038b1d2e78761156b0c0':
  Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
 2010-03-29 15:11:01 -07:00
Jim Miller
4a5ca158f9 Merge "Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo 2010-03-29 15:07:06 -07:00
Romain Guy
c675a07ea5 am 89d4e2dd: Fix the buid! 
Merge commit '89d4e2dd7888913d3eb1f4f669bd756a3b85f2c1' into froyo-plus-aosp

* commit '89d4e2dd7888913d3eb1f4f669bd756a3b85f2c1':
  Fix the buid!
 2010-03-29 15:05:05 -07:00
Romain Guy
cedfe8eef5 am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595 
Merge commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp

* commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
  Rename tab widget attributes, remove scroll barrier constant.
 2010-03-29 14:49:09 -07:00
Doug Zongker
19ed7d126d am ab69e29c: relocate android.util.base64.* -> android.util.* 
Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp

* commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d':
  relocate android.util.base64.* -> android.util.*
 2010-03-29 14:00:58 -07:00
Romain Guy
387d3b631b am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo 
Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp

* commit '272b504ee6aaf2515572520cd642f9a4fbf81a44':
  Tame the monkey.
 2010-03-29 13:06:20 -07:00
Dirk Dougherty
ffdd5668d1 am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo 
Merge commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3' into froyo-plus-aosp

* commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3':
  doc change: Indicate that only the first 8 characters of the key alias are used.
 2010-03-29 13:06:17 -07:00
Andreas Huber
b8de98f11f am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo 
Merge commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7' into froyo-plus-aosp

* commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7':
  Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
 2010-03-29 13:01:27 -07:00
Romain Guy
3a22b0982a Merge "Tame the monkey. Bug #2547546" into froyo 2010-03-29 13:00:42 -07:00
Dirk Dougherty
37f9b40168 Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo 2010-03-29 13:00:37 -07:00
Andreas Huber
36b3cfdfe2 Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo 2010-03-29 12:58:03 -07:00
Romain Guy
6c1c0bd44c am 0e122926: Merge "Rename private fields to break bad code examples" into froyo 
Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp

* commit '0e1229260d66b308a0ad271c20970e3decd6f55c':
  Rename private fields to break bad code examples
 2010-03-29 12:34:23 -07:00
Romain Guy
e71096b88b Merge "Rename private fields to break bad code examples" into froyo 2010-03-29 12:28:20 -07:00
Jack Palevich
83d6f3a91b am 5d961085: Add a test of EGL pausing and resuming. 
Merge commit '5d961085c33d17e43330ed2d3ada03ffcfa04817' into froyo-plus-aosp

* commit '5d961085c33d17e43330ed2d3ada03ffcfa04817':
  Add a test of EGL pausing and resuming.
 2010-03-29 12:22:08 -07:00
Jack Palevich
4b1409812a Add a test of EGL pausing and resuming. 2010-03-29 12:16:55 -07:00
Irfan Sheriff
871a165bd5 am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo 
Merge commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a' into froyo-plus-aosp

* commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a':
  cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
 2010-03-29 12:07:37 -07:00
Romain Guy
f145871a82 am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 
Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp

* commit 'ab924c909a516eb71fef7c238a20c7755f8170ed':
  Make EditTextPreference scrollable.
 2010-03-29 11:28:07 -07:00
Romain Guy
7416faf474 Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 2010-03-29 11:24:31 -07:00
The Android Open Source Project
902bb36798 merge from open-source master 
Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c
 2010-03-29 11:04:30 -07:00
The Android Open Source Project
512f431601 merge from open-source master 
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130
 2010-03-29 10:57:04 -07:00
Daniel Lehmann
f4edb1a5e7 Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 2010-03-29 10:30:54 -07:00
Jean-Michel Trivi
472cc8e787 Merge "Implement audio focus support in the notification manager." into froyo 2010-03-29 10:05:28 -07:00
Dirk Dougherty
b77145f07b Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo 2010-03-26 18:25:05 -07:00
Dianne Hackborn
aabe5c8201 Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 2010-03-26 18:06:52 -07:00
Dirk Dougherty
b064ca2ed8 Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo 2010-03-26 17:50:26 -07:00
Romain Guy
23d74e222d Merge "Don't assume there's a selected position in touch mode. Bug #2520743" into froyo 2010-03-26 17:30:40 -07:00
Dirk Dougherty
31cfa6050b Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo 2010-03-26 16:27:07 -07:00
Jean-Michel Trivi
e6be51a9e4 Merge "Cherry-picking this fix into Froyo." into froyo 2010-03-26 16:17:38 -07:00
Grace Kloba
7d840798d0 Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo 2010-03-26 15:30:26 -07:00
Grace Kloba
afa2eac17a Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo 2010-03-26 13:55:34 -07:00
Jean-Baptiste Queru
881d7baebe Merge "Hide download manager." into froyo 2010-03-26 12:25:11 -07:00
Joe Onorato
6c0bef2d9b Merge "Fix StatusBarService deadlock for real this time." into froyo 2010-03-26 12:14:49 -07:00
Daniel Sandler
949270ac56 Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo 2010-03-26 11:41:34 -07:00
Brad Fitzpatrick
e9a8c1c0d5 Merge "Clarify some Binder docs regarding things that are thread-local." 2010-03-25 21:02:46 -07:00
Mathias Agopian
3791f20082 Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" 2010-03-25 20:22:58 -07:00
Mathias Agopian
988fce5ee5 fix [2236865] STOPSHIP: bump soft gl and egl minor version number 
this is to allow developpers to deal with potiential differences
between the softgl versions.

Change-Id: I7ec2451d6af1be29818d66215b22977405d403e8
 2010-03-25 20:21:12 -07:00
Jim Miller
6cc5b453e6 Merge "Fix 2535700: Add support for enforcing password quality" 2010-03-25 19:54:15 -07:00
Dianne Hackborn
ecab4e6cca Merge "Fix Memory Leak When Switching Input Methods" 2010-03-25 19:23:09 -07:00
Marco Nelissen
460f3ef2b5 Merge "Remove spurious byte order marks from xml files." 2010-03-25 19:06:23 -07:00
Adam Powell
73f6599861 Merge "Fix bug 2544916 - Fun with AbsListView touch mode" 2010-03-25 18:55:47 -07:00
Mathias Agopian
ba5b381d01 Merge "fix [2545826] calling into gralloc with external lock held" 2010-03-25 18:42:34 -07:00
Dan Egnor
d1eeb2c682 Merge "Add "dumpsys diskstats" to get a dump of disk-free values." 2010-03-25 17:59:00 -07:00
Jack Palevich
58963a5ce8 Merge "GLSurfaceView pause and resume now synchronize with the GLThread." 2010-03-25 17:21:50 -07:00
Adam Powell
3d2cb69282 Merge "API refactoring for OverScroller." 2010-03-25 17:03:58 -07:00
The Android Open Source Project
a464ab8d98 merge from open-source master 
Change-Id: I4d8f34986fd9e16ead8a22909263069dbb819d3e
 2010-03-25 16:39:32 -07:00
Joe Onorato
8362952052 Merge "Fix 2495749 - System process crash when a notification switches sections." 2010-03-25 16:00:25 -07:00
Robert Greenwalt
d53e0cae58 Merge "Fix Tethering of multiple downstream ifaces." 2010-03-25 15:50:25 -07:00
Fred Quintana
c692215eb8 Merge "check for nulls" 2010-03-25 14:39:15 -07:00