OSDN Git Service
Wink Saville [Fri, 13 May 2011 16:20:08 +0000 (09:20 -0700)]
am
55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE
* commit '
55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
Add getLteOnCdamMode.
Wink Saville [Fri, 13 May 2011 16:09:43 +0000 (09:09 -0700)]
Merge "Add getLteOnCdamMode." into honeycomb-LTE
Dianne Hackborn [Fri, 13 May 2011 00:39:30 +0000 (17:39 -0700)]
am
d46849a5: am
a8138732: MR2 is going to be API 13.
* commit '
d46849a535ab64fd47fc8e9c557ca5f4da9e977b':
MR2 is going to be API 13.
Dianne Hackborn [Fri, 13 May 2011 00:39:22 +0000 (17:39 -0700)]
Irfan Sheriff [Fri, 13 May 2011 00:37:06 +0000 (17:37 -0700)]
am
2cd423a0: Merge commit \'
01ea7f01\' into manualmerge1
* commit '
2cd423a049aeeb0c07f7a556f3a6f701b504606f':
DO NOT MERGE Add DhcpStateMachine
Dianne Hackborn [Fri, 13 May 2011 00:35:35 +0000 (17:35 -0700)]
am
a8138732: MR2 is going to be API 13.
* commit '
a8138732a01b92f0a40f72050b74a3bd4cf6d215':
MR2 is going to be API 13.
Dianne Hackborn [Fri, 13 May 2011 00:35:20 +0000 (17:35 -0700)]
Irfan Sheriff [Fri, 13 May 2011 00:19:56 +0000 (17:19 -0700)]
Merge commit '
01ea7f01' into manualmerge1
Irfan Sheriff [Thu, 12 May 2011 23:02:43 +0000 (16:02 -0700)]
am
bb09485b: Merge commit \'
09564fbb\' into manualmerge
* commit '
bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
DO NOT MERGE Define Protocol class
Jean-Baptiste Queru [Thu, 12 May 2011 22:54:13 +0000 (15:54 -0700)]
am
2d7d3f78: (-s ours) am
f247e545: Merge "Adapt to latest skia"
* commit '
2d7d3f78c90734c8067ab76b8f5daca84a311c92':
Adapt to latest skia
Jean-Baptiste Queru [Thu, 12 May 2011 22:52:16 +0000 (15:52 -0700)]
am
a84d29cb: am
6714e677: Merge "Ninepatch tweaks for better interop"
* commit '
a84d29cb0494310e9472884c7a459603eb305e38':
Ninepatch tweaks for better interop
Jean-Baptiste Queru [Thu, 12 May 2011 22:52:12 +0000 (15:52 -0700)]
am
20fd3f0d: am
4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '
20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
Tweak audio APIs for better forward/backward/sideways compatibility.
Jean-Baptiste Queru [Thu, 12 May 2011 22:52:03 +0000 (15:52 -0700)]
am
e8b669cb: (-s ours) am
71d25778: Merge "Switch to SkSafeUnref for better portability"
* commit '
e8b669cbd7b690349c908ce6c9ce3b342139de04':
Switch to SkSafeUnref for better portability
Irfan Sheriff [Thu, 12 May 2011 22:47:28 +0000 (15:47 -0700)]
Merge commit '
09564fbb' into manualmerge
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:18 +0000 (15:38 -0700)]
am
f247e545: Merge "Adapt to latest skia"
* commit '
f247e545b521584bb778e79710c1e60ab814839e':
Adapt to latest skia
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:15 +0000 (15:38 -0700)]
am
6714e677: Merge "Ninepatch tweaks for better interop"
* commit '
6714e6774063aae7a8a7a80c36c89ec60170cb27':
Ninepatch tweaks for better interop
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:11 +0000 (15:38 -0700)]
am
4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '
4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
Tweak audio APIs for better forward/backward/sideways compatibility.
Jean-Baptiste Queru [Thu, 12 May 2011 22:38:07 +0000 (15:38 -0700)]
am
71d25778: Merge "Switch to SkSafeUnref for better portability"
* commit '
71d25778c61327bf82d0e81cd78175a9ee74420a':
Switch to SkSafeUnref for better portability
Jean-Baptiste Queru [Thu, 12 May 2011 22:09:51 +0000 (15:09 -0700)]
Merge "Adapt to latest skia"
Teng-Hui Zhu [Thu, 12 May 2011 22:05:29 +0000 (15:05 -0700)]
am
a0e661b4: am
c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit '
a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
Fix the Uri parsing issue
Dianne Hackborn [Thu, 12 May 2011 22:05:19 +0000 (15:05 -0700)]
am
97280816: am
0f1de9ad: New compat mode front end: UI and persistence.
* commit '
972808164adde6c0784e9c836d06219a9cf7eb7f':
New compat mode front end: UI and persistence.
Teng-Hui Zhu [Thu, 12 May 2011 22:01:56 +0000 (15:01 -0700)]
am
c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
* commit '
c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
Fix the Uri parsing issue
Dianne Hackborn [Thu, 12 May 2011 22:01:53 +0000 (15:01 -0700)]
am
0f1de9ad: New compat mode front end: UI and persistence.
* commit '
0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
New compat mode front end: UI and persistence.
Jean-Baptiste Queru [Thu, 12 May 2011 21:24:09 +0000 (14:24 -0700)]
Merge "Ninepatch tweaks for better interop"
Jean-Baptiste Queru [Thu, 12 May 2011 21:19:41 +0000 (14:19 -0700)]
Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
Jean-Baptiste Queru [Thu, 12 May 2011 21:19:26 +0000 (14:19 -0700)]
Merge "Switch to SkSafeUnref for better portability"
Irfan Sheriff [Thu, 12 May 2011 21:18:03 +0000 (14:18 -0700)]
Merge "DO NOT MERGE Add DhcpStateMachine" into honeycomb-mr2
Irfan Sheriff [Thu, 12 May 2011 21:17:51 +0000 (14:17 -0700)]
Merge "DO NOT MERGE Define Protocol class" into honeycomb-mr2
Teng-Hui Zhu [Thu, 12 May 2011 21:11:25 +0000 (14:11 -0700)]
Merge "Fix the Uri parsing issue" into honeycomb-mr2
Wink Saville [Thu, 12 May 2011 21:03:31 +0000 (14:03 -0700)]
am
76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit '
76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
Fix initialization of RouteInfo
Wink Saville [Thu, 12 May 2011 20:26:44 +0000 (13:26 -0700)]
Merge "Fix initialization of RouteInfo" into honeycomb-LTE
Irfan Sheriff [Wed, 11 May 2011 17:06:33 +0000 (10:06 -0700)]
am
aa1fd701: (-s ours) am
8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
* commit '
aa1fd70100d1af393c8d4ebe9cb36a8fa15a3633':
Move Wifi Ap configuration to flat file
Irfan Sheriff [Wed, 11 May 2011 16:45:36 +0000 (09:45 -0700)]
am
8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
* commit '
8dd85f80ba9c463f5616b47eceb620fe21203f4f':
Move Wifi Ap configuration to flat file
Irfan Sheriff [Wed, 11 May 2011 16:15:48 +0000 (09:15 -0700)]
Merge "Move Wifi Ap configuration to flat file" into gingerbread
Robert Ly [Wed, 11 May 2011 16:11:41 +0000 (09:11 -0700)]
am
65bab344: am
f3cdea93: am
a45e4f4d: doc change: adding link to pic board
* commit '
65bab344789b248cdc9334523e3b04f5a2c155b4':
doc change: adding link to pic board
Robert Ly [Wed, 11 May 2011 16:08:42 +0000 (09:08 -0700)]
am
f3cdea93: am
a45e4f4d: doc change: adding link to pic board
* commit '
f3cdea937b8b659f959d5e77f4a17f749f85c6ae':
doc change: adding link to pic board
Robert Ly [Wed, 11 May 2011 16:04:52 +0000 (09:04 -0700)]
am
a45e4f4d: doc change: adding link to pic board
* commit '
a45e4f4df59e4037408f6b9c0ddf4a7c57eaa273':
doc change: adding link to pic board
Wink Saville [Tue, 10 May 2011 23:31:36 +0000 (16:31 -0700)]
am
db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
* commit '
db08ff768b144c6ad8b326300d95c0c60e40f2eb':
Refactor IccRecords and IccCard
Wink Saville [Tue, 10 May 2011 23:28:33 +0000 (16:28 -0700)]
Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
Conley Owens [Tue, 10 May 2011 23:19:29 +0000 (16:19 -0700)]
am
87d86044: am
bcd029b6: Merge "Add missing clean-up of idmap file descriptors."
* commit '
87d86044c0f15ae2ffc0350271c76ff874fb413b':
Add missing clean-up of idmap file descriptors.
Jake Hamby [Tue, 10 May 2011 22:52:15 +0000 (15:52 -0700)]
resolved conflicts for merge of
18cc814c to honeycomb-plus-aosp
Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96
Eric Fischer [Tue, 10 May 2011 21:27:23 +0000 (14:27 -0700)]
am
98041f02: am
270fbfed: am
37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
98041f02b471b100056c3dc16e50f04a059f9a58':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 21:23:46 +0000 (14:23 -0700)]
am
270fbfed: am
37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
270fbfede58e4971588755adfa7e70e0de07b8cf':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 21:21:08 +0000 (14:21 -0700)]
am
37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
372592032a0e552ca30faadac9be823bd397910b':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 21:18:10 +0000 (14:18 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Tue, 10 May 2011 19:26:09 +0000 (12:26 -0700)]
am
affca8fa: am
f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
affca8fa11aa731cdc8b4b4f2b5478f182b9fbbf':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 19:21:32 +0000 (12:21 -0700)]
am
f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
f3bd663c67fe3aa3e8ec728e90f19e3fa50c3fbd':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 19:18:21 +0000 (12:18 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Joe Onorato [Tue, 10 May 2011 19:03:55 +0000 (12:03 -0700)]
am
37c077d3: am
81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2
* commit '
37c077d3dc32cd42c145072b671a6d53563b0156':
Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets.
Joe Onorato [Tue, 10 May 2011 19:01:40 +0000 (12:01 -0700)]
am
81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2
* commit '
81faa44c48911e4a63adaa1c92c5a40ea3c58ffb':
Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets.
Joe Onorato [Tue, 10 May 2011 18:59:42 +0000 (11:59 -0700)]
Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2
Robert Greenwalt [Tue, 10 May 2011 18:53:57 +0000 (11:53 -0700)]
am
e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
* commit '
e6848faceff58f84f671dbc73be08ef7890fea09':
Fix the adding of host routes.
Robert Greenwalt [Tue, 10 May 2011 18:51:36 +0000 (11:51 -0700)]
Merge "Fix the adding of host routes." into honeycomb-LTE
Dianne Hackborn [Tue, 10 May 2011 18:15:39 +0000 (11:15 -0700)]
am
652dbb7d: am
837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2
* commit '
652dbb7dca84ee3b350225cb38824fe3773af42b':
Fix scaling of batched motion events.
Dianne Hackborn [Tue, 10 May 2011 18:01:50 +0000 (11:01 -0700)]
am
837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2
* commit '
837bdc4919aedfea8c0ba492d964eb921d4e302d':
Fix scaling of batched motion events.
Dianne Hackborn [Tue, 10 May 2011 17:58:44 +0000 (10:58 -0700)]
Merge "Fix scaling of batched motion events." into honeycomb-mr2
Dirk Dougherty [Tue, 10 May 2011 07:46:26 +0000 (00:46 -0700)]
am
e4e8dffd: am
0d5196b9: am
5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
* commit '
e4e8dffd41c0f7aaf005418b71cae7738ad868d2':
Doc change: add Android 3.1 highlights and version notes.
Scott Main [Tue, 10 May 2011 07:46:21 +0000 (00:46 -0700)]
am
6b2c8f00: am
fef7b625: am
7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen fil
* commit '
6b2c8f00c95d05a8ca410ff74451fd0701f36119':
docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
Dirk Dougherty [Tue, 10 May 2011 07:37:02 +0000 (00:37 -0700)]
am
0d5196b9: am
5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
* commit '
0d5196b972044da44a844acd9cdffde9d5aa696d':
Doc change: add Android 3.1 highlights and version notes.
Scott Main [Tue, 10 May 2011 07:36:59 +0000 (00:36 -0700)]
am
fef7b625: am
7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and ad
* commit '
fef7b62506a74d0133b60fd1d6ae9bf54bf599c9':
docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
Dirk Dougherty [Tue, 10 May 2011 07:34:09 +0000 (00:34 -0700)]
am
5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
* commit '
5f8f0a0d40675bc4d373121ffdd22730f3701662':
Doc change: add Android 3.1 highlights and version notes.
Scott Main [Tue, 10 May 2011 07:34:06 +0000 (00:34 -0700)]
am
7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen supp
* commit '
7f3cf449fe1b90b902a37ddc3c05ec7aa236e584':
docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
Dirk Dougherty [Tue, 10 May 2011 05:58:37 +0000 (22:58 -0700)]
Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
Wink Saville [Tue, 10 May 2011 03:34:24 +0000 (20:34 -0700)]
am
eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE
* commit '
eb8da0fec2ea577f14e5c5c4dcca1eea0b8261fc':
Fix issue on infinite retry config in RetryManager
Wink Saville [Tue, 10 May 2011 03:32:34 +0000 (20:32 -0700)]
am
d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTE
* commit '
d237bcb241b2be8b2f3f3baed87fce973de00fa7':
Add unset and setOnIccRefresh.
Wink Saville [Tue, 10 May 2011 03:31:45 +0000 (20:31 -0700)]
Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE
Wink Saville [Tue, 10 May 2011 03:29:55 +0000 (20:29 -0700)]
Merge "Add unset and setOnIccRefresh." into honeycomb-LTE
Scott Main [Tue, 10 May 2011 01:32:10 +0000 (18:32 -0700)]
Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5" into honeycomb-mr1
Dianne Hackborn [Tue, 10 May 2011 00:10:34 +0000 (17:10 -0700)]
am
4907d1d5: am
0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2
* commit '
4907d1d5e2c7d244b07579b8c52153df69754e85':
Better compat mode part one: start scaling windows.
Dianne Hackborn [Tue, 10 May 2011 00:08:40 +0000 (17:08 -0700)]
am
0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2
* commit '
0c6cbf410a642f6e9cea7cca0a6e53a4a3cdd324':
Better compat mode part one: start scaling windows.
Dianne Hackborn [Tue, 10 May 2011 00:06:24 +0000 (17:06 -0700)]
Merge "Better compat mode part one: start scaling windows." into honeycomb-mr2
Dianne Hackborn [Wed, 27 Apr 2011 22:52:56 +0000 (18:52 -0400)]
Better compat mode part one: start scaling windows.
First step of improving app screen size compatibility mode. When
running in compat mode, an application's windows are scaled up on
the screen rather than being small with 1:1 pixels.
Currently we scale the application to fill the entire screen, so
don't use an even pixel scaling. Though this may have some
negative impact on the appearance (it looks okay to me), it has a
big benefit of allowing us to now treat these apps as normal
full-screens apps and do the normal transition animations as you
move in and out and around in them.
This introduces fun stuff in the input system to take care of
modifying pointer coordinates to account for the app window
surface scaling. The input dispatcher is told about the scale
that is being applied to each window and, when there is one,
adjusts pointer events appropriately as they are being sent
to the transport.
Also modified is CompatibilityInfo, which has been greatly
simplified to not be so insane and incomprehendible. It is
now simple -- when constructed it determines if the given app
is compatible with the current screen size and density, and
that is that.
There are new APIs on ActivityManagerService to put applications
that we would traditionally consider compatible with larger screens
in compatibility mode. This is the start of a facility to have
a UI affordance for a user to switch apps in and out of
compatibility.
To test switching of modes, there is a new variation of the "am"
command to do this: am screen-compat [on|off] [package]
This mode switching has the fundamentals of restarting activities
when it is changed, though the state still needs to be persisted
and the overall mode switch cleaned up.
For the few small apps I have tested, things mostly seem to be
working well. I know of one problem with the text selection
handles being drawn at the wrong position because at some point
the window offset is being scaled incorrectly. There are
probably other similar issues around the interaction between
two windows because the different window coordinate spaces are
done in a hacky way instead of being formally integrated into
the window manager layout process.
Change-Id: Ie038e3746b448135117bd860859d74e360938557
Wink Saville [Tue, 10 May 2011 00:02:07 +0000 (17:02 -0700)]
am
45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE
* commit '
45364dc4bfe3e6118ad61f1d38489fe63418699a':
Telephony: Signal Strength Changes.
Robert Greenwalt [Mon, 9 May 2011 23:58:52 +0000 (16:58 -0700)]
am
a142512a: Broadcast SIM Refresh to all registered components
* commit '
a142512a5009d7b4c422d23b1d7bab8d219eb50b':
Broadcast SIM Refresh to all registered components
Wink Saville [Mon, 9 May 2011 23:57:32 +0000 (16:57 -0700)]
Merge "Telephony: Signal Strength Changes." into honeycomb-LTE
Robert Ly [Mon, 9 May 2011 21:47:43 +0000 (14:47 -0700)]
am
5d032390: am
27944242: am
c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
* commit '
5d03239063d0c5148d920a0992da8974c6e0a8ce':
Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
Robert Ly [Mon, 9 May 2011 21:43:28 +0000 (14:43 -0700)]
am
27944242: am
c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
* commit '
279442428ab1000b57273f172453b712b03cb9fd':
Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
Robert Ly [Mon, 9 May 2011 21:41:00 +0000 (14:41 -0700)]
am
c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
* commit '
c3038308a765de2826997b65c175bf752b45bc70':
Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
Robert Ly [Mon, 9 May 2011 21:25:53 +0000 (14:25 -0700)]
Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
The Android Automerger [Mon, 9 May 2011 17:40:14 +0000 (10:40 -0700)]
am
44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* commit '
44e39d608cfddcbf56123480123822f26f20f259':
DO NOT MERGE Handle GET_POWER failures
DO NOT MERGE: Don't send pause again when coming back from full screen
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
DO NOT MERGE MTP: Implement GetThumb command
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
DO NOT MERGE Fix media scanner uri handling.
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
DO NOT MERGE MTP and media provider support for multiple storage devices:
DO NOT MERGE MountService: Fix running media scanner at boot.
DO NOT MERGE Fix deadlock in MountService
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
DO NOT MERGE MountService: Add support for multiple volumes
The Android Automerger [Mon, 9 May 2011 05:38:02 +0000 (22:38 -0700)]
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
The Android Automerger [Mon, 9 May 2011 05:11:52 +0000 (22:11 -0700)]
Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2
Scott Main [Sat, 7 May 2011 00:25:38 +0000 (17:25 -0700)]
am
5de8226c: am
5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
* commit '
5de8226cc7caea7a52d9f2538f87d2cc34214ad0':
docs: update sdk tools sums and sizes based on candidate 5
Scott Main [Sat, 7 May 2011 00:22:34 +0000 (17:22 -0700)]
am
5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
* commit '
5cf78ecd2c523be442f52888ca613b9a92325a6c':
docs: update sdk tools sums and sizes based on candidate 5
Scott Main [Sat, 7 May 2011 00:08:06 +0000 (17:08 -0700)]
am
71a73dab: am
b6451228: docs: update screens dashboard and add opengl dashboard
* commit '
71a73dab704df2c536bbd4c16454cdcdc472fce2':
docs: update screens dashboard and add opengl dashboard
Scott Main [Sat, 7 May 2011 00:05:42 +0000 (17:05 -0700)]
am
b6451228: docs: update screens dashboard and add opengl dashboard
* commit '
b6451228526288b158c3b0bf0c5abbd5b072d51c':
docs: update screens dashboard and add opengl dashboard
Robert Greenwalt [Fri, 6 May 2011 23:25:39 +0000 (16:25 -0700)]
am
2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
* commit '
2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe':
Fix 2 functions getting connections up by apnType
Robert Greenwalt [Fri, 6 May 2011 23:21:06 +0000 (16:21 -0700)]
Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
Robert Greenwalt [Fri, 6 May 2011 21:57:08 +0000 (14:57 -0700)]
am
2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE
* commit '
2499da83cb3db5f1d87a52e3e390139c98ff4210':
Mark a disable apn so we don't reconnect.
Robert Greenwalt [Fri, 6 May 2011 21:52:45 +0000 (14:52 -0700)]
Merge "Mark a disable apn so we don't reconnect." into honeycomb-LTE
Scott Main [Fri, 6 May 2011 17:09:04 +0000 (10:09 -0700)]
am
6c6b62e0: am
223a94d2: docs: de-new the dev guide toc
* commit '
6c6b62e04d1953916637be7fc96d83dde68da801':
docs: de-new the dev guide toc
Scott Main [Fri, 6 May 2011 17:05:56 +0000 (10:05 -0700)]
am
223a94d2: docs: de-new the dev guide toc
* commit '
223a94d2effd0ba9ef205d0bb790a5bdfb4d54c0':
docs: de-new the dev guide toc
Scott Main [Fri, 6 May 2011 15:50:50 +0000 (08:50 -0700)]
am
0d560d45: am
9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
* commit '
0d560d454b88d52a3b48cbc3c3be27e563b7f098':
docs: add package description for mtp and a little more info to MtpDevice
Scott Main [Fri, 6 May 2011 15:41:57 +0000 (08:41 -0700)]
am
9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
* commit '
9f7054fea28e65ae1bf8bc1114090306979ba657':
docs: add package description for mtp and a little more info to MtpDevice
Scott Main [Fri, 6 May 2011 15:31:40 +0000 (08:31 -0700)]
Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
Scott Main [Fri, 6 May 2011 01:36:59 +0000 (18:36 -0700)]
am
8ce58e50: am
f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1
* commit '
8ce58e5062288c95887bd56fc959527814052b56':
docs: version notes for tools 11
Scott Main [Fri, 6 May 2011 01:34:42 +0000 (18:34 -0700)]
am
f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1
* commit '
f88b52fbf693d8b17e57a9d2fdda5a29e1bfa8d9':
docs: version notes for tools 11
Scott Main [Fri, 6 May 2011 01:32:42 +0000 (18:32 -0700)]
Merge "docs: version notes for tools 11" into honeycomb-mr1
Scott Main [Fri, 6 May 2011 01:02:47 +0000 (18:02 -0700)]
am
a7a9c4cb: am
46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1
* commit '
a7a9c4cbbc2315a59ad27b43c83c66e272dcc2f2':
docs: add package description for RTP
Scott Main [Fri, 6 May 2011 01:00:57 +0000 (18:00 -0700)]
am
46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1
* commit '
46524f83a55731cd96c9df8a87be6dacb1db1a37':
docs: add package description for RTP