Commit Graph

38903 Commits

Author SHA1 Message Date
Gilles Debunne
8cfaaa7919 Rescaled/updated mdpi assets added.
Change-Id: Ifd179b6850e04a785aef588c2f0f4fd80fc5c8fe
2010-11-01 17:01:56 -07:00
Neal Nguyen
bd06f02d02 Cleaning up some more flakiness in DownloadManager tests.
A couple of logic fixes (synchronization, poll time), and adding a little more test
logging info.

Change-Id: I8da71f87fd1e211913f84ec517762dca81f87292
2010-11-01 17:00:17 -07:00
Nicolas Roard
7d0414885e Merge "Update layers only" 2010-11-01 16:58:01 -07:00
Chet Haase
c9acd7d2f0 Merge "Fixed null deref when view parent null during invalidation" 2010-11-01 16:56:15 -07:00
Nicolas Roard
fb7bc34b23 Update layers only
Java counterpart to https://android-git.corp.google.com/g/#change,77334

Bug:2975990

Change-Id: I428944c30cedddc47a2c4f8c772167dd4ce2a78d
2010-11-01 16:55:41 -07:00
Chet Haase
ea40e9abb0 Fixed null deref when view parent null during invalidation
Change-Id: I4896b4af69f3a44351465e7524dd7b621050b415
2010-11-01 16:54:22 -07:00
Jamie Gennis
044ace6bde Stop using OMX_COLOR_FormatAndroidPrivateStart.
This removes the use (and definition) of the Android-private range of
OMX color formats from Stagefright.  Instead we will just be
interpreting the video color format of an OMX port as an Android pixel
format if the port is in native buffer mode.

Change-Id: I3ea50703336a88249e7563bc7022dfedbeac506e
2010-11-01 16:54:01 -07:00
Joe Malin
3521e2202d am ea8400b4: (-s ours) am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
* commit 'ea8400b448a01e417e583ef554fc2b3f3072deec':
  DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
2010-11-01 16:33:56 -07:00
Joe Malin
ea8400b448 am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
* commit 'a7fda21c8298d8f316564280d702206147207005':
  DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
2010-11-01 16:30:59 -07:00
Andreas Huber
df75f8b319 Merge "Notify surfaceflinger about (changes to) the crop rectangle output by the decoder." 2010-11-01 16:25:08 -07:00
Mike Lockwood
1d8479fa95 Merge "MTP: Changes to support /mnt/sdcard paths from MediaProvider." 2010-11-01 16:18:29 -07:00
Xavier Ducrohet
78fe94f9ba Merge "Layoutlib Canvas and Paint implementation through native delegates" 2010-11-01 16:17:06 -07:00
Mike Lockwood
2b5f9ad1ea MTP: Changes to support /mnt/sdcard paths from MediaProvider.
Change-Id: I337f0514c20ed31738c73e1f7ab6fb71cc744057
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-01 19:15:55 -04:00
Jason Sams
7d5411fd3f Merge "Fix race condition in resize that was created when GetType for allocation and Types became async." 2010-11-01 16:13:55 -07:00
Joe Malin
a7fda21c82 DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
Change-Id: I049c5f70c47077c51fefbae32633592e80068df2
2010-11-01 16:12:54 -07:00
Dan Bornstein
30ce36ec70 am ab1b304b: am ccb75a88: Merge "Update the API file." into gingerbread
* commit 'ab1b304bd4cf0bb6473b21d5604596105b794362':
  Update the API file.
2010-11-01 16:12:38 -07:00
Gloria Wang
eab18ea34d - Move the business rule management down to DRM agents.
- Do not register DRM sniffer because drmserver is not enabled.

Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
2010-11-01 16:12:16 -07:00
Dan Bornstein
ab1b304bd4 am ccb75a88: Merge "Update the API file." into gingerbread
* commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3':
  Update the API file.
2010-11-01 16:09:44 -07:00
Jason Sams
d26297fa56 Fix race condition in resize that was created when
GetType for allocation and Types became async.

