29055 Commits

Author SHA1 Message Date
Irfan Sheriff
6118069b1d Fix WRITE_SECURE_SETTINGS permission issue
The refactor with the new state machine had introduced
a bug with writes to secure settings in public API for
which apps might not have permission.

Bug: 2895750
Change-Id: I7d236253201a47b836996859aa3de2806ad8a800
2010-08-18 16:07:39 -07:00
Dianne Hackborn
b424b633bb Fix issue #2845673: android:exported="false" is not obeyed
Thou shall obey.

Change-Id: I09f163a0db7cc9189c8d7f5116cc8ca9d4f7a76c
2010-08-18 16:07:35 -07:00
Mathias Agopian
100f42a4bf fix [2931161] crash in labyritnth when completing a level
Change-Id: I821d67effaf73d7008b2828d06f5489d1f976a1e
2010-08-18 16:07:34 -07:00
Alex Sakhartchouk
27f50523a4 Renderscript samples. Merged two model related projects. Cleanup.
Change-Id: I6fdc70420eee7dfecf0b051fd687e5797c6580ce
2010-08-18 15:46:43 -07:00
Robert Greenwalt
4600139173 am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread
Merge commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp

* commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6':
  DO NOT MERGE Do not kill sockets going default->hipri
2010-08-18 15:14:31 -07:00
Robert Greenwalt
6b2c56a299 Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread 2010-08-18 15:11:52 -07:00
Danica Chang
6fdd0c6274 bluetooth tethering
Change-Id: Id6d5fb1922facc7013abc29214d3e1141995b767
2010-08-18 15:07:50 -07:00
Robert Greenwalt
a22ae073cc DO NOT MERGE Do not kill sockets going default->hipri
A usecase is to use hipri to keep alive 3g connections when wifi
is about to be brought up.  They are the same network, so don't
reset unless both are down.

Change-Id: I8dabc42f315943b28ea34721793b0ee330c07bf6
2010-08-18 15:03:46 -07:00
David Brown
5aaeaffdce Merge "Move the "voice_capable" resource into the framework." 2010-08-18 14:32:36 -07:00
Eric Laurent
ba8da2e61b Audio Effects: fixed "strength supported" parameter size.
The "strength supported" parameter for bass boost and virtualizer effect was incorrectly using a
short value whereas it should be an int. This is to comply to the definition of boolean type in OpenSL ES
that is uint32.

Change-Id: I74ccb61dcc70fc9d390524a1ca5bbbd8b13ab1af
2010-08-18 14:31:25 -07:00
Brad Fitzpatrick
cf2c68c9c2 am 11709ab0: Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread
Merge commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade' into gingerbread-plus-aosp

* commit '11709ab07ca2eb97dfa3fc7bb3e0996e65908ade':
  Avoid unnecessary SharedPrefences disk writes.
2010-08-18 14:23:23 -07:00
Konstantin Lopyrev
917031361c am 28bd3a54: am f2af87b3: Merge "Making sure the draw time is measured." into gingerbread
Merge commit '28bd3a54ec192ed9259cf88873e387129103258e'

* commit '28bd3a54ec192ed9259cf88873e387129103258e':
  Making sure the draw time is measured.
2010-08-18 14:22:25 -07:00
Jens Gulin
96f32ea662 am 25af9997: am c4554b9a: Keep track of remaining fd when devices are removed
Merge commit '25af9997b91a2cc5de8ffdaff072552492fb6312'

* commit '25af9997b91a2cc5de8ffdaff072552492fb6312':
  Keep track of remaining fd when devices are removed
2010-08-18 14:22:20 -07:00
Steve Howard
5eb49583e2 Improve orientation sensing when waking up while flat.
This change makes the window manager pass the currently displayed
orientation to the WindowOrientationListener each time to calls to get
the currently sensed orientation.  Now, when the
WindowOrientationListener doesn't know for sure what the orientation
of the device should be (for example, if the sensed orientation is
flat on a table), then it trusts the already-displayed orientation,
rather than trusting whatever sensors reading it most recently
received.

