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

20261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chung-yih Wang
edf16716c8 resolved conflicts for merge of a329aef4 to master 
Change-Id: I5a64ee2b6adc56a7521d2e55a72e519a284d5a7c
 2010-09-01 11:00:33 +08:00
Jason Sams
f72648c7c4 Merge "SubElementData data upload functions." 2010-08-31 19:19:05 -07:00
Chung-yih Wang
0945f0aa24 am 042e9bd9: Add SIP related settings in the Settings.System. 
Merge commit '042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp

* commit '042e9bd989d9c78e23ed29011b6532743f510625':
  Add SIP related settings in the Settings.System.
 2010-08-31 19:07:31 -07:00
Dianne Hackborn
1edb3c12c5 am ec438e14: am 361199b5: Add PackageManager API to get information about a provider component. 
Merge commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e'

* commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e':
  Add PackageManager API to get information about a provider component.
 2010-08-31 19:06:25 -07:00
Daisuke Miyakawa
4c757d1036 Merge "Add LocalePicker fragment as one of internal components." 2010-08-31 19:05:55 -07:00
Dianne Hackborn
6873e1fe19 am 361199b5: Add PackageManager API to get information about a provider component. 
Merge commit '361199b5e742c6635d4d7a03de6cf37b31cf442c' into gingerbread-plus-aosp

* commit '361199b5e742c6635d4d7a03de6cf37b31cf442c':
  Add PackageManager API to get information about a provider component.
 2010-08-31 19:03:36 -07:00
Dianne Hackborn
6f7488b0b0 am 3f124cc5: am 22cd420b: Merge "Improve debug output when an ANR happens." into gingerbread 
Merge commit '3f124cc5ec31024acac057d0f848125f8da5e905'

* commit '3f124cc5ec31024acac057d0f848125f8da5e905':
  Improve debug output when an ANR happens.
 2010-08-31 19:02:02 -07:00
Dianne Hackborn
782bcf9564 am 22cd420b: Merge "Improve debug output when an ANR happens." into gingerbread 
Merge commit '22cd420bfa431b4ad55e699afadf109dcc54f201' into gingerbread-plus-aosp

* commit '22cd420bfa431b4ad55e699afadf109dcc54f201':
  Improve debug output when an ANR happens.
 2010-08-31 18:58:47 -07:00
Dianne Hackborn
a0f5241ec6 Merge "Improve debug output when an ANR happens." into gingerbread 2010-08-31 18:56:30 -07:00
Dmitri Plotnikov
6a05e4c10e Merge "Adding a parameter to limit the number rows returned" 2010-08-31 17:44:08 -07:00
Gilles Debunne
ef46fc449b am ff46a5c9: am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread 
Merge commit 'ff46a5c9bd55c492925ffcb608510a0a3dd8a969'

* commit 'ff46a5c9bd55c492925ffcb608510a0a3dd8a969':
  Fixed single line state on TextView.
 2010-08-31 16:35:53 -07:00
Gilles Debunne
ab2f44a0fb am d2fbabad: Merge "Fixed single line state on TextView." into gingerbread 
Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp

* commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3':
  Fixed single line state on TextView.
 2010-08-31 16:22:54 -07:00
Gilles Debunne
f93a3eb96e Merge "Fixed single line state on TextView." into gingerbread 2010-08-31 16:18:06 -07:00
Jeff Brown
9b83cce203 am df02df11: am 307ed31c: Merge "Remove incomplete input device enumeration NDK API." into gingerbread 
Merge commit 'df02df115a594553b3ebaa95a0a7f7185a8787d3'

* commit 'df02df115a594553b3ebaa95a0a7f7185a8787d3':
  Remove incomplete input device enumeration NDK API.
 2010-08-31 15:53:17 -07:00
Irfan Sheriff
f36e8e8262 Merge "Add WifiConfigStore to manage networks" 2010-08-31 15:52:26 -07:00
Jeff Brown
006f136d2b am 307ed31c: Merge "Remove incomplete input device enumeration NDK API." into gingerbread 
Merge commit '307ed31c93f16dd3d34348c92cb22d81ddeba6c0' into gingerbread-plus-aosp

* commit '307ed31c93f16dd3d34348c92cb22d81ddeba6c0':
  Remove incomplete input device enumeration NDK API.
 2010-08-31 15:49:39 -07:00
