ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
22,054 Commits 2 Branches 0 Tags 54 MiB
931bf48c97
Commit Graph

22054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
5cf5242cc9 Merge "Fix bug in split touches." 2010-09-28 13:43:00 -07:00
Jeff Brown
3c2450fbfb Fix bug in split touches. 
Cherry-picked down to master.

Change-Id: I786761bd6aecc021ae22d8c9a022324f3a9980d1
 2010-09-28 13:41:00 -07:00
Vasu Nori
72c1c89144 Merge "SQLiteDatabase: fix inconsistent locking" 2010-09-28 13:39:03 -07:00
Jeff Brown
ae3a02e07f am 65a5ba45: Merge "Fix bug in split touches." into gingerbread 
Merge commit '65a5ba45559e88a50c258d794a1728498c248376' into gingerbread-plus-aosp

* commit '65a5ba45559e88a50c258d794a1728498c248376':
  Fix bug in split touches.
 2010-09-28 13:30:15 -07:00
Jeff Brown
adf739abc4 Merge "Fix bug in split touches." into gingerbread 2010-09-28 13:27:37 -07:00
Jeff Brown
1c32258443 Fix bug in split touches. 
Change-Id: I808c2201a06938f82817058059f4ddcc9b1a9ae2
 2010-09-28 13:26:42 -07:00
Andreas Huber
009bc61b9a am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread 
Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp

* commit '88a995edcf3c371845cb32aed8bcddb7509bf875':
  Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
 2010-09-28 13:26:26 -07:00
Andreas Huber
a29b78b612 Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread 2010-09-28 13:23:26 -07:00
Irfan Sheriff
95763e576d am 6db64689: am c89dd54c: Remove logging on wifilock acquire/release 
Merge commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74'

* commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74':
  Remove logging on wifilock acquire/release
 2010-09-28 13:20:43 -07:00
Andy Stadler
b7f13cd5a9 am cb6f29eb: am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread 
Merge commit 'cb6f29ebc6a8cde6ed600d233e23b962d06ea43f'

* commit 'cb6f29ebc6a8cde6ed600d233e23b962d06ea43f':
  Allow touch events when clickable *or* longClickable
 2010-09-28 13:20:05 -07:00
Dave Sparks
9257e59b8b am 7dff9dfd: am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that w 
Merge commit '7dff9dfd6176fad1318a27f16318561453a429f0'

* commit '7dff9dfd6176fad1318a27f16318561453a429f0':
  Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
 2010-09-28 13:19:55 -07:00
Hung-ying Tyan
24bf6aa617 am 6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread 
Merge commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42' into gingerbread-plus-aosp

* commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42':
  SIP: Feedback any provisional responses in addition to RING
 2010-09-28 13:02:55 -07:00
Hung-ying Tyan
ce6a06d54e Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread 2010-09-28 13:00:38 -07:00
Gilles Debunne
2121f3cd04 am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread 
Merge commit 'd9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp

* commit 'd9743af92ead39b9f648043d165c415dfe8f3668':
  New assets. DO NOT MERGE>
 2010-09-28 13:00:32 -07:00
Gilles Debunne
3ff47bdcf9 Merge "New assets. DO NOT MERGE>" into gingerbread 2010-09-28 12:56:54 -07:00
Guang Zhu
beeb0332fd Merge "add multiple device support to layout test driver script" 2010-09-28 12:56:08 -07:00
Hung-ying Tyan
9132eed618 am f7e13400: am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR 
Merge commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236'

* commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236':
  SIP: add DisconnectCause.SERVER_ERROR
 2010-09-28 12:47:49 -07:00
Chung-yih Wang
685739e274 am 4a64afd2: am 24547592: Fix the startAudio order for 3-way calls. 
Merge commit '4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989'

* commit '4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989':
  Fix the startAudio order for 3-way calls.
 2010-09-28 12:47:37 -07:00
Hung-ying Tyan
897abe0d45 am 159cceaa: am 368d796e: Fix build. 
Merge commit '159cceaae22076b743626ddde84c501b3f491f6e'

* commit '159cceaae22076b743626ddde84c501b3f491f6e':
  Fix build.
 2010-09-28 12:47:31 -07:00
Jeff Brown
2341fd66b9 am 26d5786f: am 9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread 
Merge commit '26d5786fb1a43d82b40fa908e1220a018b748c93'

* commit '26d5786fb1a43d82b40fa908e1220a018b748c93':
  Fix pointer index when splitting secondary pointers.
 2010-09-28 12:47:13 -07:00
jsh
db58f561b5 am 37a3631e: Merge "Add line break between PLMN and SPN in windowshade." into gingerbread 
Merge commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096' into gingerbread-plus-aosp

* commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096':
  Add line break between PLMN and SPN in windowshade.
 2010-09-28 12:46:57 -07:00
jsh
68f2073783 Merge "Add line break between PLMN and SPN in windowshade." into gingerbread 2010-09-28 12:44:47 -07:00
Steve Howard
8839391976 am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread 
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp

* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
  Move DownloadManager to android.app (DO NOT MERGE)
 2010-09-28 12:41:42 -07:00
Steve Howard
1277bed788 Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread 2010-09-28 12:38:15 -07:00
Andreas Huber
989ee4e460 am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread 
Merge commit 'be0450619528e65eebfa1d7eab78fde757d094cc' into gingerbread-plus-aosp

* commit 'be0450619528e65eebfa1d7eab78fde757d094cc':
  Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
 2010-09-28 12:05:08 -07:00
