57604 Commits

Author SHA1 Message Date
Dianne Hackborn
7de6578f1c Merge "Fix issue #4974633: Block the HOME button using TYPE_KEYGUARD" 2011-09-01 15:56:36 -07:00
Dianne Hackborn
554d4a5765 Merge "Fix issue #5039287: Listen dies on back key on ICS but not on Gingerbread" 2011-09-01 15:55:33 -07:00
Dianne Hackborn
69666e0781 Merge "Fix issue #5229575: Youtube link shared through messaging is not..." 2011-09-01 15:54:43 -07:00
Justin Ho
469ca312d0 Check in source WAVs for sounds
Change-Id: I159924aaf0d64d472d47970f1f07c366d71fd2e0
2011-09-01 15:50:58 -07:00
Robert Ly
d9e075b003 fix rs docs
Change-Id: Id7253737278d5dc4ef3b6d53cd32dbac1a80103d
2011-09-01 15:46:43 -07:00
Xavier Ducrohet
912a8b7062 Merge "Add new dependency generation option to aidl." 2011-09-01 15:44:12 -07:00
Justin Ho
6468e04e5e Merge "Updated Ringtone oggs" 2011-09-01 15:43:54 -07:00
Justin Ho
da92038d99 Merge "Updated notification sounds" 2011-09-01 15:43:43 -07:00
Justin Ho
d2f2b68e1c Merge "Updated alarm sounds" 2011-09-01 15:43:34 -07:00
Justin Ho
e3a4567477 Updated Ringtone oggs
Change-Id: Id8c3b45a364e431f272b894c7539ffcfb81d6c75
2011-09-01 15:41:06 -07:00
Justin Ho
859e330065 Updated notification sounds
Change-Id: I25c367c9f5b0aecc7cc5c26a148059f53809e03b
2011-09-01 15:35:55 -07:00
Jeff Sharkey
0fea823673 Selectively add stats based on iface active state.
Only combine /proc/net/dev and xt_qtaguid stats when iface is marked
as active.  When inactive, only return xt_qtaguid stats.  When iface
is unknown to xt_qtaguid, always pass through /proc/net/dev stats.

Bug: 5242730
Change-Id: I469fc6abe45309f794afebca814cbb39e4f13af5
2011-09-01 15:23:38 -07:00
Justin Ho
6dae116bea Updated alarm sounds
Change-Id: I9e15d36934d4c7a6b58e5c92632dfe062de3dad0
2011-09-01 15:19:37 -07:00
Jeff Sharkey
07b0dd9a09 Sample network statistics for sanity check.
After detailed poll events, sample high-level network statistics to
sanity check iface totals against UID totals.

Bug: 5248382
Change-Id: I1c1fbb7c094c9ff0c9dde416467c563dda68f478
2011-09-01 15:07:19 -07:00
Mathias Agopian
9ae3d65936 Merge "this should fix the GL debugger" 2011-09-01 14:58:17 -07:00
Mathias Agopian
3b583229d0 this should fix the GL debugger
we were checking against to the wrong variable

Change-Id: Iff3f5ab2d6ba5ac0d3d8161011b38e673ee7e67b
2011-09-01 14:55:00 -07:00
Dianne Hackborn
a5445d3bbd Fix issue #5039287: Listen dies on back key on ICS but not on Gingerbread
Change-Id: I77c63a8c372ff7a8459a1e8cf6fd1b37f320e3ce
2011-09-01 14:38:24 -07:00
Irfan Sheriff
9cc2718abc Prepare for exposing p2p API
First part of documentation and cleanup before we can unhide
the p2p API for review by API council.

Bug: 5247957
Change-Id: Idb52f0b699d23e22aa829f60cfac2c98451d2e22
2011-09-01 14:37:51 -07:00
Robert Greenwalt
74b056c2db Merge "Make WRITE_APN_SETTINGS a system-only permission." 2011-09-01 14:33:49 -07:00
Romain Guy
08a1c04b96 Merge "Dispatch onDetachedFromWindow before destroying everything Bug #5245686" 2011-09-01 14:27:34 -07:00
Romain Guy
16260e73f6 Dispatch onDetachedFromWindow before destroying everything
Bug #5245686

Change-Id: I637178ee0bb47fbec9b59198b388bb8de22c1786
2011-09-01 14:26:11 -07:00
Xavier Ducrohet
18fff11e15 Add new dependency generation option to aidl.
The SDK build system does not provide an output file
and instead uses the -o<FOLDER> option and lets aidl figure
out the intermediary folders that represents the packages,
and the filename based on the input file (and its package).

Because of this the -d<FILE> option to generate a dependency
file is not convenient.

Instead the new option, -a (no parameters), automatically generate
a dependency files next to the output file.

Also, when compiling parcelable aidl files, without the -b option,
a dependency file is still generated. This is used by the SDK build
system since it cannot parse the file separately and instead tries
to compile every .aidl file.
The generation of this dependency file (which shows no output) allows
to know when any type of aidl file has been compiled.

Change-Id: If81dc7e1e0a780592c94d1850a1d1b094d6e7908
2011-09-01 14:14:14 -07:00
Svetoslav Ganov
94444fc561 Merge "Cleaning up the accessibility of MultiWaveView" 2011-09-01 13:58:10 -07:00
Stephen Hines
1716fe47bd Merge "Call .rs.dtor() when tearing down Scripts." 2011-09-01 13:49:29 -07:00
John Reck
f9fa8be5e3 Merge "Prevent serialization after being destroyed" 2011-09-01 13:48:42 -07:00
John Reck
b71fe052ab Merge "Fix destroy race condition" 2011-09-01 13:47:50 -07:00
John Reck
0aadeca6cc Merge "Partial rollback of I9ebc92dc" 2011-09-01 13:46:03 -07:00
Erik Pasternak
40f2faadc1 Merge "Fix a calendar info query to use a constant instead of a string" 2011-09-01 13:31:39 -07:00
Michael Chan
e5e0250dd2 Fix a calendar info query to use a constant instead of a string
This was causing an error when trying to query the calendar app
status from the dialer.

