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

22277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hung-ying Tyan
cde4f4b49c am 368d796e: Fix build. 
Merge commit '368d796e2e28ecd738362c7a4566cb3eb219ab26' into gingerbread-plus-aosp

* commit '368d796e2e28ecd738362c7a4566cb3eb219ab26':
  Fix build.
 2010-09-27 21:09:56 -07:00
Gilles Debunne
9a9ec41961 am 4e9243d5: (-s ours) am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 
Merge commit '4e9243d55ce183542c74550e503ea583643599a0'

* commit '4e9243d55ce183542c74550e503ea583643599a0':
  Updated assets in status bar. DO NOT MERGE.
 2010-09-27 21:03:40 -07:00
Nick Kralevich
abba28ff35 am d0cb228b: am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 
Merge commit 'd0cb228b9af0b67fa3372ee075287e7409249550'

* commit 'd0cb228b9af0b67fa3372ee075287e7409249550':
  squeeze a few more bits of randomness into /dev/random
 2010-09-27 21:03:30 -07:00
Winson Chung
ceeb3823db am 55ee8f93: am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings. 
Merge commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef'

* commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
 2010-09-27 21:03:17 -07:00
Eric Fischer
fa8b818204 am 7063eb10: (-s ours) am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit '7063eb104657d1fa3f5e030b4657a9541ec6b054'

* commit '7063eb104657d1fa3f5e030b4657a9541ec6b054':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 21:03:02 -07:00
Gilles Debunne
126f463bd5 am 63555e36: (-s ours) am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 
Merge commit '63555e36c9dd9b38624ae275ffc3f598a5112057'

* commit '63555e36c9dd9b38624ae275ffc3f598a5112057':
  Revert previous status bar assets. DO NOT MERGE.
 2010-09-27 21:02:41 -07:00
Chris Palmer
cb3459e248 am d4f1436d: (-s ours) am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design. 
Merge commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853'

* commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853':
  DO NOT MERGE Clarify the explanation of Android's security design.
 2010-09-27 21:02:20 -07:00
Jeff Brown
1f1889e8af am 9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread 
Merge commit '9c37447e5c3555e4063777e4ef82e355e57f4c68' into gingerbread-plus-aosp

* commit '9c37447e5c3555e4063777e4ef82e355e57f4c68':
  Fix pointer index when splitting secondary pointers.
 2010-09-27 21:00:44 -07:00
Jeff Brown
ced8172ac1 Merge "Fix pointer index when splitting secondary pointers." into gingerbread 2010-09-27 20:57:02 -07:00
Jeff Brown
ffb16d601b Fix pointer index when splitting secondary pointers. 
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
 2010-09-27 20:54:28 -07:00
Wu-cheng Li
81948205bf resolved conflicts for merge of 191a25e1 to master 
Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
 2010-09-27 20:50:22 -07:00
Kenny Root
94ccf3aa46 am e7dd4e38: am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread 
Merge commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d'

* commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d':
  Use buffered I/O during certificate parsing
 2010-09-27 20:32:56 -07:00
Dianne Hackborn
1c33f0c8e5 resolved conflicts for merge of a8bce7c8 to master 
Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
 2010-09-27 20:25:20 -07:00
Hung-ying Tyan
1f9798de77 am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread 
Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp

* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
  Don't enter DISCONNECTING state when the call/connection is not alive
 2010-09-27 19:26:11 -07:00
Hung-ying Tyan
813ccddc02 Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread 2010-09-27 19:23:35 -07:00
Vasu Nori
3395d343e4 Merge "fix this: closing database twice fails with IllegalStateException" 2010-09-27 18:29:18 -07:00
Dharmaray Kundargi
a12769453a Merge "work on review comments and code formating. Removed white spaces" 2010-09-27 18:28:00 -07:00
repo sync . build/envsetup.sh lunch passion-en
0bf2a8bd67 am 4fc3d2f0: DO NOT MERGE 
Merge commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a' into gingerbread-plus-aosp

* commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a':
  DO NOT MERGE
 2010-09-27 17:51:45 -07:00
Hung-ying Tyan
915db0da45 am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread 
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp

* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
  Move SipService out of SystemServer to phone process.
 2010-09-27 16:29:33 -07:00
Hung-ying Tyan
6e0e4c4f11 Merge "Move SipService out of SystemServer to phone process." into gingerbread 2010-09-27 16:25:49 -07:00
Irfan Sheriff
044b14cfee Merge "use hostname when address null ProxyProperties parcelling" 2010-09-27 16:24:23 -07:00
Gilles Debunne
46fc90c680 am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 
Merge commit '8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp

* commit '8d7057df401af668335c38273bc62872e4dbf538':
  Updated assets in status bar. DO NOT MERGE.
 2010-09-27 16:17:28 -07:00
Jeff Brown
16076ad4df Merge "Add support for transferring touch focus." 2010-09-27 16:11:23 -07:00
Jeff Brown
744c559ac7 Add support for transferring touch focus. 
Prerequisite for drag and drop.

Change-Id: Iedbe93ed0f3e1c4083130fe66b4ba06d416afce0
 2010-09-27 16:10:17 -07:00
Gilles Debunne
eec02f9bad Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 2010-09-27 16:07:47 -07:00
Joe Onorato
c785da2021 Merge "Don't show X for notifications that can't be cleared" 2010-09-27 15:55:23 -07:00
Joe Onorato
7f5a241395 Merge "Hide the "Clear all" button in the notification panel if there are no clearable notifications." 2010-09-27 15:54:55 -07:00