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

18728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
e8d5136fec am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread 
Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp

* commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125':
  Wait for initial device scan to finish before updating config.
 2010-10-01 19:03:42 -07:00
Jeff Brown
715c224997 am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread 
Merge commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba' into gingerbread-plus-aosp

* commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba':
  Minor logging changes to input dispatcher to help with debugging.
 2010-10-01 19:01:14 -07:00
Jeff Brown
e8914cec61 Merge "Wait for initial device scan to finish before updating config." into gingerbread 2010-10-01 19:01:11 -07:00
Jeff Brown
f1aa6a1d6c Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread 2010-10-01 18:58:32 -07:00
Jeff Brown
1ad00e96fe Wait for initial device scan to finish before updating config. 
This change narrows the opportunity for a race condition setting the
resource Configuration while devices are being updated.

Change-Id: I58efa563f4129ab0fce7108511d16a99dff7e451
 2010-10-01 18:55:43 -07:00
Hung-ying Tyan
c493b5d368 am 306137d9: SIP telephony cleanup. 
Merge commit '306137d97f40a4f807c54a75210343c9262360d1' into gingerbread-plus-aosp

* commit '306137d97f40a4f807c54a75210343c9262360d1':
  SIP telephony cleanup.
 2010-10-01 18:32:03 -07:00
Jake Hamby
daaa92a19f am 7888486d: Merge "Add subaddress to SMS fingerprint calculation." 
Merge commit '7888486d1c930301535069bd90bb0bf3525b2bb5' into gingerbread-plus-aosp

* commit '7888486d1c930301535069bd90bb0bf3525b2bb5':
  Add subaddress to SMS fingerprint calculation.
 2010-10-01 18:13:58 -07:00
Jeff Brown
2806e381cf Minor logging changes to input dispatcher to help with debugging. 
Added dumpsys reporting to EventHub.
Made the formatting a bit clearer.
Added 'Locked' suffix to some internal methods of EventHub.

Change-Id: Ic449560bcce378f6361895d27c66854e9724abb0
 2010-10-01 18:05:13 -07:00
Jake Hamby
f91f4d912f Merge "Add subaddress to SMS fingerprint calculation." 2010-10-01 18:04:22 -07:00
James Dong
71f07eecab am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread 
Merge commit '6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp

* commit '6c609b6a60e533a93c6d0088222bd8da209b9953':
  Turn off media time adjustment by default
 2010-10-01 17:32:16 -07:00
James Dong
db193288b2 Merge "Turn off media time adjustment by default" into gingerbread 2010-10-01 17:27:51 -07:00
Dianne Hackborn
373111b5e5 am 14e7d693: Merge "Some documentation fixes." into gingerbread 
Merge commit '14e7d693415832a974abc298124a6a5797d49a04' into gingerbread-plus-aosp

* commit '14e7d693415832a974abc298124a6a5797d49a04':
  Some documentation fixes.
 2010-10-01 17:02:18 -07:00
Dianne Hackborn
5eb17e6029 Merge "Some documentation fixes." into gingerbread 2010-10-01 16:46:29 -07:00
Jeff Brown
bd432d4619 am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread 
Merge commit '9e32a438fd87180692da55197972ecddb1a731d9' into gingerbread-plus-aosp

* commit '9e32a438fd87180692da55197972ecddb1a731d9':
  Support haptic feedback for virtual keys defined in key layout.
 2010-10-01 16:16:23 -07:00
Chia-chi Yeh
758e48f61f am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread 
Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp

* commit '9430f9d37ec169ce0654bc8950adb66ac974b761':
  KeyStore: Update the parameters of generating master keys.
 2010-10-01 16:16:17 -07:00
Jeff Brown
5629ea8fda Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread 2010-10-01 16:09:58 -07:00
Jake Hamby
562108c8bf am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x." 
Merge commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a' into gingerbread-plus-aosp

* commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a':
  Do not explicity disconnect Data during power down for 1x.
 2010-10-01 16:02:16 -07:00
Scott Main
aa0178680f am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1 
Merge commit '91b0bc2a282f63f0ee532b5748c210bb67ba6fb3' into gingerbread-plus-aosp

* commit '91b0bc2a282f63f0ee532b5748c210bb67ba6fb3':
  docs: device dashboard update for 10/1
 2010-10-01 15:56:08 -07:00
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
Chia-chi Yeh
533ca9650a Merge "KeyStore: Update the parameters of generating master keys." into gingerbread 2010-10-01 15:34:43 -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
Scott Main
e0033c246d am 32441bbe: docs: device dashboard update for 10/1 
Merge commit '32441bbe61e2f02f09a319c00895aef8cfc27ff4' into gingerbread

* commit '32441bbe61e2f02f09a319c00895aef8cfc27ff4':
  docs: device dashboard update for 10/1
 2010-10-01 15:11:10 -07:00
Jeff Brown
956c0fb238 Support haptic feedback for virtual keys defined in key layout. 
Change-Id: I83e4108a87332692e03791dc066206becbc7941f
 2010-10-01 15:08:56 -07:00
Jake Hamby
f8bc8a30f2 Merge "Do not explicity disconnect Data during power down for 1x." 2010-10-01 15:02:32 -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