ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
19,890 Commits 2 Branches 0 Tags 54 MiB
3d3f99de94
Commit Graph

19890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
3d3f99de94 am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread 
* commit 'd8c323321c28a0a5ff70c6e0694aa822edca4005':
  Fixed technology name typo's.
  Implement historical bytes / attrib on IsoDep
  Provide system code and manufacturer code for Felica tech.
  Fixed NfcAdapter init and getTechnology().
  Secure Element access implementation
  Rough first pass at the NFC technology API.
  Revert "Merge "Remove the My Tag feature." into gingerbread"
 2010-12-05 14:49:00 -08:00
Nick Pelly
54c9d4a79a Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread 2010-12-05 14:46:29 -08:00
Nick Pelly
130f48f5bc Merge branch gingerbread-nfc into gingerbread. 
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-12-05 14:45:29 -08:00
Irfan Sheriff
fe1b942d68 am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread 
* commit 'bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
  DO NOT MERGE Avoid nullifying dhcp target
 2010-12-04 23:45:18 -08:00
Irfan Sheriff
10484ac22a Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread 2010-12-03 17:58:17 -08:00
Hung-ying Tyan
d76844ac80 am e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread 
* commit 'e2abd103a2d311738ff1dd1e1d9b8e6c52aa870c':
  Set AudioGroup mode according to audio settings
 2010-12-02 17:56:40 -08:00
Hung-ying Tyan
33f4f32967 Merge "Set AudioGroup mode according to audio settings" into gingerbread 2010-12-02 17:50:33 -08:00
Jean-Baptiste Queru
438267d997 am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master 
* commit '4a88013a4a06a9ea80e8419f94694936e6b013f0':
  Preserve flags field of event passed to injectKeyEvent()
 2010-12-02 15:21:35 -08:00
Jean-Baptiste Queru
a4130babac resolved conflicts for merge of bf1439c5 to stage-korg-master 
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
 2010-12-02 15:16:53 -08:00
Jean-Baptiste Queru
7a039f9994 Merge "Preserve flags field of event passed to injectKeyEvent()" 2010-12-02 14:56:13 -08:00
Xia Wang
784a43fef7 am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread 
* commit '3591bebd5957a8547fc54659179a19440636e7f9':
  Restore Wi-Fi configuration after the test. DO NOT MERGE
 2010-12-02 13:44:54 -08:00
Xia Wang
147abbd117 Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread 2010-12-02 13:40:23 -08:00
James Dong
dc76df85d7 am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread 
* commit 'd4c5478a8664f64ff66db9ae25250afac78b7a74':
  Be conservative in estimating the file size limit.
 2010-12-02 10:21:06 -08:00
James Dong
11cdf95594 Merge "Be conservative in estimating the file size limit." into gingerbread 2010-12-02 10:13:36 -08:00
Jean-Baptiste Queru
34f9603301 am 40eade14: Merge from open-source master 
* commit '40eade14bb87d24903588de04449fdfe2e1795cb':
  Fix crash by "adb shell pm list permissions -f|-s"
 2010-12-02 07:59:52 -08:00
Jean-Baptiste Queru
9ee1ec38a6 am 077bc4ac: Merge from open-source master 
* commit '077bc4ac019ad33abd613448e11d3ad501218991':
  Fix HTTP redirect missing statuscode 303 and 307
 2010-12-02 07:59:49 -08:00
Jean-Baptiste Queru
4bdada2c61 Merge from open-source master 
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
 2010-12-02 07:55:06 -08:00
Jean-Baptiste Queru
af8964280b Merge from open-source master 
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
 2010-12-02 07:54:57 -08:00
Eric Laurent
51e91ae24e am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread 
* commit '78d81851a8ef6691541215afb19e5bc690a4c3c0':
  Fix issue 2641884: Bluetooth volume is dependent on in call volume.
 2010-12-01 16:04:09 -08:00
Eric Laurent
8217671a50 Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread 2010-12-01 15:59:31 -08:00
Kenny Root
5a1ed2a762 am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread 
* commit '938d097263416ad416ee995e62dab559ea50bf0d':
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
 2010-12-01 14:20:49 -08:00
Kenny Root
8e41fd2aa5 Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread 2010-12-01 14:18:23 -08:00
Scott Main
0da9cbe3f7 am 83df6ead: am a45d6937: docs: dashboard update 
* commit '83df6ead8dfd2037e4681793d439fffa5afda9fc':
  docs: dashboard update
 2010-12-01 13:59:08 -08:00
Irfan Sheriff
c4b9bf2454 am f36bde82: DO NOT MERGE Dont let supplicant stay in DORMANT state 
* commit 'f36bde828c0e427c0dbbe543b2465114c9aff45c':
  DO NOT MERGE Dont let supplicant stay in DORMANT state
 2010-12-01 13:59:04 -08:00