Change-Id: Ie7036f9481cececf9565d30b25be82480f176ff2
2010-11-01 16:08:59 -07:00
Dan Bornstein
ccb75a882f Merge "Update the API file." into gingerbread 2010-11-01 16:08:14 -07:00
Joe Malin
1b6334b8bd Merge "Doc Change: Documentation for MonkeyRunner tool" 2010-11-01 16:06:19 -07:00
Takeshi Aimi
c7b3ccc564 Update of DRM framework
- Overload openDecryptSession() with uri parameter
   in order to accept URI of DRM content,
   Following API is added,
       DecryptHandle*openDecryptSession(const char* uri);.
 - Unify texisting three event types of processDrmInfo()
   so that caller of DRM framework does not have to handle many event types.
 - Let DrmManagerService call load/unload plugins API so that
   client of DRM framework does not have to manage plug-in load/unload.
 - Trivial fix in DrmManagerClient.java is also incorporated.

Changes are made by Sony Corporation.

Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
2010-11-02 08:06:06 +09:00
Scott Main
6034ae6b97 am e06bdead: am fea07c60: am eda78cea: docs: update dashboard
* commit 'e06bdead5decc26c7fd7ed9b10ad0f009e14d274':
  docs: update dashboard
2010-11-01 16:03:14 -07:00
Andreas Huber
5145d67e77 Notify surfaceflinger about (changes to) the crop rectangle output by the decoder.
Change-Id: I9c33618dd3351be1ecadcc7d0329654ea50bad3f
related-to-bug: 3153626
2010-11-01 16:01:05 -07:00
Scott Main
e06bdead5d am fea07c60: am eda78cea: docs: update dashboard
* commit 'fea07c60963abc5caaf5a59b99936d79aa9fc1b9':
  docs: update dashboard
2010-11-01 16:00:43 -07:00
Gloria Wang
f0be6aa771 Merge "Media scanner support for FL(Forward Lock) DRM file types" 2010-11-01 15:57:47 -07:00
Scott Main
fea07c6096 am eda78cea: docs: update dashboard
* commit 'eda78ceaffb234c37b11e69602d020e4bb28ca83':
  docs: update dashboard
2010-11-01 15:57:38 -07:00
Chris Tate
e833710e68 Merge "Don't crash bmgr if there are no available restore sets" 2010-11-01 15:53:45 -07:00
Chris Tate
7a0fc87767 Don't crash bmgr if there are no available restore sets
Properly guard against a null set of available restore sets when
validating the token passed to 'bmgr restore TOKEN' against what's
known to exist on the backend.

Fixes bug 3153986

Change-Id: I74bdd4c6242f682833c1633baa4fefccb2b165a7
2010-11-01 15:50:35 -07:00
Leon Scroggins
03476ddba6 Merge "Merge commit '55381217' into manualmerge" 2010-11-01 15:16:24 -07:00
Jeff Brown
fe17625238 Merge "Fix policy issues when screen is off." 2010-11-01 15:13:10 -07:00
Jason Sams
d238beb395 Merge "Add code to mark functions rather than whole files as threadable." 2010-11-01 15:10:09 -07:00
Scott Main
eda78ceaff docs: update dashboard
Change-Id: Icf0c2076484f4aed2d3bf3fc24b751e14eeeafe1
2010-11-01 15:10:06 -07:00
Jaikumar Ganesh
153541e906 Merge "Disconnect PAN and Input devices on BT disable." 2010-11-01 15:06:05 -07:00
Jaikumar Ganesh
7a0f816916 Disconnect PAN and Input devices on BT disable.
Also, add a missing break.

Change-Id: I228f80a4223de20e60d2f3828e3f63bdc14f5afc
2010-11-01 15:04:06 -07:00
Adam Powell
2c3c7dc45d Merge "Fix a find and replace bug in Theme.IconMenu" 2010-11-01 15:02:13 -07:00
Leon Scroggins
c826a69355 Merge commit '55381217' into manualmerge
Conflicts:
	core/java/android/webkit/WebView.java

