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

18596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
6f76708405 am 038cabe0: NFC integration 
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
 2010-09-28 22:40:18 -07:00
Chia-chi Yeh
83c3741a90 am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 
Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp

* commit 'd6877fa4971710150de20453bf4ba54dca863429':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
 2010-09-28 21:13:54 -07:00
Chia-chi Yeh
5be7524e14 Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 2010-09-28 21:11:27 -07:00
Mike Lockwood
6f4ae27e33 am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread 
Merge commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845' into gingerbread-plus-aosp

* commit 'a25eabad23d7b8fd430ada757ae4e9f2559f8845':
  Revert "Check for the DEVICE_POWER permission in userActivity."
 2010-09-28 20:18:36 -07:00
Mike Lockwood
a9bb401223 Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread 2010-09-28 20:15:55 -07:00
Chia-chi Yeh
90d2e41eef am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread 
Merge commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1' into gingerbread-plus-aosp

* commit 'e006e4d2c91c50795df0a02366b31610b4e97cb1':
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
 2010-09-28 19:43:50 -07:00
Chia-chi Yeh
e708b34802 Merge changes Iae1913fb,I38dbefef into gingerbread 
* changes:
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
 2010-09-28 19:40:59 -07:00
Dianne Hackborn
7812878c68 am 3e94b94f: Merge "Remove old location classes." into gingerbread 
Merge commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3' into gingerbread-plus-aosp

* commit '3e94b94f56888acbd1f8deb23c05474baaf4fae3':
  Remove old location classes.
 2010-09-28 18:20:26 -07:00
Dianne Hackborn
ef3021c20e Merge "Remove old location classes." into gingerbread 2010-09-28 18:16:58 -07:00
Kenny Root
202ee44dc0 am 05105f7a: Update OBB API to include callbacks 
Merge commit '05105f7abe02b2dff91d6260b3628c8b97816bab' into gingerbread-plus-aosp

* commit '05105f7abe02b2dff91d6260b3628c8b97816bab':
  Update OBB API to include callbacks
 2010-09-28 17:33:47 -07:00
Joe Onorato
1b82e8a1a2 am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread 
Merge commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a' into gingerbread-plus-aosp

* commit 'ea2cf2f936b03f1720bc43863e41c89ea2a7903a':
  Check for the DEVICE_POWER permission in userActivity.
 2010-09-28 17:22:09 -07:00
Joe Onorato
06c5679c58 am f2f34505: Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread 
Merge commit 'f2f34505a1267955b5533ee04f803b1bcd83140a' into gingerbread-plus-aosp

* commit 'f2f34505a1267955b5533ee04f803b1bcd83140a':
  Fix 3041579 overscroll effect in notification area looks strange
 2010-09-28 17:22:02 -07:00
Joe Onorato
12fac3a5c9 Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread 2010-09-28 17:19:37 -07:00
Joe Onorato
7d24892adf Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread 2010-09-28 17:18:59 -07:00
Dianne Hackborn
abc2d4a14c am 4f67e1cc: Merge "Add location shared library for location provider APIs." into gingerbread 
Merge commit '4f67e1ccf1ae1a855521a307a13a728b8069838f' into gingerbread-plus-aosp

* commit '4f67e1ccf1ae1a855521a307a13a728b8069838f':
  Add location shared library for location provider APIs.
 2010-09-28 17:16:31 -07:00
Dianne Hackborn
254117d2f6 Merge "Add location shared library for location provider APIs." into gingerbread 2010-09-28 17:12:44 -07:00
Eric Laurent
e1caf2384b am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread 
Merge commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68' into gingerbread-plus-aosp

* commit 'aeb2c62e7669f004512c42ad8572d1fdd2c25f68':
  Fix several audio effects problems.
 2010-09-28 16:42:14 -07:00
Eric Laurent
8b810064c2 Merge "Fix several audio effects problems." into gingerbread 2010-09-28 16:38:22 -07:00
Ying Wang
5746e875da am 292c246b: Merge "Call functions to calculate deps and classes.jar" into gingerbread 
Merge commit '292c246b27319bc2195e2b3dbc3c3adea22db672' into gingerbread-plus-aosp

