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

22087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Howard
2438baba54 am e468a4bc: am 751b4731: Merge "A few additions to the download manager public API documentation" into gingerbread 
Merge commit 'e468a4bc74f1b241b3de09ea99251a419e40c6d3'

* commit 'e468a4bc74f1b241b3de09ea99251a419e40c6d3':
  A few additions to the download manager public API documentation
 2010-10-01 14:19:09 -07:00
Brad Fitzpatrick
e9f1281c74 resolved conflicts for merge of 6718b365 to master 
Change-Id: I32762a4a3b00856f6765d50667b667264a385fc6
 2010-10-01 13:57:04 -07:00
Steve Howard
baf1165ecb am 751b4731: Merge "A few additions to the download manager public API documentation" into gingerbread 
Merge commit '751b47313886264e1229ab67184c9771424be402' into gingerbread-plus-aosp

* commit '751b47313886264e1229ab67184c9771424be402':
  A few additions to the download manager public API documentation
 2010-10-01 13:16:17 -07:00
Steve Howard
87548ede54 Merge "A few additions to the download manager public API documentation" into gingerbread 2010-10-01 13:12:39 -07:00
Brad Fitzpatrick
9562f7abca am 32e60c79: Update StrictMode\'s public API. 
Merge commit '32e60c7942eeba920ec5c27b372ec0899fd75a20' into gingerbread-plus-aosp

* commit '32e60c7942eeba920ec5c27b372ec0899fd75a20':
  Update StrictMode's public API.
 2010-10-01 13:05:02 -07:00
Wei-Ta Chen
30903b5e20 am eeac43ad: (-s ours) am f7681f84: Do not merge. 
Merge commit 'eeac43ad3c9b41c1679f3ab36064fa611106faf2'

* commit 'eeac43ad3c9b41c1679f3ab36064fa611106faf2':
  Do not merge.
 2010-10-01 12:39:42 -07:00
Wei-Ta Chen
75d25a5acd am f7681f84: Do not merge. 
Merge commit 'f7681f84918c27f6a626681ce37ed2a236c44e82' into gingerbread-plus-aosp

* commit 'f7681f84918c27f6a626681ce37ed2a236c44e82':
  Do not merge.
 2010-10-01 12:36:05 -07:00
Mathias Agopian
84ac949b0e Merge "refactored screenshot code" 2010-10-01 12:15:12 -07:00
James Dong
f6c18bcc4a Merge "Add a video record utility" 2010-10-01 12:10:10 -07:00
Andreas Huber
d4dfeb6c74 am 57853559: am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread 
Merge commit '57853559c31154db9c202d653065c592169c5027'

* commit '57853559c31154db9c202d653065c592169c5027':
  Start playing live streams from the start, no the middle...
 2010-10-01 11:40:18 -07:00
Andreas Huber
0a65d84933 am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread 
Merge commit 'e619a9da44e4c00f9034917aef67f86da0bc207f' into gingerbread-plus-aosp

* commit 'e619a9da44e4c00f9034917aef67f86da0bc207f':
  Start playing live streams from the start, no the middle...
 2010-10-01 11:37:44 -07:00
Fabrice Di Meglio
b4e996822d am 797bb4f8: am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread 
Merge commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545'

* commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545':
  Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
 2010-10-01 11:35:37 -07:00
Andreas Huber
c264c38e19 Merge "Start playing live streams from the start, no the middle..." into gingerbread 2010-10-01 11:35:17 -07:00
Fabrice Di Meglio
b4d2dfb95c am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread 
Merge commit '73db5f02a1e1a3fc3514ddbff1c28e22fec3aa7a' into gingerbread-plus-aosp

* commit '73db5f02a1e1a3fc3514ddbff1c28e22fec3aa7a':
  Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
 2010-10-01 11:32:56 -07:00
Fabrice Di Meglio
e520131959 Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread 2010-10-01 11:30:50 -07:00
Andreas Huber
70be753777 am d6d5cfb9: am 469b8033: Merge "Remove development-only code." into gingerbread 
Merge commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16'

* commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16':
  Remove development-only code.
 2010-10-01 11:29:26 -07:00
Andreas Huber
c2ce188320 am 469b8033: Merge "Remove development-only code." into gingerbread 
Merge commit '469b80336368bef3742e97c15e9017c1f2d404ae' into gingerbread-plus-aosp

* commit '469b80336368bef3742e97c15e9017c1f2d404ae':
  Remove development-only code.
 2010-10-01 11:25:57 -07:00
Andreas Huber
16e3e00799 Merge "Remove development-only code." into gingerbread 2010-10-01 11:23:24 -07:00
Erik
f591e1e034 am 277465fb: am 57bd0615: Merge "b/3054044 Make allDay event times format in utc" into gingerbread 
Merge commit '277465fb5bfc74716f194f1abc2befb42ed73590'

* commit '277465fb5bfc74716f194f1abc2befb42ed73590':
  b/3054044 Make allDay event times format in utc
 2010-10-01 11:21:21 -07:00
Andreas Huber
777f6b7ede am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into gingerbread 
Merge commit '14401bf7bca34c692f248406c78bd8b49783217a'

* commit '14401bf7bca34c692f248406c78bd8b49783217a':
  Squashed commit of the following:
 2010-10-01 11:21:16 -07:00
Erik
aca8781ff9 am 57bd0615: Merge "b/3054044 Make allDay event times format in utc" into gingerbread 
Merge commit '57bd0615fa48124c4607fbb1ba09a7c7160be146' into gingerbread-plus-aosp

* commit '57bd0615fa48124c4607fbb1ba09a7c7160be146':
  b/3054044 Make allDay event times format in utc
 2010-10-01 11:10:59 -07:00
Erik
b1ab6a8fff Merge "b/3054044 Make allDay event times format in utc" into gingerbread 2010-10-01 11:08:13 -07:00
Andreas Huber
c9e22d2a82 am d1398db3: Merge "Squashed commit of the following:" into gingerbread 
Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp

* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
  Squashed commit of the following:
 2010-10-01 11:03:47 -07:00
Andreas Huber
47ec74b31c Merge "Squashed commit of the following:" into gingerbread 2010-10-01 11:01:33 -07:00
Kenny Root
fb5a36a133 am 637a8d84: am 29423918: Fix regression in OBB key handling 
Merge commit '637a8d84bacd0b6973a16843259f0c11845f2cd2'

* commit '637a8d84bacd0b6973a16843259f0c11845f2cd2':
  Fix regression in OBB key handling
 2010-10-01 09:07:34 -07:00
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