26446 Commits

Author SHA1 Message Date
Jeff Hamilton
68a5c9f3cf Add a way to get a string for an error code.
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
2010-10-26 14:09:48 -05:00
Justin Ho
5a147d083c Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:09:22 -07:00
Justin Ho
34952c0121 DO NOT MERGE - Fixing capitalized ringtone metadata only
Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e
2010-10-26 09:05:06 -07:00
Mike Lockwood
1d28a84059 Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:34:32 -07:00
Eric Laurent
1a58d9c398 Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:13:32 -07:00
Jeff Hamilton
79fb6449a1 Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:16:47 -07:00
Mike Lockwood
9e3191d16c Location Manager: Fix LocationManager.getBestProvider filtering.
getBestProvider should only return location providers that the client
has permission to use.

BUG: 3124614

Change-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-26 10:01:55 -04:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden.
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
2010-10-26 08:59:18 -05:00
Eric Laurent
164a8f86c7 Partial fix for issue 3124895.
When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.

Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
2010-10-25 19:45:39 -07:00
Joe Onorato
11e2e9b0c2 Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-25 18:48:08 -07:00
Scott Main
3d40cd5055 am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
Merge commit 'c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread

* commit 'c9ac1079696b93a294f504c6561397ef731a46f9':
  update featured videos
2010-10-25 17:15:50 -07:00
Justin Ho
044df235c8 Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread 2010-10-25 16:44:01 -07:00
Justin Ho
6a83d37769 DO NOT MERGE - Updated ringtone assets for crespo
Change-Id: Ie5c6b0bfa282f976129f5e87a09512da01e6851b
2010-10-25 16:38:41 -07:00
Joe Malin
5016df1cfa Merge "Doc Change: Revert NotePad sample test package" into gingerbread 2010-10-25 16:19:18 -07:00
Eric Fischer
3d1ce9ec2a Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-25 16:14:47 -07:00
Joe Malin
24fed74a34 Doc Change: Revert NotePad sample test package
Change-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37
2010-10-25 15:55:13 -07:00
Scott Main
c9ac107969 update featured videos
also remove "new" tags from SDK and Resources nav items

Change-Id: I75e16fc6dda5a7cbcd4ff8e4ebb2189860e884d5
2010-10-25 15:42:03 -07:00
Eric Fischer
0820821213 Import revised translations. DO NOT MERGE
Change-Id: I404fe29521193ca9d0a3689d4a786253dc27e2d6
2010-10-25 15:41:31 -07:00
Jeff Hamilton
106165b510 Merge "Add a RHS status bar slot for NFC." into gingerbread 2010-10-25 14:46:45 -07:00
Jeff Hamilton
e0be933ec7 Add a RHS status bar slot for NFC.
Change-Id: I62cbcec051a2c69f76fb9a5b9ff6f6bc05a8257b
2010-10-25 16:41:41 -05:00
Joe Onorato
06eb33acb7 Don't turn the button backlights on if the screen is off. Part 2.
These are the logs from when I just reproduced it here.  This means that we got an event after the
screen turned off.  So isScreenTurningOffLocked() is working, but we need to also check that we're
not off.  This bug is happening because lightSensorChangedLocked is calling
mButtonLight.setBrightness() directly instead of going through updateLightsLocked, which is where
I added that check to not turn the buttons on of the screen is off.

D/PowerManagerService( 1243): onSensorChanged: light value: 1280
I/power   ( 1243): *** set_screen_state 0
D/PowerManagerService( 1243): enableLightSensor false
D/PowerManagerService( 1243): onSensorChanged: light value: 320
D/PowerManagerService( 1243): lightSensorChangedLocked 320
D/PowerManagerService( 1243): lcdValue 55
D/PowerManagerService( 1243): buttonValue 255
D/PowerManagerService( 1243): keyboardValue 0
D/SurfaceFlinger( 1243): About to give-up screen, flinger = 0x8dcf! 0

Bug: 3117801
Change-Id: I722d66cafba71b183cc987b7383d4ad7e171ba82
2010-10-25 14:21:06 -07:00
Mike Lockwood
8c32bddfac Merge "GPS: Disable verbose logging" into gingerbread 2010-10-25 13:49:13 -07:00
Mike Lockwood
4a7b65e0d5 GPS: Disable verbose logging
BUG: 3127049

Change-Id: I9efd9eb7ff69724b133f3b70c52e173f49ddfbc5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-25 16:35:55 -04:00
Mathias Agopian
457bed2bc6 Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread 2010-10-25 13:31:11 -07:00
Mathias Agopian
ce4d36ad72 Merge "fix [3118445] Transform * Transform does not work as expected" into gingerbread 2010-10-25 13:31:03 -07:00
Adam Powell
17efcde161 Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread 2010-10-25 11:43:03 -07:00
Scott Main
abb50f1528 Merge "docs: fix a couple api links" into gingerbread 2010-10-25 11:18:28 -07:00
Adam Powell
b9b8f7b99b DO NOT MERGE Fix bug 3124899 - timeout in CTS test
ExpandableListViewBasicTest

A certain sequence of events could cause AbsListView to enter an
infinite event loop. Only report reaching a scroll boundary to the
overscroll code path if the Scroller wants to move further, not if
we're done moving.