Eric Laurent
d61b10cc0a am 55e79374: am f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread 
Merge commit '55e7937462d107b469a58651d3d51e15086f8e9e'

* commit '55e7937462d107b469a58651d3d51e15086f8e9e':
  Audio Effects: fix problems in volume control.
 2010-08-31 15:49:15 -07:00
Eric Laurent
ca00efe208 am f560ceab: Merge "Audio Effects: fix problems in volume control." into gingerbread 
Merge commit 'f560ceabe11b4f541c568bead61a5ec8f527151c' into gingerbread-plus-aosp

* commit 'f560ceabe11b4f541c568bead61a5ec8f527151c':
  Audio Effects: fix problems in volume control.
 2010-08-31 15:46:41 -07:00
Jeff Brown
875fb77f81 Merge "Remove incomplete input device enumeration NDK API." into gingerbread 2010-08-31 15:45:32 -07:00
Eric Laurent
b3b46883eb Merge "Audio Effects: fix problems in volume control." into gingerbread 2010-08-31 15:43:36 -07:00
Joe Onorato
570141e04f am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and public.xml! 
Merge commit '1e1a030b502acae11dbd11d826d389351910a60f'

* commit '1e1a030b502acae11dbd11d826d389351910a60f':
  Can't have two rules building the stubs and public.xml!
 2010-08-31 15:29:24 -07:00
Jeff Brown
774cf1baa1 Remove incomplete input device enumeration NDK API. 
Change-Id: I32de74ff5fcf0e29179a2aee03ddabd22fa485bb
 2010-08-31 15:24:55 -07:00
Joe Onorato
00800b0be6 am 47471175: Can\'t have two rules building the stubs and public.xml! 
Merge commit '47471175c9d19a00d06a77aa316dcda08be97deb' into gingerbread-plus-aosp

* commit '47471175c9d19a00d06a77aa316dcda08be97deb':
  Can't have two rules building the stubs and public.xml!
 2010-08-31 15:22:04 -07:00
Dirk Dougherty
db466cbe5b Merge "Clean up doc build to use Android custom doclava." 2010-08-31 15:11:45 -07:00
Brad Fitzpatrick
f3372f7ca3 am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread 
Merge commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80'

* commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80':
  Don't propagate StrictMode over one-way Binder calls.
 2010-08-31 15:06:24 -07:00
Alex Sakhartchouk
db0f562331 Merge "Fixing uniform binding for fragment shader. Updating the glsl fragment shader to color the lights." 2010-08-31 15:05:43 -07:00
Andreas Huber
1577102f2c am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread 
Merge commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f'

* commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f':
  Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
 2010-08-31 15:02:38 -07:00
Brad Fitzpatrick
985f18ef3a am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread 
Merge commit '63070856d034a2819a26560bc7f2881e501c78b7' into gingerbread-plus-aosp

* commit '63070856d034a2819a26560bc7f2881e501c78b7':
  Don't propagate StrictMode over one-way Binder calls.
 2010-08-31 15:02:21 -07:00
Brad Fitzpatrick
6d29e39240 Merge "Don't propagate StrictMode over one-way Binder calls." into gingerbread 2010-08-31 14:58:26 -07:00
Andreas Huber
c67cd422f2 am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread 
Merge commit '48ac68e1b117b6b55f06daced7d9d5d550853306' into gingerbread-plus-aosp

* commit '48ac68e1b117b6b55f06daced7d9d5d550853306':
  Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
 2010-08-31 14:57:56 -07:00
Andreas Huber
59f189a544 Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread 2010-08-31 14:54:37 -07:00
Andreas Huber
8c0c8f9576 am e1a3cddd: am 99fa510e: Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread 
Merge commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf'

* commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf':
  Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
 2010-08-31 14:48:33 -07:00
Jake Hamby
290d1dfa3d am 04bc8070: am 6659284d: Allow Bluetooth radio to be toggled in Airplane mode. 
Merge commit '04bc807057d1c336a5d1340595b790eee4c5b372'

* commit '04bc807057d1c336a5d1340595b790eee4c5b372':
  Allow Bluetooth radio to be toggled in Airplane mode.
 2010-08-31 14:45:30 -07:00