The main use case this addresses is:
* user uses device in portrait
* user turns off device, puts it in pocket
* while in pocket, screen gets turned on, activating orientaiton
  sensor, which senses landscape orientation
* screen timed out
* user takes device out, places it on a table (or looks down at it,
  holding it flat), and unlocks it

Previously, when the device was unlocked, the
WindowOrientationListener would return landscape orientation based on
its previous sensor readings.  Now, it will override those previous
readings because it knows they never actually took effect and the
device is presently flat.

This change also slightly modifies the way we handle flat orientation,
now completely ignoring data when the tilt distrust is nonzero (even
if the current sensor reading shows non-tilted).

Change-Id: Ia4950a41827f8c53a80487d0c2e83b556df781b9
2010-08-18 14:22:19 -07:00
Brian Carlstrom
bb1562e559 am 03805f72: am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread
Merge commit '03805f729cacead5d0797c840430ea99b26036d6'

* commit '03805f729cacead5d0797c840430ea99b26036d6':
  tracking merge of external/apache-http from dalvik-dev
2010-08-18 14:22:08 -07:00
Wu-cheng Li
24844c9a30 am a2527055: am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9'

* commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9':
  Document that autoFocus must be called in auto and macro mode.
2010-08-18 14:22:02 -07:00
Andreas Huber
f5a36b24ac am 00557baf: am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread
Merge commit '00557baf36ab62592ae1c424a7298a21e8588f5a'

* commit '00557baf36ab62592ae1c424a7298a21e8588f5a':
  Make the OggExtractor less verbose.
2010-08-18 14:21:57 -07:00
Andreas Huber
c7dbac57e2 am 31eb1ac1: am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread
Merge commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58'

* commit '31eb1ac1db38d0a5cd0b44dd5251941992f74b58':
  Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
2010-08-18 14:21:51 -07:00
Steve Howard
1944cca612 am 0899e8bc: am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit '0899e8bc9dc44249d6be016bed71a9ecee56f132'

* commit '0899e8bc9dc44249d6be016bed71a9ecee56f132':
  Fix up handling of null fields in DownloadManager.
2010-08-18 14:21:44 -07:00
Kenny Root
14b2ff4f53 am 7a11ae26: am face0c02: am 46906276: Amend previous ndc commit
Merge commit '7a11ae268cfd9cd1a7887217c926bec19fdccf17'

* commit '7a11ae268cfd9cd1a7887217c926bec19fdccf17':
  Amend previous ndc commit
2010-08-18 14:21:38 -07:00
Brad Fitzpatrick
11709ab07c Merge "Avoid unnecessary SharedPrefences disk writes." into gingerbread 2010-08-18 14:21:32 -07:00
Kenny Root
b8a5db80e2 am 8eaacf46: am e2f95e42: am a34c9ca3: (-s ours) Add more error checking for ndc
Merge commit '8eaacf46dc3bf2f267e5382dfbd9ab6dc06e3e9f'

* commit '8eaacf46dc3bf2f267e5382dfbd9ab6dc06e3e9f':
  Add more error checking for ndc
2010-08-18 14:21:28 -07:00
David 'Digit' Turner
edf998b156 am 4ad26d71: am a6b47cd3: am 24a03083: PackageManagerService: always install native binaries from .apk
Merge commit '4ad26d7131c4903f32dede444b78c2b1989327ec'

* commit '4ad26d7131c4903f32dede444b78c2b1989327ec':
  PackageManagerService: always install native binaries from .apk
2010-08-18 14:21:22 -07:00
Hung-ying Tyan
f2b4a15e18 am fa9a38c5: am 6ab94608: Merge "CallManager: add setAudioMode()" into gingerbread
Merge commit 'fa9a38c566d09a4c891d584ed3d3af9690967b31'

* commit 'fa9a38c566d09a4c891d584ed3d3af9690967b31':
  CallManager: add setAudioMode()