Change-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40
2010-10-25 11:12:41 -07:00
Nick Pelly
79e76f52a6 Merge "Fixed NdefTag parcelable conversion methods." into gingerbread 2010-10-25 08:58:00 -07:00
Wu-cheng Li
8982120437 Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread 2010-10-25 08:55:54 -07:00
Sylvain Fonteneau
e2e4ea9ea8 Fixed NdefTag parcelable conversion methods.
Also removed call to obsolete openTagConnection() method which was crashing.

Change-Id: Iffd46bd5cad877bb3a82ede298e65ae98322dca9
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-25 08:55:36 -07:00
Wu-cheng Li
994c02bbfe Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Now overlay does flip before rotation.
bug:3114236
Change-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb
2010-10-25 14:56:22 +08:00
Nick Pelly
145550a00e Merge "Document getPollBytes() and getActivationBytes()." into gingerbread 2010-10-24 22:06:15 -07:00
Nick Pelly
416d72f4b6 Document getPollBytes() and getActivationBytes().
No code change.

Change-Id: Ideb427b2684b9f9296abefb7c97eabc52db73ee0
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-24 22:03:04 -07:00
Mathias Agopian
c57b15c9c8 fix [3123221] Video sticks playing back upside down following orientation switch
the overlay wasn't reconfigured when the screen-orientation changed. It was
only done when a parameter of the surface itself changed.

Change-Id: I0ca0925bf58ded4c91ab89d12cb1fe4d1477c96c
2010-10-24 19:03:58 -07:00
Dianne Hackborn
2365689994 Merge "Fix issue #3126018: No way to specify NativeActivity's native method" into gingerbread 2010-10-24 18:33:36 -07:00
Dianne Hackborn
e21d91c694 Fix issue #3126018: No way to specify NativeActivity's native method
Change-Id: I59de6a543e7f7f45d963a905829a3f56f32bf8cf
2010-10-24 14:56:38 -07:00
Mathias Agopian
546c21dbfa fix [3118445] Transform * Transform does not work as expected
The problem wasn't in the multiply operator, but rather in the code
that built the transform from the HAL bitmask.

We now use the multiply operator to build the Transform from the bitmask,
which guarantees, it'll always be correct.

Also added a simple test for Transform.

Change-Id: I09bf3b0e51d92f59d83ea91c4cc94fc2aa0bf227
2010-10-24 14:53:05 -07:00
Jeff Brown
860c2df413 Merge "Add unit tests for native input and fix bugs identified." into gingerbread 2010-10-24 14:18:19 -07:00
Joe Onorato
60607a9012 Make sure that when the screen is off, we don't try to turn the buttons on too.
Bug: 3117801
Change-Id: I763f114a2b0426660d29bbda04ea7db12c1137e8
2010-10-23 14:49:57 -07:00
Jeff Brown
c3db858de9 Add unit tests for native input and fix bugs identified.
Fixed a bug where we would lose the first touch point when swiping out of
the virtual key area.

Fixed a bug where we would not send an ACTION_MOVE event in cases where
individual pointers went down/up and the remaining pointers actually moved.
This is important since many applications do not handle pointer movements
during ACTION_POINTER_DOWN or ACTION_POINTER_UP.  In the case of
ACTION_POINTER_UP the movement was completely lost since all pointers were
dispatched using their old location rather than the new location.

Improved motion event validation to check for duplicate pointer ids.

Added an input source constant that was missing from the NDK api but
defined in the framework api.

Added a timestamp when reporting added/removed devices in EventHub.

Bug: 3070082
Change-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56
2010-10-23 03:52:57 -07:00
Eric Laurent
b6a2256e54 Merge "Fix issue 3126094." into gingerbread 2010-10-22 18:37:09 -07:00
Eric Laurent
cc02ac54ac Fix issue 3126094.
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.

Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
2010-10-22 18:08:13 -07:00
Eric Fischer
ecae6e06a3 Merge "Import translations for status bar." into gingerbread 2010-10-22 17:14:36 -07:00
Eric Rowe
8de43ab5ba Merge "Change disable timeout for BT disable stress test" into gingerbread 2010-10-22 17:14:12 -07:00
Eric Fischer
4aa82a7b7a Import translations for status bar.
Change-Id: I5f40e9c507530fb4110da711e54465c2ae920a94
2010-10-22 16:49:14 -07:00
Eric Rowe
867568314d Change disable timeout for BT disable stress test
Bug: b/3125900
Change-Id: Ie1f599f1c418fc40c29debd1401297441a2a9db3
2010-10-22 16:34:33 -07:00
Nick Pelly
07f3bee2db Push Tag/NdefTag implementation details into the service.
Tag/NdefTag objects should just be simple data objects. Push the mapping of
internal tag type to public rawTarget/ndefTarget into Nfc Service.

This gives an oppurtunity to clean up some Tag/NdefTag API methods. Most
significantly, adding createMockTag() and createMockNdefTag() to help with
application testing.

There will probably be some more tweaking of the types/targets in
Tag/NdefTag to come, this commit makes that a lot easier.

Also:
- Introduce getActivationBytes() and getPollBytes(). These are just stubs
for NFC service to implement, we have feedback these are really important
to help identify NFC tags.
- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll
into 3A).

Change-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-22 16:29:43 -07:00
Eric Fischer
67496e591d Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:06:38 -07:00
Eric Fischer
a3e70a430e Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread 2010-10-22 15:59:42 -07:00