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

22071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
e84c62a323 Merge "New assets: wifi signal 1, no sim card." into gingerbread 2010-09-29 12:15:51 -07:00
Eric Fischer
c0e642476d Merge "Split strings with SD card references into variations." into gingerbread 2010-09-29 12:14:10 -07:00
Chia-chi Yeh
2a7aea9d7e Merge "RTP: Enable GSM-EFR codec." into gingerbread 2010-09-29 12:12:51 -07:00
Chia-chi Yeh
b5327a4ac0 am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread 
Merge commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004' into gingerbread-plus-aosp

* commit 'cd38664916ca9e8c85c3269fec61e6a447ec7004':
  RTP: Revise the workaround of private addresses and fix bugs.
 2010-09-29 11:53:07 -07:00
Chia-chi Yeh
4c4d714225 Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread 2010-09-29 11:50:16 -07:00
Joe Onorato
b93f6bad12 am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread 
Merge commit 'f01a873029641da2155ca1882f311d8f4e92675a' into gingerbread-plus-aosp

* commit 'f01a873029641da2155ca1882f311d8f4e92675a':
  Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
 2010-09-29 11:02:55 -07:00
Joe Onorato
8a663231b1 Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread 2010-09-29 11:00:14 -07:00
Steve Block
0c6ac5b3c2 Merge "Update WebView useragent string for merge to WebKit r67908" 2010-09-29 10:42:30 -07:00
Roy West
fb46cd118b am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp

* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
  Partial fix to bug 2992589: Edit dev admin strings.
 2010-09-29 10:40:06 -07:00
Roy West
89f7cfa16e Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 2010-09-29 10:37:11 -07:00
Kenny Root
c3bc834a00 am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread 
Merge commit '212d81a004f50e51ed8f6d803b79f4b71546b351' into gingerbread-plus-aosp

* commit '212d81a004f50e51ed8f6d803b79f4b71546b351':
  Move all the permissions check up for unmount
 2010-09-29 07:53:06 -07:00
Kenny Root
7b2f21e682 Merge "Move all the permissions check up for unmount" into gingerbread 2010-09-29 07:40:32 -07:00
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
880d7ea41c am 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 
Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de'

* commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de':
  AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
 2010-09-28 21:55:35 -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
7cc3fa0659 am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread 
Merge commit '05e110506156a1b782232833b907afb428802b69'

* commit '05e110506156a1b782232833b907afb428802b69':
  Revert "Check for the DEVICE_POWER permission in userActivity."
 2010-09-28 20:21:48 -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
Jaikumar Ganesh
135f19c8dc Merge "New public APIs for BluetoothA2dp and BluetoothHeadset profiles." 2010-09-28 19:56:05 -07:00
Chia-chi Yeh
990d7c307d am ebfe5632: am e006e4d2: Merge changes Iae1913fb,I38dbefef into gingerbread 
Merge commit 'ebfe5632db275a89b49ab828064ba90db59702cf'

* commit 'ebfe5632db275a89b49ab828064ba90db59702cf':
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
 2010-09-28 19:47:07 -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
Jeff Hamilton
3dd49cb3d2 Merge "Add a Settings table to BrowserContract." 2010-09-28 19:15:44 -07:00
Jim Miller
16143ebe3b Merge "Several improvements to RecentActivities:" 2010-09-28 18:46:01 -07:00
Dianne Hackborn
d3708c04bf am cb51c0c7: am 3e94b94f: Merge "Remove old location classes." into gingerbread 
Merge commit 'cb51c0c7b155a5141a51fc4d3e57792da7e89cc4'

* commit 'cb51c0c7b155a5141a51fc4d3e57792da7e89cc4':
  Remove old location classes.
 2010-09-28 18:24:48 -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
4e37dad75a resolved conflicts for merge of d8e8186c to master 
Change-Id: Ica3f6cd958717ea7033cab8b4bf9cd3425c1e1c5
 2010-09-28 18:16:50 -07:00