* commit '292c246b27319bc2195e2b3dbc3c3adea22db672':
  Call functions to calculate deps and classes.jar
 2010-09-28 15:09:49 -07:00
Ying Wang
cb736594bb Merge "Call functions to calculate deps and classes.jar" into gingerbread 2010-09-28 15:06:10 -07:00
Chia-chi Yeh
070a35bb6c am 320cdcb1: Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread 
Merge commit '320cdcb122505ba703326a102f9b13d2f2f8847a' into gingerbread-plus-aosp

* commit '320cdcb122505ba703326a102f9b13d2f2f8847a':
  RTP: Delay the initialization of AudioTrack and AudioRecord.
 2010-09-28 14:51:47 -07:00
Chia-chi Yeh
7e70f6df88 Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread 2010-09-28 14:41:18 -07:00
Jeff Brown
ae3a02e07f am 65a5ba45: Merge "Fix bug in split touches." into gingerbread 
Merge commit '65a5ba45559e88a50c258d794a1728498c248376' into gingerbread-plus-aosp

* commit '65a5ba45559e88a50c258d794a1728498c248376':
  Fix bug in split touches.
 2010-09-28 13:30:15 -07:00
Jeff Brown
adf739abc4 Merge "Fix bug in split touches." into gingerbread 2010-09-28 13:27:37 -07:00
Jeff Brown
1c32258443 Fix bug in split touches. 
Change-Id: I808c2201a06938f82817058059f4ddcc9b1a9ae2
 2010-09-28 13:26:42 -07:00
Andreas Huber
009bc61b9a am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread 
Merge commit '88a995edcf3c371845cb32aed8bcddb7509bf875' into gingerbread-plus-aosp

* commit '88a995edcf3c371845cb32aed8bcddb7509bf875':
  Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content.
 2010-09-28 13:26:26 -07:00
Andreas Huber
a29b78b612 Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sure that both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content." into gingerbread 2010-09-28 13:23:26 -07:00
Hung-ying Tyan
24bf6aa617 am 6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread 
Merge commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42' into gingerbread-plus-aosp

* commit '6d028dd2f102a6eafaa2edebeb55f55b4c32fc42':
  SIP: Feedback any provisional responses in addition to RING
 2010-09-28 13:02:55 -07:00
Hung-ying Tyan
ce6a06d54e Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread 2010-09-28 13:00:38 -07:00
Gilles Debunne
2121f3cd04 am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread 
Merge commit 'd9743af92ead39b9f648043d165c415dfe8f3668' into gingerbread-plus-aosp

* commit 'd9743af92ead39b9f648043d165c415dfe8f3668':
  New assets. DO NOT MERGE>
 2010-09-28 13:00:32 -07:00
Gilles Debunne
3ff47bdcf9 Merge "New assets. DO NOT MERGE>" into gingerbread 2010-09-28 12:56:54 -07:00
jsh
db58f561b5 am 37a3631e: Merge "Add line break between PLMN and SPN in windowshade." into gingerbread 
Merge commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096' into gingerbread-plus-aosp

* commit '37a3631edfb1b848daca23bf5a12e1ab4bb6e096':
  Add line break between PLMN and SPN in windowshade.
 2010-09-28 12:46:57 -07:00
jsh
68f2073783 Merge "Add line break between PLMN and SPN in windowshade." into gingerbread 2010-09-28 12:44:47 -07:00
Steve Howard
8839391976 am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread 
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp

* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
  Move DownloadManager to android.app (DO NOT MERGE)
 2010-09-28 12:41:42 -07:00
Steve Howard
1277bed788 Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread 2010-09-28 12:38:15 -07:00
Andreas Huber
989ee4e460 am be045061: Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread 
Merge commit 'be0450619528e65eebfa1d7eab78fde757d094cc' into gingerbread-plus-aosp

* commit 'be0450619528e65eebfa1d7eab78fde757d094cc':
  Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.
 2010-09-28 12:05:08 -07:00
Andreas Huber
f3b1fab582 Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens." into gingerbread 2010-09-28 12:02:35 -07:00
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
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
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
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
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
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