Scott Main
1e0f732364 am a45d6937: docs: dashboard update 
* commit 'a45d693757c14c2d97a81f1fd8faa3ba38b53021':
  docs: dashboard update
 2010-12-01 12:59:42 -08:00
Eric Laurent
54a176320f am e23212bc: Merge "Fix issue 3142808." into gingerbread 
* commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
  Fix issue 3142808.
 2010-12-01 11:28:54 -08:00
Eric Laurent
4db2fd929a Merge "Fix issue 3142808." into gingerbread 2010-12-01 11:26:37 -08:00
John Wang
cec24879b4 am 4567847d: Add "canDial" check. 
* commit '4567847d461afac08a80518637a0e48eff3c5247':
  Add "canDial" check.
 2010-12-01 11:10:42 -08:00
Irfan Sheriff
2f28b822da resolved conflicts for merge of 52556689 to gingerbread-plus-aosp 
Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a
 2010-12-01 10:40:05 -08:00
Irfan Sheriff
a29e6d9620 Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread 2010-12-01 10:17:56 -08:00
Irfan Sheriff
d8567ca26c am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread 
* commit 'af2d3c7ccebb009f31a92c1a87b0925a2891e1c4':
  DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
 2010-12-01 09:53:17 -08:00
Irfan Sheriff
d4d5dab12f Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread 2010-12-01 09:51:27 -08:00
Jean-Baptiste Queru
6c48212132 Merge "Fix crash by "adb shell pm list permissions -f|-s"" 2010-12-01 09:47:14 -08:00
Brad Fitzpatrick
994caa76a1 am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread 
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
  [don't auto-merge] Don't re-read SharedPreferences unnecessarily.
 2010-12-01 08:50:00 -08:00
Brad Fitzpatrick
e5f05b8739 Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread 2010-12-01 08:46:52 -08:00
Jean-Baptiste Queru
459ae1107f Merge "Fix HTTP redirect missing statuscode 303 and 307" 2010-12-01 08:25:12 -08:00
Hung-ying Tyan
930f716d99 am 06e8cdc0: Fix race between ending and answering a SIP call. 
* commit '06e8cdc0f81ead604d5adf9d7b3f982e10226fd2':
  Fix race between ending and answering a SIP call.
 2010-11-30 23:21:40 -08:00
Hung-ying Tyan
91a4f34689 am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread 
* commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f':
  Do not suppress error feedback during a SIP call.
 2010-11-30 22:55:37 -08:00
Hung-ying Tyan
415474e42a Merge "Do not suppress error feedback during a SIP call." into gingerbread 2010-11-30 22:53:26 -08:00
David Brown
cc286aedef am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString(). 
* commit '04639ba0a939988d00131e61458807dac650f9c3':
  Reduce the outrageous verbosity of CallerInfo.toString().
 2010-11-30 18:11:21 -08:00
Mathias Agopian
862cd17ec0 am b483d5cd: fix [3237242] sensormanager sensor active count gets out of sync 
* commit 'b483d5cd134cda393824fd8e9c1a5443bd868ae6':
  fix [3237242] sensormanager sensor active count gets out of sync
 2010-11-30 15:51:00 -08:00
Mathias Agopian
76d1b9610e am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread 
* commit '186b68b74417e8ef73f2083769166e7785df6c30':
  allow rotation-vector to have 4 components
 2010-11-30 15:41:41 -08:00
Mathias Agopian
bcd69459f5 Merge "allow rotation-vector to have 4 components" into gingerbread 2010-11-30 15:38:38 -08:00
David Brown
522e448364 am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread 
* commit '91abcb624a6a873a2becbbf0f8186d6533daeb89':
  Fix bug 3121292: Contact photo not shown correctly for SIP calls
 2010-11-30 15:24:42 -08:00
David Brown
6d54e4370b Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread 2010-11-30 15:20:45 -08:00
Andreas Huber
38286e789d am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread 
* commit '30c818444d876dd868b84adec2416308c90f32e3':
  DO NOT MERGE Support for "chunked" HTTP transfer encoding.
 2010-11-30 14:32:09 -08:00
Andreas Huber
faa4e79c76 Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread 2010-11-30 14:30:00 -08:00
Mathias Agopian
af2c516055 am 66cff624: Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread 
* commit '66cff624e9abd23da05ddc20698eb3e7d0fb5a17':
  Uses 4-th order low-pass for extracting gravity.
 2010-11-30 14:18:05 -08:00
Mathias Agopian
3bf9626696 Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread 2010-11-30 14:15:23 -08:00
Andreas Huber
c45dfb3dcd am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread 
* commit 'a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb':
  DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
 2010-11-30 14:08:56 -08:00