summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SubElementData data upload functions.Jason Sams2010-08-318-26/+206
| | | | Change-Id: I5f8c738b5457ae7f6085fc4cd331cf3d13ad75cf
* am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and ↵Joe Onorato2010-08-311-2/+0
|\ | | | | | | | | | | | | | | | | public.xml! Merge commit '1e1a030b502acae11dbd11d826d389351910a60f' * commit '1e1a030b502acae11dbd11d826d389351910a60f': Can't have two rules building the stubs and public.xml!
| * am 47471175: Can\'t have two rules building the stubs and public.xml!Joe Onorato2010-08-311-2/+0
| |\ | | | | | | | | | | | | | | | | | | Merge commit '47471175c9d19a00d06a77aa316dcda08be97deb' into gingerbread-plus-aosp * commit '47471175c9d19a00d06a77aa316dcda08be97deb': Can't have two rules building the stubs and public.xml!
| | * Can't have two rules building the stubs and public.xml!Joe Onorato2010-08-311-2/+0
| | | | | | | | | | | | Change-Id: I27b113d436aa5f945c5d6d56258dbafdf71193cf
* | | Merge "Clean up doc build to use Android custom doclava."Dirk Dougherty2010-08-311-8/+3
|\ \ \
| * | | Clean up doc build to use Android custom doclava.Dirk Dougherty2010-08-301-8/+3
| | | | | | | | | | | | | | | | Change-Id: I1dcf18054aa128ffb4c66111c53fad20bcdee783
* | | | am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way ↵Brad Fitzpatrick2010-08-314-7/+33
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Binder calls." into gingerbread Merge commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80' * commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80': Don't propagate StrictMode over one-way Binder calls.
| * | | am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." ↵Brad Fitzpatrick2010-08-314-7/+33
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '63070856d034a2819a26560bc7f2881e501c78b7' into gingerbread-plus-aosp * commit '63070856d034a2819a26560bc7f2881e501c78b7': Don't propagate StrictMode over one-way Binder calls.
| | * | Merge "Don't propagate StrictMode over one-way Binder calls." into gingerbreadBrad Fitzpatrick2010-08-314-7/+33
| | |\ \
| | | * | Don't propagate StrictMode over one-way Binder calls.Brad Fitzpatrick2010-08-314-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing stack stitching problems where a one-way call with violations followed by a two-way call without violations was getting the previous one-way call's violation stack stitched on to the second caller's stack. The solution is a little more indirect than I would've liked (preserving the binder's onTransact flags until enforceInterface) but was seemingly necessary to work without changing the AIDL compiler. It should also be sufficiently cheap, since no new calls to thread-local IPCThreadState lookups were required. The additional work is just same-thread getter/setters on the existing IPCThreadState. Change-Id: I4b6db1d445c56e868e6d0d7be3ba6849f4ef23ae
* | | | | Merge "Fixing uniform binding for fragment shader. Updating the glsl ↵Alex Sakhartchouk2010-08-317-136/+159
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | fragment shader to color the lights."
| * | | | | Fixing uniform binding for fragment shader.Alex Sakhartchouk2010-08-317-136/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating the glsl fragment shader to color the lights. Change-Id: I6f850d1aa22059a2974e379f652f7e99d6a799fb
* | | | | | am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP ↵Andreas Huber2010-08-314-6/+345
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, ↵Andreas Huber2010-08-314-6/+345
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and ↵Andreas Huber2010-08-314-6/+345
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | AAC-hbr." into gingerbread
| | | * | | | Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.Andreas Huber2010-08-314-6/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied92ea8c2448a2cb1a732c72c21c69da1913dbc8 related-to-bug: 2556656
* | | | | | | am e1a3cddd: am 99fa510e: Merge "Better detection of connection problems - ↵Andreas Huber2010-08-312-43/+67
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | | am 99fa510e: Merge "Better detection of connection problems - timeout if no ↵Andreas Huber2010-08-312-43/+67
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | | | Merge "Better detection of connection problems - timeout if no rtcp packets ↵Andreas Huber2010-08-312-43/+67
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | arrive within a certain time, not a final frame (which may take longer)" into gingerbread
| | | * | | | | Better detection of connection problems - timeout if no rtcp packets arrive ↵Andreas Huber2010-08-312-43/+67
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | within a certain time, not a final frame (which may take longer) Change-Id: I3c1ae79bb9342770e959ebdcdc6b748549b76330 related-to-bug: 2556656
* | | | | | | am 04bc8070: am 6659284d: Allow Bluetooth radio to be toggled in Airplane mode.Jake Hamby2010-08-313-60/+23
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '04bc807057d1c336a5d1340595b790eee4c5b372' * commit '04bc807057d1c336a5d1340595b790eee4c5b372': Allow Bluetooth radio to be toggled in Airplane mode.
| * | | | | | am 6659284d: Allow Bluetooth radio to be toggled in Airplane mode.Jake Hamby2010-08-313-60/+23
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6659284d68bb04539891456700c8da2d0bae7d09' into gingerbread-plus-aosp * commit '6659284d68bb04539891456700c8da2d0bae7d09': Allow Bluetooth radio to be toggled in Airplane mode.
| | * | | | | Allow Bluetooth radio to be toggled in Airplane mode.Jake Hamby2010-08-313-60/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "bluetooth" to the list of toggleable radios. Because this string is in the Settings DB, I had to bump the version number. Why is this in the settings DB anyway, rather than a carrier config option? I also discovered that the SystemUI package copied the entire contents of res/values/defaults.xml from SettingsProvider, when I originally tried to update the unreferenced SystemUI version of the setting. To prevent future confusion, I removed all of the values from the SystemUI version of res/values/defaults.xml. Change-Id: Ib8a75c85b9db5c1963b65538ee2765d5087e67d2
* | | | | | | Merge "Fix crash when proxy exclusion list is null."Andrew Stadler2010-08-311-3/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix crash when proxy exclusion list is null.Andrew Stadler2010-08-311-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaned up source a little bit and eliminated a warning. Bug: 2964821 Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17
* | | | | | | | am b4649ec7: am 23827557: Merge "Add a --debug-mode option to aapt." into ↵Xavier Ducrohet2010-08-313-3/+18
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'b4649ec720fa959b700a7a03c089bfdc61321d16' * commit 'b4649ec720fa959b700a7a03c089bfdc61321d16': Add a --debug-mode option to aapt.
| * | | | | | | am 23827557: Merge "Add a --debug-mode option to aapt." into gingerbreadXavier Ducrohet2010-08-313-3/+18
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2382755730206da52b64bf7bd2fad421f9a6fd0d' into gingerbread-plus-aosp * commit '2382755730206da52b64bf7bd2fad421f9a6fd0d': Add a --debug-mode option to aapt.
| | * | | | | | Merge "Add a --debug-mode option to aapt." into gingerbreadXavier Ducrohet2010-08-313-3/+18
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Add a --debug-mode option to aapt.Xavier Ducrohet2010-08-313-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passed (with no needed parameters) to the aapt command line, aapt will insert debuggable=true in the application node of the manifest automatically. This is to be used by the SDK tools to make true "debug" builds that require no code/file change. Change-Id: I6f0a7af7b7d51f26bb0ec012e6f142a6060b8618
* | | | | | | | Merge "MTP: Send an Intent after an MTP session that resulted in media ↵Mike Lockwood2010-08-315-0/+73
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | database modifications"
| * | | | | | | | MTP: Send an Intent after an MTP session that resulted in media database ↵Mike Lockwood2010-08-315-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modifications Change-Id: Ib2796e9155350c67769502935a73cf98d6ae9c08 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | am b7ab3420: Ignore changes from open-source master that are already hereJean-Baptiste Queru2010-08-310-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b7ab342016bd622b30e1945b16b24413ae82ac54' * commit 'b7ab342016bd622b30e1945b16b24413ae82ac54': GPS: Initialize XTRA support when GPS is enabled GPS: Don't set XTRA download pending flag at boot time.
| * | | | | | | | Ignore changes from open-source master that are already hereJean-Baptiste Queru2010-08-310-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b560ab81c5188e6a28aa6feb0be13f970e0add4
| | * \ \ \ \ \ \ \ Merge "GPS: Initialize XTRA support when GPS is enabled"Mike Lockwood2010-08-311-2/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | GPS: Initialize XTRA support when GPS is enabledMike Lockwood2010-08-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 2923148 Change-Id: If9a643e385c6c567b30f47d4caa35fa812a2ba43 Signed-off-by: Mike Lockwood <lockwood@android.com>
| | * | | | | | | | | Merge "GPS: Don't set XTRA download pending flag at boot time."Mike Lockwood2010-08-311-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | GPS: Don't set XTRA download pending flag at boot time.Mike Lockwood2010-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XTRA data downloads are now strictly on demand from the GPS engine. Also fix typo in handleDownloadXtraData() Change-Id: Ied1a6e2e62134add4d965326aae909c86f834682 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | Update API to fix the build.Eric Fischer2010-08-311-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I241d94b2615e71eb3633955438dcaffa854d2836
* | | | | | | | | | | Merge "Add settings option for running MTP server in PTP mode."Mike Lockwood2010-08-315-9/+61
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add settings option for running MTP server in PTP mode.Mike Lockwood2010-08-315-9/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used as a compatibility workaround for host operating systems without MTP support. Change-Id: If4f1856206056ca8e40c3ffbfa382f185c413598 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | Merge "USB: Add functions for querying if a USB function is supported and ↵Mike Lockwood2010-08-311-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | enabled."
| * | | | | | | | | | | USB: Add functions for querying if a USB function is supported and enabled.Mike Lockwood2010-08-311-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5fc24960e1e01c27e892acc2e76c12ddf8c654cb Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | am aa40b834: am 6aacad66: Merge "Add some encoding parameters for the ↵James Dong2010-08-311-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "record" utility" into gingerbread Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a' * commit 'aa40b834985023642b30fa2e0563c414a994bd3a': Add some encoding parameters for the "record" utility
| * | | | | | | | | | | am 6aacad66: Merge "Add some encoding parameters for the "record" utility" ↵James Dong2010-08-311-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp * commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca': Add some encoding parameters for the "record" utility
| | * | | | | | | | | | Merge "Add some encoding parameters for the "record" utility" into gingerbreadJames Dong2010-08-311-1/+19
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Add some encoding parameters for the "record" utilityJames Dong2010-08-311-1/+19
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - TODO: remove some of the hard coded values Change-Id: Ib58bbb8af45fd102176ac49da0a71613a12fa5fc
* | | | | | | | | | | | am b1824cfc: am 54901c9e: fix the build. will revisit this change in a minuteJoe Onorato2010-08-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b1824cfca7dde367197662953b7478a9dbceab27' * commit 'b1824cfca7dde367197662953b7478a9dbceab27': fix the build. will revisit this change in a minute
| * | | | | | | | | | | am 54901c9e: fix the build. will revisit this change in a minuteJoe Onorato2010-08-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '54901c9e8497b33bab1462245864e9dd119bb64c' into gingerbread-plus-aosp * commit '54901c9e8497b33bab1462245864e9dd119bb64c': fix the build. will revisit this change in a minute
| | * | | | | | | | | | fix the build. will revisit this change in a minuteJoe Onorato2010-08-311-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibac9e777ea7332d63ddaf2e3b8935e56a663ebbe
* | | | | | | | | | | | am 5238c5f9: fix the build. will revisit this change in a minuteJoe Onorato2010-08-311-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c' * commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c': fix the build. will revisit this change in a minute
generated by cgit v1.1 at 2025-11-26 09:44:12 +0000