Change-Id: I1e93881a55c1d81c1142db03498c68196649b69c
2010-11-01 18:00:55 -04:00
Adam Powell
86d45adbd7 Fix a find and replace bug in Theme.IconMenu
Change-Id: I61d435b4d9b31e5bf0c04c21f5af81930a7731b0
2010-11-01 15:00:50 -07:00
Jeff Brown
4d396052de Fix policy issues when screen is off.
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
  is not showing (the proximity sensor turned off the screen).
  Previously we passed all non-wake keys through in this case which
  caused a bug on Crespo where the screen would come back on if a soft key
  was held at the time of power off because the resulting key up event
  would sneak in just before the keyguard was shown.  It would then be
  passed through to the dispatcher which would poke user activity and
  wake up the screen.
- We propagate the key flags when broadcasting media keys which
  ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).

Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.

Changed the lock screen so that it does not poke the wake lock when the
grab handle is released.  This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.

Fixed a couple of issues where media keys were being handled inconsistently
or not at all, particularly in the case of the new PAUSE, PLAY
and RECORD keys.

Bug: 3144874
Change-Id: Ie630f5fb6f128cfdf94845f9428067045f42892c
2010-11-01 15:00:25 -07:00
Dianne Hackborn
487d958663 Merge "Various PreferenceActivity and related improvement." 2010-11-01 14:54:32 -07:00
Leon Scroggins
553812178a am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread
* commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
  Update insertion handler for WebTextView.
2010-11-01 14:51:00 -07:00
Winson Chung
ae61598131 Adding more exception handling to RemoteViews calls to startIntentSender
Change-Id: I03d7b48813aaf7f94785389c2838d68b0ba913d3
2010-11-01 14:50:20 -07:00
Leon Scroggins
3073646f61 Merge "Update insertion handler for WebTextView." into gingerbread 2010-11-01 14:49:47 -07:00
Dianne Hackborn
8eb2e244f9 Various PreferenceActivity and related improvement.
This is all about making the preferences implementation better.

Well, mostly all about that.

Change-Id: I8efa98cb5680f3ccfa3ed694a1586de3fb3a9e11
2010-11-01 14:48:34 -07:00
Wink Saville
58954d299c Merge "Add PhoneStateListener.onOtaspChanged." 2010-11-01 14:47:38 -07:00
Jason Sams
5060309f4c Merge "Remove excessive logging." 2010-11-01 14:28:57 -07:00
Jason Sams
8f0adba7cb Add code to mark functions rather than whole files as threadable.
Change-Id: Ie635fbbb96b8ade48501ec564fe135edc256537d
2010-11-01 14:26:30 -07:00
Vasu Nori
71b8c23e56 add NOTIFICATION_CLICK_ constants to DownloadManager
DownloadReceive in packages/providers/Downloadproviders sends intents
when notification messages are clicked on.
When using public API of DM, added code to include download entry ids
to the above intents. The constants added here support that code.
intents when

Change-Id: Ibe53ccd9934c73175459e42e3d417eee69ae6735
2010-11-01 14:21:08 -07:00
Dan Bornstein
bc19c7bdc0 Update the API file.
My previous change was api-compatible, but some of the incidental data
in the API file (like parameter names) changed. It looks like there
were probably a couple other similar changes too, that hadn't
previously been propagated to the API file; all I did to generate this
change was say "make update-api".

Change-Id: I427a9ceb51212fde515df007613b8687b7228ce7
2010-11-01 14:14:37 -07:00
Daniel Trebbien
38767b34ba Reorder lock acquision vs try.
In two places involving locking, reordered the code so that the lock
acquisition is performed outside of the `try` block and everything
else that needs to run while the lock is locked *within* the `try`
block.

Change-Id: I3dad2c4bbf60b219fc6db2aa35e2ed296cb39128
2010-11-01 14:13:56 -07:00