Andreas Huber
f3b1fab582 Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread 2010-09-28 12:02:35 -07:00
Adam Powell
2b086f71fa Merge "No action bars for default holo dialog theme" 2010-09-28 11:58:53 -07:00
Andreas Huber
ce763219ec am 4769f579: Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread 
Merge commit '4769f57948455277d0670ef18f64824ca5d894c1' into gingerbread-plus-aosp

* commit '4769f57948455277d0670ef18f64824ca5d894c1':
  Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files.
 2010-09-28 11:48:44 -07:00
Andreas Huber
8a5b141433 Merge "Vorbis files may have more samples encoded that should be used, i.e. we have to trim samples at the end of the stream. This is crucial for proper looping of some audio files." into gingerbread 2010-09-28 11:46:41 -07:00
Andreas Huber
20144fef23 am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread 
Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp

* commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7':
  Squashed commit of the following:
 2010-09-28 11:35:22 -07:00
Dianne Hackborn
eb966fc91b am 08cf57d7: Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread 
Merge commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5' into gingerbread-plus-aosp

* commit '08cf57d791e50ecafe2728a7617a6487aeb6d6d5':
  Fixes to granting URI permissions - take into account path perms.
 2010-09-28 11:32:38 -07:00
Andreas Huber
e8d14e3a9f Merge "Squashed commit of the following:" into gingerbread 2010-09-28 11:27:33 -07:00
Dianne Hackborn
e640c7bb94 Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread 2010-09-28 11:21:27 -07:00
Xavier Ducrohet
71db673b8b Merge "Improve error reporting in the layoutlib class replacement test." 2010-09-28 10:59:46 -07:00
Hung-ying Tyan
ceac44e104 am 1738252a: am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread 
Merge commit '1738252a596c71851cabf5835acb3584ad6b3191'

* commit '1738252a596c71851cabf5835acb3584ad6b3191':
  Don't enter DISCONNECTING state when the call/connection is not alive
 2010-09-28 10:56:34 -07:00
Romain Guy
a0d19f9674 Merge "Display the correct expected name when loading the wrong adapter." 2010-09-28 10:35:09 -07:00
Irfan Sheriff
dc3627c894 am c89dd54c: Remove logging on wifilock acquire/release 
Merge commit 'c89dd54ceeec99173d51d1196e2c03a58f120211' into gingerbread-plus-aosp

* commit 'c89dd54ceeec99173d51d1196e2c03a58f120211':
  Remove logging on wifilock acquire/release
 2010-09-28 10:26:29 -07:00
Gil Dobjanschi
1855132d97 Merge "Validate Overlay and effect duration and start time." 2010-09-28 10:08:53 -07:00
Andy Stadler
86a0649520 am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread 
Merge commit 'a16682b5e8ed635910eada23272ba6548922c02e' into gingerbread-plus-aosp

* commit 'a16682b5e8ed635910eada23272ba6548922c02e':
  Allow touch events when clickable *or* longClickable
 2010-09-28 10:06:27 -07:00
repo sync . build/envsetup.sh lunch passion-en
a82ade0bad am 8c665807: (-s ours) am 4fc3d2f0: DO NOT MERGE 
Merge commit '8c66580759b3085866e1f9f1ca9af1a60220e574'

* commit '8c66580759b3085866e1f9f1ca9af1a60220e574':
  DO NOT MERGE
 2010-09-28 09:30:16 -07:00
Andy Stadler
a31234bb9f Merge "Allow touch events when clickable *or* longClickable" into gingerbread 2010-09-28 09:26:49 -07:00
Dave Sparks
594fa2ad8c am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on t 
Merge commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1' into gingerbread-plus-aosp

* commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1':
  Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
 2010-09-28 08:52:23 -07:00
Dave Sparks
b4a76a3249 Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well." into gingerbread 2010-09-28 08:44:39 -07:00
Steve Block
76b0ed516a Merge changes Ic62f60d9,I04a01634 
* changes:
  Provide a useful message in DumpRenderTree2 GUI when the host server is not running
  Prevent DumpRenderTree2 from crashing when the host server is not running
 2010-09-28 07:09:45 -07:00
Mike Lockwood
51f950a884 Merge changes I2491a2ce,Ie1c88bd8 
* changes:
  MtpCursor: Fix long to int truncation bug
  MtpCursor: Remove some unused variables
 2010-09-28 06:17:40 -07:00
Hung-ying Tyan
1e5c4fe3b4 am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR 
Merge commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c' into gingerbread-plus-aosp

* commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c':
  SIP: add DisconnectCause.SERVER_ERROR
 2010-09-27 23:58:08 -07:00
Adam Powell
8f8ff6a5c3 Merge "Temporary hack to make context menu text visible on holo dialogs." 2010-09-27 23:17:34 -07:00
Chung-yih Wang
c11621a77d am 24547592: Fix the startAudio order for 3-way calls. 
Merge commit '245475925eff61ee76bde58de69253a889e39d0a' into gingerbread-plus-aosp

* commit '245475925eff61ee76bde58de69253a889e39d0a':
  Fix the startAudio order for 3-way calls.
 2010-09-27 22:58:59 -07:00
Adam Powell
f466136951 Merge "Fix some text styling for Holo.Light" 2010-09-27 22:29:15 -07:00
Hung-ying Tyan
1014f60186 resolved conflicts for merge of 2a36a778 to master 
Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
 2010-09-28 12:17:44 +08:00