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

22213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
95fafca8d5 am 29423918: Fix regression in OBB key handling 
Merge commit '2942391801b79816c5eb77d7ac94c4a65f26af48' into gingerbread-plus-aosp

* commit '2942391801b79816c5eb77d7ac94c4a65f26af48':
  Fix regression in OBB key handling
 2010-10-01 08:55:53 -07:00
Derek Sollenberger
1cadc482b7 Merge "Ensure full screen plugin is dismissed when necessary." 2010-10-01 08:50:51 -07:00
Roy West
cbcee6f6a6 Merge "Cherrypick unmerged dev admin string edits from Gingerbread." 2010-10-01 08:30:49 -07:00
Romain Guy
3f3104dd4d Merge "Fix INVALID_OPERATION error with layers rendering." 2010-10-01 00:27:21 -07:00
Dianne Hackborn
3b6a6bb594 resolved conflicts for merge of 6a3eddb4 to master 
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
 2010-09-30 20:34:34 -07:00
Joe Onorato
931bf48c97 am 0457db37: am ab2e6284: Merge "Use the private version of userActivity." into gingerbread 
Merge commit '0457db37de22d430df0e55a7552dcfe81b701627'

* commit '0457db37de22d430df0e55a7552dcfe81b701627':
  Use the private version of userActivity.
 2010-09-30 19:48:31 -07:00
Kenny Root
eca9494092 am 8d85beca: am 8b28441a: Merge "Being already unmounted is not a failure" into gingerbread 
Merge commit '8d85beca80f0c84344ffb527ec7cab0ca7b53d4f'

* commit '8d85beca80f0c84344ffb527ec7cab0ca7b53d4f':
  Being already unmounted is not a failure
 2010-09-30 19:48:27 -07:00
Chia-chi Yeh
4cb9d17461 am c38e6ae4: am 274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread 
Merge commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4'

* commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4':
  RTP: Start AudioRecord before AudioTrack to avoid being disabled.
 2010-09-30 19:47:49 -07:00
Eric Laurent
9102ed18cd am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread 
Merge commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9'

* commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9':
  Issue 3032913: improve AudioTrack recovery time
 2010-09-30 19:47:21 -07:00
Kenny Root
8e8ce3f0ff am 4309b52f: am 735de3b3: Hash keys with MD5; track IBinders not IInterface 
Merge commit '4309b52fe19de5241113d8f9ebcdf52741e086a9'

* commit '4309b52fe19de5241113d8f9ebcdf52741e086a9':
  Hash keys with MD5; track IBinders not IInterface
 2010-09-30 19:47:06 -07:00
Kenny Root
752c879d9a am 0f064de8: am 27358a69: Only allow 8 OBBs to be mounted by a UID 
Merge commit '0f064de830d11ddb08a3c000b894b46aa530348a'

* commit '0f064de830d11ddb08a3c000b894b46aa530348a':
  Only allow 8 OBBs to be mounted by a UID
 2010-09-30 19:47:00 -07:00
Kenny Root
9d91aeaaed am 6ce5f60c: am 38cf8867: Remove OBBs from state list when volume unmounted 
Merge commit '6ce5f60c791401ed0faf5d36baf4fc6612358676'

* commit '6ce5f60c791401ed0faf5d36baf4fc6612358676':
  Remove OBBs from state list when volume unmounted
 2010-09-30 19:46:46 -07:00
Hung-ying Tyan
50b877497c am 9af6b536: am 063d02bb: Merge "SipService: turn off verbose logging" into gingerbread 
Merge commit '9af6b53676061db6fc9c18300dc7d8258f7306ab'

* commit '9af6b53676061db6fc9c18300dc7d8258f7306ab':
  SipService: turn off verbose logging
 2010-09-30 19:46:40 -07:00
Steve Howard
a45866fe86 am efb8b427: am 4ba2817c: Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread 
Merge commit 'efb8b42789a291e38a7e837f64d18bcb511f65f9'

* commit 'efb8b42789a291e38a7e837f64d18bcb511f65f9':
  Avoid NPE when viewing failed legacy download with no local path
 2010-09-30 19:46:23 -07:00