2010-08-18 14:21:15 -07:00
Jeff Brown
a9abfa54d3 am 29eb491a: am 3922484d: Merge "Optimize EventHub reads." into gingerbread
Merge commit '29eb491a5addc78003299ecab6ab6c716201f9dc'

* commit '29eb491a5addc78003299ecab6ab6c716201f9dc':
  Optimize EventHub reads.
2010-08-18 14:21:07 -07:00
Hung-ying Tyan
1c66bfb37e am dc7d7378: am 8eac20ea: SIP: implement conference call
Merge commit 'dc7d73783e0416cbfde6053a037ce32c8f35fbc4'

* commit 'dc7d73783e0416cbfde6053a037ce32c8f35fbc4':
  SIP: implement conference call
2010-08-18 14:20:49 -07:00
Hung-ying Tyan
38311b33c8 am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Merge commit '16848a15bbb7648bb1298c91f7969073c106115c'

* commit '16848a15bbb7648bb1298c91f7969073c106115c':
  CallManager: do not deliver ring event if fg call is live.
2010-08-18 14:20:41 -07:00
Eric Fischer
e68de480fd am 8cbaf59e: (-s ours) am 04e5a1cb: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '8cbaf59e313227d41c9881fbedb4dc3255a83b8d'

* commit '8cbaf59e313227d41c9881fbedb4dc3255a83b8d':
  Import revised translations.  DO NOT MERGE
2010-08-18 14:20:33 -07:00
Jeff Brown
671cc0ec30 am 8fd80e92: am 72ce4235: Merge "Fix possible race conditions during channel unregistration." into gingerbread
Merge commit '8fd80e924a2f40f6a785f834914f8a6f18a3aa9d'

* commit '8fd80e924a2f40f6a785f834914f8a6f18a3aa9d':
  Fix possible race conditions during channel unregistration.
2010-08-18 14:20:24 -07:00
Irfan Sheriff
f96a508d06 am aea40e3c: (-s ours) am a1af0d7c: Merge "Fix SDK build" into gingerbread
Merge commit 'aea40e3c5746d754f96b76b7845bbbf7effe2677'

* commit 'aea40e3c5746d754f96b76b7845bbbf7effe2677':
  Fix SDK build
2010-08-18 14:20:16 -07:00
David Brown
ae3efa53a9 Move the "voice_capable" resource into the framework.
There's currently a config.xml param in the phone app saying whether the
current device is "voice capable", which is used to determine (among other
things) whether the OTASP call should run in interactive mode.

But both Contacts and Settings are about to need this flag too, so it
really belongs in the framework instead.  As of this change it's now
"com.android.internal.R.bool.voice_capable".

Also add a corresponding TelephonyManager call so that unbundled and 3rd
party apps can access it too.

Change-Id: Ie9a8803295bf97eb32154291aac8fce1e21c7b25
2010-08-18 14:12:30 -07:00
Daisuke Miyakawa
8902abb7ff am a7bb3ba5: (-s ours) am f996ed9f: Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread
Merge commit 'a7bb3ba54aed70919c8304ae4227ab5106243f75'

* commit 'a7bb3ba54aed70919c8304ae4227ab5106243f75':
  Make vCard importer/exporter aware of multi-byte parameters.
2010-08-18 14:08:03 -07:00
Adam Powell
b1703f439c Merge "Back button closes ActionModes" 2010-08-18 14:01:33 -07:00
Jean-Baptiste Queru
6d5bb88454 am aac6a748: Merge "Only monitor recognized uevent devices." into gingerbread
Merge commit 'aac6a7481757e3477e489f311e53385988a5d9a0' into gingerbread-plus-aosp

* commit 'aac6a7481757e3477e489f311e53385988a5d9a0':
  Only monitor recognized uevent devices.
2010-08-18 13:59:43 -07:00
Mathias Agopian
4195d097c5 am 8ad86fef: Merge "Improve documentation of getAltitude" into gingerbread
Merge commit '8ad86fef49a732617dc26be9324af60f9975342d' into gingerbread-plus-aosp