Andreas Huber
11441a355f am 99fa510e: Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread 
Merge commit '99fa510e67cb973b45fc216c75bdc817421e14ae' into gingerbread-plus-aosp

* commit '99fa510e67cb973b45fc216c75bdc817421e14ae':
  Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
 2010-08-31 14:45:07 -07:00
Jake Hamby
67672197b0 am 6659284d: Allow Bluetooth radio to be toggled in Airplane mode. 
Merge commit '6659284d68bb04539891456700c8da2d0bae7d09' into gingerbread-plus-aosp

* commit '6659284d68bb04539891456700c8da2d0bae7d09':
  Allow Bluetooth radio to be toggled in Airplane mode.
 2010-08-31 14:42:22 -07:00
Andreas Huber
6d8d82516e Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread 2010-08-31 14:41:51 -07:00
Andrew Stadler
c92db61c3d Merge "Fix crash when proxy exclusion list is null." 2010-08-31 14:38:49 -07:00
Xavier Ducrohet
fe87c4480c am b4649ec7: am 23827557: Merge "Add a --debug-mode option to aapt." into gingerbread 
Merge commit 'b4649ec720fa959b700a7a03c089bfdc61321d16'

* commit 'b4649ec720fa959b700a7a03c089bfdc61321d16':
  Add a --debug-mode option to aapt.
 2010-08-31 14:35:28 -07:00
Xavier Ducrohet
aed91ffad4 am 23827557: Merge "Add a --debug-mode option to aapt." into gingerbread 
Merge commit '2382755730206da52b64bf7bd2fad421f9a6fd0d' into gingerbread-plus-aosp

* commit '2382755730206da52b64bf7bd2fad421f9a6fd0d':
  Add a --debug-mode option to aapt.
 2010-08-31 14:32:53 -07:00
Mike Lockwood
088e50fa1e Merge "MTP: Send an Intent after an MTP session that resulted in media database modifications" 2010-08-31 14:32:39 -07:00
Xavier Ducrohet
f7d593673a Merge "Add a --debug-mode option to aapt." into gingerbread 2010-08-31 14:30:03 -07:00
Jean-Baptiste Queru
39f3fcbdb5 am b7ab3420: Ignore changes from open-source master that are already here 
Merge commit 'b7ab342016bd622b30e1945b16b24413ae82ac54'

* commit 'b7ab342016bd622b30e1945b16b24413ae82ac54':
  GPS: Initialize XTRA support when GPS is enabled
  GPS: Don't set XTRA download pending flag at boot time.
 2010-08-31 14:25:25 -07:00
Jean-Baptiste Queru
d0b0300100 Ignore changes from open-source master that are already here 
Change-Id: I5b560ab81c5188e6a28aa6feb0be13f970e0add4
 2010-08-31 14:19:20 -07:00
Mike Lockwood
2d23eb568a Merge "GPS: Initialize XTRA support when GPS is enabled" 2010-08-31 13:56:00 -07:00
Mike Lockwood
49ff535ed7 Merge "GPS: Don't set XTRA download pending flag at boot time." 2010-08-31 13:55:39 -07:00
Mike Lockwood
5ddac9512f Merge "Add settings option for running MTP server in PTP mode." 2010-08-31 13:47:13 -07:00
Mike Lockwood
fb99ce8ae0 Merge "USB: Add functions for querying if a USB function is supported and enabled." 2010-08-31 13:46:35 -07:00
James Dong
cb96bb6256 am aa40b834: am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread 
Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a'

* commit 'aa40b834985023642b30fa2e0563c414a994bd3a':
  Add some encoding parameters for the "record" utility
 2010-08-31 13:29:39 -07:00
Joe Onorato
93df230827 am b1824cfc: am 54901c9e: fix the build. will revisit this change in a minute 
Merge commit 'b1824cfca7dde367197662953b7478a9dbceab27'

* commit 'b1824cfca7dde367197662953b7478a9dbceab27':
  fix the build.  will revisit this change in a minute
 2010-08-31 13:29:30 -07:00
Joe Onorato
de0e506026 am 5238c5f9: fix the build. will revisit this change in a minute 
Merge commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c'

* commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c':
  fix the build.  will revisit this change in a minute
 2010-08-31 13:29:10 -07:00