Jake Hamby
1a32bb16b1 resolved conflicts for merge of 738aadd7 to master 
Change-Id: I8810cc6dbd532de002d6a623ad93e86afb48c0b4
 2010-09-30 19:33:43 -07:00
Dianne Hackborn
2115827c8a am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread 
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
  Rub in a little 'ol log-b-gone.
 2010-09-30 19:12:11 -07:00
Dianne Hackborn
6381cf3b9d Merge "Rub in a little 'ol log-b-gone." into gingerbread 2010-09-30 19:03:38 -07:00
Jason Sams
d97c57d307 Merge "Add object validity checking." 2010-09-30 18:35:56 -07:00
Joe Onorato
9b4301378b am ab2e6284: Merge "Use the private version of userActivity." into gingerbread 
Merge commit 'ab2e6284845794079d809e62c52c6c380b31c4b5' into gingerbread-plus-aosp

* commit 'ab2e6284845794079d809e62c52c6c380b31c4b5':
  Use the private version of userActivity.
 2010-09-30 18:19:09 -07:00
Jeff Brown
3f0fd1897c am 5d3cef8a: am e0c12c88: Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread 
Merge commit '5d3cef8a6d1baec29512764b9e0ba240ccd7fcfe'

* commit '5d3cef8a6d1baec29512764b9e0ba240ccd7fcfe':
  Move verbose logging of device capabilities to dumpsys.
 2010-09-30 18:12:28 -07:00
Joe Onorato
f25ba29a5b Merge "Use the private version of userActivity." into gingerbread 2010-09-30 18:12:24 -07:00
Eric Fischer
3ea86dfb34 am cfba8c03: (-s ours) am 194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'cfba8c0337e9a8d55389bcae7caa7a8db230f711'

* commit 'cfba8c0337e9a8d55389bcae7caa7a8db230f711':
  Import revised translations.  DO NOT MERGE
 2010-09-30 18:12:08 -07:00
Kenny Root
1d38aff4f9 am 8b28441a: Merge "Being already unmounted is not a failure" into gingerbread 
Merge commit '8b28441adab59f2bb0d92c8a717af75331249e08' into gingerbread-plus-aosp

* commit '8b28441adab59f2bb0d92c8a717af75331249e08':
  Being already unmounted is not a failure
 2010-09-30 18:06:02 -07:00
Kenny Root
eba1e0162a Merge "Being already unmounted is not a failure" into gingerbread 2010-09-30 18:03:25 -07:00
Chia-chi Yeh
8b3f9d3a8b am 274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread 
Merge commit '274e3b5d752d1a4fd05352e50ad098d2f5b49a36' into gingerbread-plus-aosp

* commit '274e3b5d752d1a4fd05352e50ad098d2f5b49a36':
  RTP: Start AudioRecord before AudioTrack to avoid being disabled.
 2010-09-30 18:02:38 -07:00
Eric Laurent
ba557210be am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread 
Merge commit '220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp

* commit '220ab8877b234e6807b7f6d9028ba55d23220301':
  Issue 3032913: improve AudioTrack recovery time
 2010-09-30 17:47:07 -07:00
Chia-chi Yeh
ded2f9d4c0 Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread 2010-09-30 17:41:09 -07:00
Eric Laurent
2a6277cfd9 Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread 2010-09-30 17:39:36 -07:00
Kenny Root
8e468f17e5 am 735de3b3: Hash keys with MD5; track IBinders not IInterface 
Merge commit '735de3b38abbd6564082a819377673ee593744a6' into gingerbread-plus-aosp

* commit '735de3b38abbd6564082a819377673ee593744a6':
  Hash keys with MD5; track IBinders not IInterface
 2010-09-30 17:30:37 -07:00
Kenny Root
34f447289b am 27358a69: Only allow 8 OBBs to be mounted by a UID 
Merge commit '27358a69b33eaa268ee75ef778ec824c8085adcc' into gingerbread-plus-aosp

* commit '27358a69b33eaa268ee75ef778ec824c8085adcc':
  Only allow 8 OBBs to be mounted by a UID
 2010-09-30 17:30:33 -07:00