* commit '8ad86fef49a732617dc26be9324af60f9975342d':
  Improve documentation of getAltitude
2010-08-18 13:57:18 -07:00
Mathias Agopian
8e13ce52f3 am 26bcc7b4: Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread
Merge commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03' into gingerbread-plus-aosp

* commit '26bcc7b44238ea54105ef5a6020fa5c37bb33f03':
  revert hwcomposer HAL changes. DO NOT MERGE.
2010-08-18 13:57:15 -07:00
Jean-Baptiste Queru
aac6a74817 Merge "Only monitor recognized uevent devices." into gingerbread 2010-08-18 13:56:58 -07:00
Mathias Agopian
8ad86fef49 Merge "Improve documentation of getAltitude" into gingerbread 2010-08-18 13:55:01 -07:00
Mathias Agopian
26bcc7b442 Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread 2010-08-18 13:54:46 -07:00
Sean McNeil
aeb00c409d Only monitor recognized uevent devices.
system_server can potentially monitor uevent devices that are
of no use to it. For instance, an accelerometer implementation
as uevents. This would cause the process to be busy when
unnecessary. If a device cannot be classified, don't monitor it.

Change-Id: Ib2c93105e7d746d9c1a7414bea8bab3fb8c0b70a
2010-08-18 13:53:36 -07:00
Jean-Baptiste Queru
34df5ccca4 Merge "fix build" into gingerbread-plus-aosp 2010-08-18 13:48:38 -07:00
Jean-Baptiste Queru
a00f8db5ef fix build
Change-Id: I13a6a34e8eae73b046769df365be8a46489bd111
2010-08-18 13:47:45 -07:00
Jeff Brown
33992d4195 am 72e0b2ab: Merge "Fix some input device mapping bugs with certain drivers." into gingerbread
Merge commit '72e0b2ab08dc49857955a4560de296fdddada8dc' into gingerbread-plus-aosp

* commit '72e0b2ab08dc49857955a4560de296fdddada8dc':
  Fix some input device mapping bugs with certain drivers.
2010-08-18 13:42:34 -07:00
Konstantin Lopyrev
28bd3a54ec am f2af87b3: Merge "Making sure the draw time is measured." into gingerbread
Merge commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16' into gingerbread-plus-aosp

* commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16':
  Making sure the draw time is measured.
2010-08-18 13:39:29 -07:00
Jens Gulin
25af9997b9 am c4554b9a: Keep track of remaining fd when devices are removed
Merge commit 'c4554b9a0885ac3713575e91d8d33c5670b52322' into gingerbread-plus-aosp

* commit 'c4554b9a0885ac3713575e91d8d33c5670b52322':
  Keep track of remaining fd when devices are removed
2010-08-18 13:39:24 -07:00
Brian Carlstrom
03805f729c am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread
Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp

* commit 'd313cab46e07c40f4cd1a94304a553e7eb809190':
  tracking merge of external/apache-http from dalvik-dev
2010-08-18 13:39:15 -07:00
Wu-cheng Li
a2527055f8 am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit 'c86960236d5b2095c87bf46de2400a905acabee2' into gingerbread-plus-aosp

* commit 'c86960236d5b2095c87bf46de2400a905acabee2':
  Document that autoFocus must be called in auto and macro mode.
2010-08-18 13:39:01 -07:00
Andreas Huber
00557baf36 am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbread
Merge commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd' into gingerbread-plus-aosp

* commit '4dda6ddb25e904c17dcb3012dd229df6ae4692cd':
  Make the OggExtractor less verbose.
2010-08-18 13:38:53 -07:00
Andreas Huber
31eb1ac1db am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread
Merge commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp

* commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68':
  Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
2010-08-18 13:38:49 -07:00
Steve Howard
0899e8bc9d am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp

* commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8':
  Fix up handling of null fields in DownloadManager.
2010-08-18 13:38:42 -07:00