Gil Dobjanschi
4585af5ce4 Merge "Save overlays to XML" 2010-09-28 18:00:55 -07:00
Winson Chung
f037fa6756 Merge "Making the calls to the RemoteViewsFactory synchronized to prevent threading issues." 2010-09-28 17:46:39 -07:00
Joe Onorato
d75675da3f am f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread 
Merge commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d'

* commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d':
  Check for the DEVICE_POWER permission in userActivity.
 2010-09-28 17:40:23 -07:00
Joe Onorato
f547a54886 am 08a02039: am f2f34505: Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread 
Merge commit '08a02039ee467b3ead2c2e6d3f687b9c70c7fbc8'

* commit '08a02039ee467b3ead2c2e6d3f687b9c70c7fbc8':
  Fix 3041579 overscroll effect in notification area looks strange
 2010-09-28 17:40:18 -07:00
Dianne Hackborn
42ae774410 am e5317fbd: am 4f67e1cc: Merge "Add location shared library for location provider APIs." into gingerbread 
Merge commit 'e5317fbd48875896e04a34d955edf650f11f9771'

* commit 'e5317fbd48875896e04a34d955edf650f11f9771':
  Add location shared library for location provider APIs.
 2010-09-28 17:40:02 -07:00
Eric Laurent
248ec73161 am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread 
Merge commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c'

* commit 'b047e3cdf24b32e26f366fcd4cd0eee8ae6c592c':
  Fix several audio effects problems.
 2010-09-28 17:39:54 -07:00
Ying Wang
6f617b416b am 0e8dc464: am 292c246b: Merge "Call functions to calculate deps and classes.jar" into gingerbread 
Merge commit '0e8dc464bdfa29785aab7be6343154fee361f6a0'

* commit '0e8dc464bdfa29785aab7be6343154fee361f6a0':
  Call functions to calculate deps and classes.jar
 2010-09-28 17:38:19 -07:00
Chia-chi Yeh
ca15b75b0f am df31e03c: am 320cdcb1: Merge "RTP: Delay the initialization of AudioTrack and AudioRecord." into gingerbread 
Merge commit 'df31e03c47cd4caf45d8a58cf1fe5893da48ec6c'

* commit 'df31e03c47cd4caf45d8a58cf1fe5893da48ec6c':
  RTP: Delay the initialization of AudioTrack and AudioRecord.
 2010-09-28 17:38:09 -07:00
Jeff Brown
5d20f854a6 am 7d6f864f: am 65a5ba45: Merge "Fix bug in split touches." into gingerbread 
Merge commit '7d6f864f9ee66035bab98e61e9947d2389f1f341'

* commit '7d6f864f9ee66035bab98e61e9947d2389f1f341':
  Fix bug in split touches.
 2010-09-28 17:37:50 -07:00
Andreas Huber
4e5bc9b436 am 387bdcda: 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 '387bdcdadc312c8e9f702da164bd8bd53cbd92fd'

* commit '387bdcdadc312c8e9f702da164bd8bd53cbd92fd':
  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 17:37:44 -07:00
Hung-ying Tyan
89b3eb6905 am 0d447760: am 6d028dd2: Merge "SIP: Feedback any provisional responses in addition to RING" into gingerbread 
Merge commit '0d44776016cecf1c7c826c4784f8f867a56235f0'

* commit '0d44776016cecf1c7c826c4784f8f867a56235f0':
  SIP: Feedback any provisional responses in addition to RING
 2010-09-28 17:37:04 -07:00
Gilles Debunne
af3b2ca6d4 am 0d0dc6a7: (-s ours) am d9743af9: Merge "New assets. DO NOT MERGE>" into gingerbread 
Merge commit '0d0dc6a70cbe0d7bfb795f937d6594711140b4b1'

* commit '0d0dc6a70cbe0d7bfb795f937d6594711140b4b1':
  New assets. DO NOT MERGE>
 2010-09-28 17:36:56 -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
Adam Powell
848e86bf29 Merge "Added AlertDialog.Builder#getContext" 2010-09-28 17:14:38 -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