Kenny Root
3598515301 am 38cf8867: Remove OBBs from state list when volume unmounted 
Merge commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94' into gingerbread-plus-aosp

* commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94':
  Remove OBBs from state list when volume unmounted
 2010-09-30 17:30:22 -07:00
Kenny Root
c81ed531d3 am aff30c9b: am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread 
Merge commit 'aff30c9b0db2c4e28afbe83436ab9024b67665cf'

* commit 'aff30c9b0db2c4e28afbe83436ab9024b67665cf':
  Fix location of gdbserver upon installation
 2010-09-30 17:25:57 -07:00
Hung-ying Tyan
6e6b48f7e8 am 063d02bb: Merge "SipService: turn off verbose logging" into gingerbread 
Merge commit '063d02bb03a9260314b529490866528433148738' into gingerbread-plus-aosp

* commit '063d02bb03a9260314b529490866528433148738':
  SipService: turn off verbose logging
 2010-09-30 17:25:30 -07:00
Steve Howard
348a2fd32a am 4ba2817c: Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread 
Merge commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db' into gingerbread-plus-aosp

* commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db':
  Avoid NPE when viewing failed legacy download with no local path
 2010-09-30 17:22:35 -07:00
Hung-ying Tyan
9e03f93304 Merge "SipService: turn off verbose logging" into gingerbread 2010-09-30 17:20:25 -07:00
Christopher Tate
5650c9dfb9 Merge "Drag/drop APIs and infrastructure" 2010-09-30 17:04:31 -07:00
Romain Guy
9dafffd782 Merge "Make simple paths made of lines work." 2010-09-30 16:59:29 -07:00
Jake Hamby
8c14ddd7bc resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp 
Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
 2010-09-30 16:29:13 -07:00
Steve Howard
77b23794f8 Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread 2010-09-30 16:22:58 -07:00
Jeff Brown
5076311956 am e0c12c88: Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread 
Merge commit 'e0c12c8803a7e2457098afc5dbf00e501d725fa0' into gingerbread-plus-aosp

* commit 'e0c12c8803a7e2457098afc5dbf00e501d725fa0':
  Move verbose logging of device capabilities to dumpsys.
 2010-09-30 15:57:29 -07:00
Eric Fischer
c2b33157f1 am 194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '194f524456ebecbe13180146160a9b177cfb6be1' into gingerbread-plus-aosp

* commit '194f524456ebecbe13180146160a9b177cfb6be1':
  Import revised translations.  DO NOT MERGE
 2010-09-30 15:54:26 -07:00
Jake Hamby
514c70a790 Merge "Typo fixes in comments and minor code cleanups." into gingerbread 2010-09-30 15:47:34 -07:00
Jeff Brown
39e1275d2b Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread 2010-09-30 15:46:00 -07:00
Eric Fischer
dd8fa072b0 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-30 15:44:54 -07:00
Mike Lockwood
588b08cec0 resolved conflicts for merge of 53b07027 to master 
Change-Id: Ia5ce86d84454a4be76e71aeb77942ba8d88d2700
 2010-09-30 18:43:52 -04:00
Jeff Brown
26c94ff615 Move verbose logging of device capabilities to dumpsys. 
Change-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7
 2010-09-30 15:34:48 -07:00
Steve Howard
87ec56b453 Merge "Updated current.xml as autogenerated" 2010-09-30 14:59:15 -07:00
Dianne Hackborn
c8a2bda89b am c3bc8b7b: am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into gingerbread 
Merge commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d'

* commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d':
  Fix night/notnight resource folder handling.
 2010-09-30 14:57:23 -07:00
Paul Westbrook
b5e2ae7575 am 5dcaf7b0: am fcf1948a: Moved Rfc822 validator test 
Merge commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa'

* commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa':
  Moved Rfc822 validator test
 2010-09-30 14:56:34 -07:00
Steve Howard
5a8f78123b Merge "resolved conflicts for merge of 538c3fa3 to master" 2010-09-30 14:43:53 -07:00