29927 Commits

Author SHA1 Message Date
Irfan Sheriff
25c9bf2396 Add set/get band in WifiNative
Add support for set and get band and set the default
to 2GHz for now till we get a fix on issues
with 11A

Change-Id: Icb9bddc353e4bf013bdb8a08d9b4ee3451c282f4
2010-09-02 12:48:20 -07:00
Jeff Brown
ee6d676c5b 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
97a24c60ee Merge "Add WifiConfigStore to manage networks" 2010-08-31 15:52:26 -07:00
Jeff Brown
df02df115a 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
288db3b499 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
55e7937462 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
307ed31c93 Merge "Remove incomplete input device enumeration NDK API." into gingerbread 2010-08-31 15:45:32 -07:00
Eric Laurent
f560ceabe1 Merge "Audio Effects: fix problems in volume control." into gingerbread 2010-08-31 15:43:36 -07:00
Irfan Sheriff
04db1d5d3a Add WifiConfigStore to manage networks
Split configuration management into a seperate class,
next to come is per configuration ip management as part
of WifiConfigStore.

Bug: 2876746
Change-Id: I44b85fb0e23a83d97a5052ba6beafe06f2027f5a
2010-08-31 15:41:21 -07:00
Joe Onorato
522ea25f2b 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
Eric Laurent
a92ebfa1cd Audio Effects: fix problems in volume control.
- Fixed click when re-enabling effect during the turn off phase:
make sure the effect states where effect is processed are the same
where volume control is delegated to effect.
- Fixed click when effect is deleted while still active: do not apply
volume ramp if an effect having volume control was just removed from the
effect chain.

Also fixed a crash when PCM dump is enabled in effect bundle wrapper.

Change-Id: Ib562f5cf75c69af75df0e862536262e2514493e4
2010-08-31 15:26:23 -07:00
Jeff Brown
5fad2675e8 Remove incomplete input device enumeration NDK API.
Change-Id: I32de74ff5fcf0e29179a2aee03ddabd22fa485bb
2010-08-31 15:24:55 -07:00
Joe Onorato
1e1a030b50 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
e1cc0ffe54 Merge "Clean up doc build to use Android custom doclava." 2010-08-31 15:11:45 -07:00
Joe Onorato
47471175c9 Can't have two rules building the stubs and public.xml!
Change-Id: I27b113d436aa5f945c5d6d56258dbafdf71193cf
2010-08-31 15:11:11 -07:00
Brad Fitzpatrick
1423f51ec5 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
fdf5b0808f 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
03cf22057a 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
ae087369c5 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
63070856d0 Merge "Don't propagate StrictMode over one-way Binder calls." into gingerbread 2010-08-31 14:58:26 -07:00
Andreas Huber
6b52911cc7 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
48ac68e1b1 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
5f39972aa9 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
2c24516e58 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
e1a3cddd94 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
04bc807057 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
99fa510e67 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
eb91e78ff9 Merge "Fix crash when proxy exclusion list is null." 2010-08-31 14:38:49 -07:00
Jake Hamby
6659284d68 Allow Bluetooth radio to be toggled in Airplane mode.
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
2010-08-31 14:37:30 -07:00
Xavier Ducrohet
d092f38002 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
b4649ec720 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
f06a449951 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
2382755730 Merge "Add a --debug-mode option to aapt." into gingerbread 2010-08-31 14:30:03 -07:00
Andrew Stadler
ac19f24cc1 Fix crash when proxy exclusion list is null.
Also cleaned up source a little bit and eliminated a warning.

Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17
2010-08-31 14:28:58 -07:00
Andreas Huber
e536f800c6 Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
Change-Id: Ied92ea8c2448a2cb1a732c72c21c69da1913dbc8
related-to-bug: 2556656
2010-08-31 14:25:36 -07:00
Jean-Baptiste Queru
f9806d4872 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
b7ab342016 Ignore changes from open-source master that are already here
Change-Id: I5b560ab81c5188e6a28aa6feb0be13f970e0add4
2010-08-31 14:19:20 -07:00
Eric Fischer
1e26f30463 Update API to fix the build.
Change-Id: I241d94b2615e71eb3633955438dcaffa854d2836
2010-08-31 14:15:57 -07:00
Mike Lockwood
75a2ae937f Merge "GPS: Initialize XTRA support when GPS is enabled" 2010-08-31 13:56:00 -07:00
Mike Lockwood
9e64fcb5b5 Merge "GPS: Don't set XTRA download pending flag at boot time." 2010-08-31 13:55:39 -07:00
Mike Lockwood
d20e802512 Merge "Add settings option for running MTP server in PTP mode." 2010-08-31 13:47:13 -07:00
Mike Lockwood
6ed727e39e Merge "USB: Add functions for querying if a USB function is supported and enabled." 2010-08-31 13:46:35 -07:00
James Dong
f827a0cf1d 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
e0801bd0d1 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
77d312facf 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
James Dong
aa40b83498 am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread
Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp

* commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca':
  Add some encoding parameters for the "record" utility
2010-08-31 13:25:42 -07:00
Joe Onorato
b1824cfca7 am 54901c9e: fix the build. will revisit this change in a minute
Merge commit '54901c9e8497b33bab1462245864e9dd119bb64c' into gingerbread-plus-aosp

* commit '54901c9e8497b33bab1462245864e9dd119bb64c':
  fix the build.  will revisit this change in a minute
2010-08-31 13:25:27 -07:00
Mike Lockwood
2837eefc54 MTP: Send an Intent after an MTP session that resulted in media database modifications
Change-Id: Ib2796e9155350c67769502935a73cf98d6ae9c08
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-31 16:25:12 -04:00
Brad Fitzpatrick
0234376503 Don't propagate StrictMode over one-way Binder calls.
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
2010-08-31 13:16:49 -07:00
James Dong
6aacad66eb Merge "Add some encoding parameters for the "record" utility" into gingerbread 2010-08-31 13:13:18 -07:00