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

18705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
bd434f9205 am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread 
Merge commit '10e2120bdd2d99e100db187d49ac6a8495c7f956' into gingerbread-plus-aosp

* commit '10e2120bdd2d99e100db187d49ac6a8495c7f956':
  Add CallManager/Phone.setEchoSuppressionEnabled().
 2010-10-01 15:56:02 -07:00
Adam Powell
5f07bee454 am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread 
Merge commit '98f310879790a98c4c24cd06677e08bf49f1cea0' into gingerbread-plus-aosp

* commit '98f310879790a98c4c24cd06677e08bf49f1cea0':
  DO NOT MERGE Fix bug 3026771, other design/asset fixes.
 2010-10-01 15:55:44 -07:00
Kenny Root
d9018f0933 am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread 
Merge commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486' into gingerbread-plus-aosp

* commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486':
  Add "none" for vold and deprecate mkobb -c
 2010-10-01 15:11:22 -07:00
Hung-ying Tyan
aa2d67d4b7 Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread 2010-10-01 14:52:00 -07:00
Adam Powell
0cb6b18839 Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread 2010-10-01 14:46:40 -07:00
Dianne Hackborn
7502ebeb17 am fd57416c: Fix build. 
Merge commit 'fd57416cc8c2a333f46cacad6de48a3b1547eac9' into gingerbread-plus-aosp

* commit 'fd57416cc8c2a333f46cacad6de48a3b1547eac9':
  Fix build.
 2010-10-01 14:21:32 -07:00
Kenny Root
45c396e868 Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread 2010-10-01 14:06:46 -07:00
Dianne Hackborn
0292254793 am 1fa69735: Merge "Fix issue #3037083: Problem report for Pinball" into gingerbread 
Merge commit '1fa69735d9e786da4b20c3ab3da3aa66f3cf8116' into gingerbread-plus-aosp

* commit '1fa69735d9e786da4b20c3ab3da3aa66f3cf8116':
  Fix issue #3037083: Problem report for Pinball
 2010-10-01 13:42:40 -07:00
Dianne Hackborn
9e4b567105 Merge "Fix issue #3037083: Problem report for Pinball" into gingerbread 2010-10-01 13:39:39 -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
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
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
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
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
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
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
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
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
Joe Onorato
f25ba29a5b Merge "Use the private version of userActivity." into gingerbread 2010-09-30 18:12:24 -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
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
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
Jeff Brown
26c94ff615 Move verbose logging of device capabilities to dumpsys. 
Change-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7
 2010-09-30 15:34:48 -07:00
Kenny Root
1635e522e0 am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread 
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp

* commit '99f8c5ee621d78a24583a10e459ba40aab511a17':
  Fix location of gdbserver upon installation
 2010-09-30 14:30:14 -07:00
Kenny Root
9e681f5374 Merge "Fix location of gdbserver upon installation" into gingerbread 2010-09-30 14:27:15 -07:00