Change-Id: I7d5f554a96d7dc3dfed8d3fa8a0f16635a776701
2011-09-01 13:24:23 -07:00
Justin Ho
2523a6016a Merge "Remove all ringtones except default on Xoom Bug: 5032006" 2011-09-01 13:06:42 -07:00
Makoto Onuki
e39b7a3d84 Merge "Add AbstractCursor.setExtras()" 2011-09-01 12:51:58 -07:00
Dianne Hackborn
ba24e4d8bb Fix issue #5229575: Youtube link shared through messaging is not...
...opening after selecting option "Youtube" as a luncher.

Also:

* Tweak window animations so that the wallpaper exist animations do not
stop too early (causing the wallpaper to suddenly disappear).
* Make sure no input is being processed while booting, to avoid
accidentally doing things especially in the upgrade dialog.
* Some other small cleanup.

Change-Id: I40a6b53731991d4e31ac4502e3d85f0e47507481
2011-09-01 12:39:17 -07:00
Jason Sams
73d50d3edc Merge "Finish the docs for rs_cl." 2011-09-01 12:33:57 -07:00
Robert Greenwalt
cccdd721e9 Make WRITE_APN_SETTINGS a system-only permission.
Protects us from apps getting packet snooping ability
(ie, routing all your traffic through their server by
modifing your APN settings).  We may eventually revert this
if/when we have time to provide a proper API and scary UI
like VPN has.

bug:5242750
Change-Id: I71d73807ca5268c6aacc2156839b4d11427048c4
2011-09-01 12:30:47 -07:00
Erik Pasternak
31f8e91028 Merge "Revert "Fixed the problem with the calendar sort order using the column name"" 2011-09-01 12:26:14 -07:00
Erik Pasternak
07d5caaba6 Revert "Fixed the problem with the calendar sort order using the column name"
This reverts commit 9fd17460a73c46ea1c3d2174555cfcc0886ca112
2011-09-01 12:26:00 -07:00
Andreas Huber
ae51008564 Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset." 2011-09-01 12:20:24 -07:00
John Reck
45576fae46 Fix destroy race condition
Bug: 5246901

Change-Id: I97a211b23afb17314d7a37779593556529be7e32
2011-09-01 11:50:19 -07:00
Gilles Debunne
8a16f92270 Merge "Using ListView for Suggestion popup window" 2011-09-01 11:42:23 -07:00
Fabrice Di Meglio
8b5a8b5bed Merge "Code cleaning" 2011-09-01 11:41:42 -07:00
John Reck
90afe21dbb Prevent serialization after being destroyed
Bug: 5246900

Change-Id: Ic0be139b26e1b52203b8d0286c12175df6a1a46c
2011-09-01 11:39:37 -07:00
Andreas Huber
67a041fa1f Guard the audio notifications with a separate lock to avoid deadlocks during reset.
Change-Id: I9a97372e1f777d1cbd6774cac2ed34b4b8cd9392
related-to-bug: 5179827
2011-09-01 11:39:11 -07:00
Svetoslav Ganov
6a13dd5544 Merge "Accessibility hover events are fired if hover otside of modal window." 2011-09-01 11:27:37 -07:00
Dianne Hackborn
0e60db221c Fix issue #4974633: Block the HOME button using TYPE_KEYGUARD
Applications shouldn't be able to change their window type after
the window is added to the window manager.

Change-Id: Iac63da65f96fb30683f68f8d89c3fd29199a750c
2011-09-01 11:17:57 -07:00
Mike Lockwood
6c79bcf351 Merge "Show back button in status bar when in an activity in front of the lockscreen." 2011-09-01 11:17:51 -07:00
Justin Ho
dbb6dde762 Remove all ringtones except default on Xoom
Bug: 5032006

Change-Id: Ia0f681237cad945ce94bbee2611203f083b2badc
2011-09-01 11:11:28 -07:00
Andreas Huber
7f5ea61b0f Merge "Signal an error when encountering a malformed .ts stream." 2011-09-01 11:11:10 -07:00
John Reck
39bb698cd2 Partial rollback of I9ebc92dc
Bug: 5239166
 Turns out nativeRecordButtons is necessary even if we are not
 using the native selection rings.

Change-Id: I8e7713928b77c0098640b51ce8e8815dad0c9545
2011-09-01 11:05:03 -07:00
Andreas Huber
d38ecf8ce0 Signal an error when encountering a malformed .ts stream.
Change-Id: I3ab0215419214b652573945403eb45eb09d41aff
related-to-bug: 5114811
2011-09-01 11:04:43 -07:00
Mike Lockwood
e3646dd8d9 Show back button in status bar when in an activity in front of the lockscreen.
When the lockscreen is up we still enable the home and recent app buttons,
but the back button is only enabled if the lockscreen is not obscured by other activities

Fixes problem escaping from the DeskClock app when the screen is locked.

Bug: 5206013

Change-Id: I68c9e4513018f51e2ee4fc11254e42ecbef834e4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-01 13:56:25 -04:00