OSDN Git Service

android-x86/frameworks-native.git
13 years agoMerge "Fix setDataSource(Context, Uri, Map<String,String> headers)"
James Dong [Thu, 12 May 2011 00:52:32 +0000 (17:52 -0700)]
Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)"

13 years agoMerge "Update Calendars table to v300"
RoboErik [Wed, 11 May 2011 23:47:17 +0000 (16:47 -0700)]
Merge "Update Calendars table to v300"

13 years agoMerge "Add ROOT_ID to Accounts column"
John Reck [Wed, 11 May 2011 23:12:00 +0000 (16:12 -0700)]
Merge "Add ROOT_ID to Accounts column"

13 years agoMerge "Expose the track informational event for testing"
James Dong [Wed, 11 May 2011 22:59:29 +0000 (15:59 -0700)]
Merge "Expose the track informational event for testing"

13 years agoMerge "fix libagl surface initialization"
Mathias Agopian [Wed, 11 May 2011 20:43:04 +0000 (13:43 -0700)]
Merge "fix libagl surface initialization"

13 years agofix libagl surface initialization
Mathias Agopian [Wed, 11 May 2011 20:41:09 +0000 (13:41 -0700)]
fix libagl surface initialization

this broke recently when removing copybit support.

Change-Id: I5cc7ff7f49268411c6c2cfb2d97590d52b13dbd5

13 years agoam f450fd6a: am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration...
Irfan Sheriff [Wed, 11 May 2011 20:12:19 +0000 (13:12 -0700)]
am f450fd6a: am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread

* commit 'f450fd6af61248b90ddb9ed0bb9780c0d3378029':
  Move Wifi Ap configuration to flat file

13 years agoam 9d93c9c4: am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic...
Robert Ly [Wed, 11 May 2011 20:12:16 +0000 (13:12 -0700)]
am 9d93c9c4: am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board

* commit '9d93c9c4d761aa25fb61988bf40a900a18de79ae':
  doc change: adding link to pic board

13 years agoam e86dbac5: am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
Wink Saville [Wed, 11 May 2011 20:11:17 +0000 (13:11 -0700)]
am e86dbac5: am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE

* commit 'e86dbac583f442e37bfaa95f9427f491b62d53f3':
  Refactor IccRecords and IccCard

13 years agoam 041aa34e: am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file...
Conley Owens [Wed, 11 May 2011 20:10:56 +0000 (13:10 -0700)]
am 041aa34e: am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."

* commit '041aa34e089d7b194a5d93c682c3af3d3116d3f3':
  Add missing clean-up of idmap file descriptors.

13 years agoam ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
Jake Hamby [Wed, 11 May 2011 20:09:42 +0000 (13:09 -0700)]
am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

* commit 'ee60f3fb1b4e61ac8027293a658ba710e36d36b6':
  Enable support for SMS national language shift tables.

13 years agoam 6819c677: (-s ours) am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import...
Eric Fischer [Wed, 11 May 2011 20:09:13 +0000 (13:09 -0700)]
am 6819c677: (-s ours) am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '6819c677b9d8d9a5f60f1a35e045300b1a8aec96':
  Import revised translations.  DO NOT MERGE

13 years agoam ca43ef6b: (-s ours) am affca8fa: am f3bd663c: Merge "Import revised translations...
Eric Fischer [Wed, 11 May 2011 20:08:50 +0000 (13:08 -0700)]
am ca43ef6b: (-s ours) am affca8fa: am f3bd663c: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr2

* commit 'ca43ef6bc7ea52efb17718017e1f883e33504c05':
  Import revised translations.  DO NOT MERGE

13 years agoam 0fe56853: am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui...
Joe Onorato [Wed, 11 May 2011 20:07:55 +0000 (13:07 -0700)]
am 0fe56853: 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 '0fe56853fd88c34aba37b04be256a0e51c1bbff7':
  Move / copy some framework and systemui resources from xlarge to large.  The status bar now comes up on large tablets.

13 years agoam 441bc9a6: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
Robert Greenwalt [Wed, 11 May 2011 20:07:38 +0000 (13:07 -0700)]
am 441bc9a6: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE

* commit '441bc9a6f41ca1678a6c965bec7e2f18227ac100':
  Fix the adding of host routes.

13 years agoMerge "Full local backup infrastructure"
Christopher Tate [Wed, 11 May 2011 19:51:31 +0000 (12:51 -0700)]
Merge "Full local backup infrastructure"

13 years agoMerge "resolved conflicts for merge of 037b54cf to master"
Dianne Hackborn [Wed, 11 May 2011 19:50:39 +0000 (12:50 -0700)]
Merge "resolved conflicts for merge of 037b54cf to master"

13 years agoresolved conflicts for merge of 037b54cf to master
Dianne Hackborn [Wed, 11 May 2011 17:59:54 +0000 (10:59 -0700)]
resolved conflicts for merge of 037b54cf to master

Change-Id: I1bc2827596a349963d8aa2b63b3f7801f155668a

13 years agoam aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat file...
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

13 years agoam 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
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

13 years agoMerge changes I21e9629e,I535ed3ba
Daniel Sandler [Wed, 11 May 2011 16:31:08 +0000 (09:31 -0700)]
Merge changes I21e9629e,I535ed3ba

* changes:
  Create an XML config flag to turn the navbar off.
  It's lights out for you, navigation bar!

13 years agoMerge "Move Wifi Ap configuration to flat file" into gingerbread
Irfan Sheriff [Wed, 11 May 2011 16:15:48 +0000 (09:15 -0700)]
Merge "Move Wifi Ap configuration to flat file" into gingerbread

13 years agoam 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board
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

13 years agoam f3cdea93: am a45e4f4d: 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

13 years agoam a45e4f4d: 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

13 years agoMerge "Leave the number of output buffers up to surface flinger and friends."
Andreas Huber [Wed, 11 May 2011 15:11:11 +0000 (08:11 -0700)]
Merge "Leave the number of output buffers up to surface flinger and friends."

13 years agoMerge "Make sure the ogg extractor returns appropriate error codes."
Andreas Huber [Wed, 11 May 2011 15:10:42 +0000 (08:10 -0700)]
Merge "Make sure the ogg extractor returns appropriate error codes."

13 years agoMerge "add more logging into DRT"
Guang Zhu [Wed, 11 May 2011 02:15:58 +0000 (19:15 -0700)]
Merge "add more logging into DRT"

13 years agoFull local backup infrastructure
Christopher Tate [Fri, 1 Apr 2011 21:43:32 +0000 (14:43 -0700)]
Full local backup infrastructure

This is the basic infrastructure for pulling a full(*) backup of the
device's data over an adb(**) connection to the local device.  The
basic process consists of these interacting pieces:

1. The framework's BackupManagerService, which coordinates the
   collection of app data and routing to the destination.

2. A new framework-provided BackupAgent implementation called
   FullBackupAgent, which is instantiated in the target applications'
   processes in turn, and knows how to emit a datastream that contains
   all of the app's saved data files.

3. A new shell-level program called "bu" that is used to bridge from
   adb to the framework's Backup Manager.

4. adb itself, which now knows how to use 'bu' to kick off a backup
   operation and pull the resulting data stream to the desktop host.

5. A system-provided application that verifies with the user that
   an attempted backup/restore operation is in fact expected and to
   be allowed.

The full agent implementation is not used during normal operation of
the delta-based app-customized remote backup process.  Instead it's
used during user-confirmed *full* backup of applications and all their
data to a local destination, e.g. via the adb connection.

The output format is 'tar'.  This makes it very easy for the end
user to examine the resulting dataset, e.g. for purpose of extracting
files for debug purposes; as well as making it easy to contemplate
adding things like a direct gzip stage to the data pipeline during
backup/restore.  It also makes it convenient to construct and maintain
synthetic backup datasets for testing purposes.

Within the tar format, certain artificial conventions are used.
All files are stored within top-level directories according to
their semantic origin:

apps/pkgname/a/  : Application .apk file itself
apps/pkgname/obb/: The application's associated .obb containers
apps/pkgname/f/  : The subtree rooted at the getFilesDir() location
apps/pkgname/db/ : The subtree rooted at the getDatabasePath() parent
apps/pkgname/sp/ : The subtree rooted at the getSharedPrefsFile() parent
apps/pkgname/r/  : Files stored relative to the root of the app's file tree
apps/pkgname/c/  : Reserved for the app's getCacheDir() tree; not stored.

For each package, the first entry in the tar stream is a file called
"_manifest", nominally rooted at apps/pkgname.  This file contains some
metadata about the package whose data is stored in the archive.

The contents of shared storage can optionally be included in the tar
stream. It is placed in the synthetic location:

shared/...

uid/gid are ignored; app uids are assigned at install time, and the
app's data is handled from within its own execution environment, so
will automatically have the app's correct uid.

Forward-locked .apk files are never backed up.  System-partition
.apk files are not backed up unless they have been overridden by a
post-factory upgrade, in which case the current .apk *is* backed up --
i.e. the .apk that matches the on-disk data.  The manifest preceding
each application's portion of the tar stream provides version numbers
and signature blocks for version checking, as well as an indication
of whether the restore logic should expect to install the .apk before
extracting the data.

System packages can designate their own full backup agents.  This is
to manage things like the settings provider which (a) cannot be shut
down on the fly in order to do a clean snapshot of their file trees,
and (b) manage data that is not only irrelevant but actively hostile
to non-identical devices -- CDMA telephony settings would seriously
mess up a GSM device if emplaced there blind, for example.

When a full backup or restore is initiated from adb, the system will
present a confirmation UI that the user must explicitly respond to
within a short [~ 30 seconds] timeout.  This is to avoid the
possibility of malicious desktop-side software secretly grabbing a copy
of all the user's data for nefarious purposes.

(*) The backup is not strictly a full mirror.  In particular, the
    settings database is not cloned; it is handled the same way that
    it is in cloud backup/restore.  This is because some settings
    are actively destructive if cloned onto a different (or
    especially a different-model) device: telephony settings and
    AndroidID are good examples of this.

(**) On the framework side it doesn't care that it's adb; it just
    sends the tar stream to a file descriptor.  This can easily be
    retargeted around whatever transport we might decide to use
    in the future.

KNOWN ISSUES:

* the security UI is desperately ugly; no proper designs have yet
  been done for it
* restore is not yet implemented
* shared storage backup is not yet implemented
* symlinks aren't yet handled, though some infrastructure for
  dealing with them has been put in place.

Change-Id: Ia8347611e23b398af36ea22c36dff0a276b1ce91

13 years agoMerge "Remove an unnecessary word from javadoc"
Daisuke Miyakawa [Wed, 11 May 2011 00:41:44 +0000 (17:41 -0700)]
Merge "Remove an unnecessary word from javadoc"

13 years agoMerge "Add code for generating fifo command packing."
Jason Sams [Tue, 10 May 2011 23:46:35 +0000 (16:46 -0700)]
Merge "Add code for generating fifo command packing."

13 years agoam db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
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

13 years agoMerge "Refactor IccRecords and IccCard" into honeycomb-LTE
Wink Saville [Tue, 10 May 2011 23:28:33 +0000 (16:28 -0700)]
Merge "Refactor IccRecords and IccCard" into honeycomb-LTE

13 years agoam 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."
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.

13 years agoresolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
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

13 years agoMerge "Use canonical paths to compare library directory with data directory."
Amith Yamasani [Tue, 10 May 2011 22:36:45 +0000 (15:36 -0700)]
Merge "Use canonical paths to compare library directory with data directory."

13 years agoam 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations...
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

13 years agoam 270fbfed: am 37259203: (-s ours) Merge "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

13 years agoam 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeyc...
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

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Eric Fischer [Tue, 10 May 2011 21:18:10 +0000 (14:18 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

13 years agoMerge "Properly honour any pending seek request when reading the first buffer after"
Andreas Huber [Tue, 10 May 2011 21:12:06 +0000 (14:12 -0700)]
Merge "Properly honour any pending seek request when reading the first buffer after"

13 years agoam affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into...
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

13 years agoam f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
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

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Eric Fischer [Tue, 10 May 2011 19:18:21 +0000 (12:18 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr2

13 years agoam 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui resources...
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.

13 years agoam 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge...
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.

13 years agoMerge "Move / copy some framework and systemui resources from xlarge to large. The...
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

13 years agoam e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
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.

13 years agoMerge "Fix the adding of host routes." into honeycomb-LTE
Robert Greenwalt [Tue, 10 May 2011 18:51:36 +0000 (11:51 -0700)]
Merge "Fix the adding of host routes." into honeycomb-LTE

13 years agoam 63c5a2bc: am e4e8dffd: am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android...
Dirk Dougherty [Tue, 10 May 2011 18:15:54 +0000 (11:15 -0700)]
am 63c5a2bc: am e4e8dffd: am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1

* commit '63c5a2bc39839804442ba2800b6d974d0391f2cc':
  Doc change: add Android 3.1 highlights and version notes.

13 years agoam 315595d1: am 6b2c8f00: am fef7b625: am 7f3cf449: Merge "docs: update screen suppor...
Scott Main [Tue, 10 May 2011 18:15:51 +0000 (11:15 -0700)]
am 315595d1: 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 enab

* commit '315595d10dfd4b8fe32cfe45a53f9e342bf0a699':
  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

13 years agoam 652dbb7d: am 837bdc49: Merge "Fix scaling of batched motion events." into honeycom...
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.

13 years agoam d649887a: am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager...
Wink Saville [Tue, 10 May 2011 18:15:25 +0000 (11:15 -0700)]
am d649887a: am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE

* commit 'd649887a43efb435f1ea2255c364d8c214552aef':
  Fix issue on infinite retry config in RetryManager

13 years agoam d1736a3d: am d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTE
Wink Saville [Tue, 10 May 2011 18:14:51 +0000 (11:14 -0700)]
am d1736a3d: am d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTE

* commit 'd1736a3ddae04f5cbe4ebc0ba31e605b6bdae72c':
  Add unset and setOnIccRefresh.

13 years agoam 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2
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.

13 years agoMerge "resolved conflicts for merge of 05be6d6f to master"
Dianne Hackborn [Tue, 10 May 2011 17:59:29 +0000 (10:59 -0700)]
Merge "resolved conflicts for merge of 05be6d6f to master"

13 years agoMerge "Fix scaling of batched motion events." into honeycomb-mr2
Dianne Hackborn [Tue, 10 May 2011 17:58:44 +0000 (10:58 -0700)]
Merge "Fix scaling of batched motion events." into honeycomb-mr2

13 years agoMerge "Deprecating webkit API's that might not be supported in the future"
Kristian Monsen [Tue, 10 May 2011 17:57:52 +0000 (10:57 -0700)]
Merge "Deprecating webkit API's that might not be supported in the future"

13 years agoMerge "Add unset and setOnIccRefresh."
Wink Saville [Tue, 10 May 2011 17:25:46 +0000 (10:25 -0700)]
Merge "Add unset and setOnIccRefresh."

13 years agoam e4e8dffd: am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights...
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.

13 years agoam 6b2c8f00: am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to...
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

13 years agoam 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version...
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.

13 years agoam fef7b625: am 7f3cf449: Merge "docs: update screen support doc to de-emphasize...
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

13 years agoam 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into...
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.

13 years agoam 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1...
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

13 years agoMerge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1
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

13 years agoam eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycom...
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

13 years agoam d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTE
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.

13 years agoMerge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE
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

13 years agoMerge "Add unset and setOnIccRefresh." into honeycomb-LTE
Wink Saville [Tue, 10 May 2011 03:29:55 +0000 (20:29 -0700)]
Merge "Add unset and setOnIccRefresh." into honeycomb-LTE

13 years agoresolved conflicts for merge of 05be6d6f to master
Dianne Hackborn [Tue, 10 May 2011 02:00:59 +0000 (19:00 -0700)]
resolved conflicts for merge of 05be6d6f to master

Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212

13 years agoMerge "docs: update screen support doc to de-emphasize support for 1.5 this includes...
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

13 years agoMerge "Add send session recording summary report to application"
James Dong [Tue, 10 May 2011 00:47:09 +0000 (17:47 -0700)]
Merge "Add send session recording summary report to application"

13 years agoam 4907d1d5: am 0c6cbf41: Merge "Better compat mode part one: start scaling windows...
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.

13 years agoam 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into honeyco...
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.

13 years agoMerge "Better compat mode part one: start scaling windows." into honeycomb-mr2
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

13 years agoam ba54feb0: am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE
Wink Saville [Tue, 10 May 2011 00:04:57 +0000 (17:04 -0700)]
am ba54feb0: am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE

* commit 'ba54feb094fdf0eb2201eae5751104a144a2a31d':
  Telephony: Signal Strength Changes.

13 years agoBetter compat mode part one: start scaling windows.
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

13 years agoam b98b56c2: am a142512a: Broadcast SIM Refresh to all registered components
Robert Greenwalt [Tue, 10 May 2011 00:02:28 +0000 (17:02 -0700)]
am b98b56c2: am a142512a: Broadcast SIM Refresh to all registered components

* commit 'b98b56c21faac16cea97e8cdcba485365f86c50f':
  Broadcast SIM Refresh to all registered components

13 years agoam 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE
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.

13 years agoam a142512a: Broadcast SIM Refresh to all registered components
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

13 years agoMerge "Telephony: Signal Strength Changes." into honeycomb-LTE
Wink Saville [Mon, 9 May 2011 23:57:32 +0000 (16:57 -0700)]
Merge "Telephony: Signal Strength Changes." into honeycomb-LTE

13 years agoam a3838018: am 5d032390: am 27944242: am c3038308: Merge "Doc change: adding ADK...
Robert Ly [Mon, 9 May 2011 21:52:16 +0000 (14:52 -0700)]
am a3838018: 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 'a38380183329912a9d79a84ad5265c6c9dbef434':
  Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package

13 years agoMerge "Fix mode."
Marco Nelissen [Mon, 9 May 2011 21:49:36 +0000 (14:49 -0700)]
Merge "Fix mode."

13 years agoam 5d032390: am 27944242: am c3038308: Merge "Doc change: adding ADK doc. still need...
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

13 years agoam 27944242: am c3038308: Merge "Doc change: adding ADK doc. still need to add the...
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

13 years agoam c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg downloa...
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

13 years agoMerge "Doc change: adding ADK doc. still need to add the adk pkg download link when...
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

13 years agoMerge "When using O_CREAT, the mode should be specified."
Marco Nelissen [Mon, 9 May 2011 20:03:43 +0000 (13:03 -0700)]
Merge "When using O_CREAT, the mode should be specified."

13 years agoMerge "Refactor MPEG4Writer::writeTrackHeader() method"
James Dong [Mon, 9 May 2011 18:27:51 +0000 (11:27 -0700)]
Merge "Refactor MPEG4Writer::writeTrackHeader() method"

13 years agoam bdaa3abd: (-s ours) am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into...
The Android Automerger [Mon, 9 May 2011 17:53:40 +0000 (10:53 -0700)]
am bdaa3abd: (-s ours) am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE

* commit 'bdaa3abdf264372f337cfa9236e53b1e3cfde525':
  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

13 years agoam 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
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

13 years agoMerge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
The Android Automerger [Mon, 9 May 2011 05:38:02 +0000 (22:38 -0700)]
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE

13 years agoMerge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2
The Android Automerger [Mon, 9 May 2011 05:11:52 +0000 (22:11 -0700)]
Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2

13 years agoMerge "clear boot-animation background with black (not transparent) pixels"
Mathias Agopian [Sat, 7 May 2011 02:23:16 +0000 (19:23 -0700)]
Merge "clear boot-animation background with black (not transparent) pixels"

13 years agoam 5033d2b5: am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based...
Scott Main [Sat, 7 May 2011 00:27:39 +0000 (17:27 -0700)]
am 5033d2b5: am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5

* commit '5033d2b5287c48ac46a368ea85f080cfba0ccc8d':
  docs: update sdk tools sums and sizes based on candidate 5

13 years agoam 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
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

13 years agoam 5cf78ecd: 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

13 years agoam dcb6bd62: am 71a73dab: am b6451228: docs: update screens dashboard and add opengl...
Scott Main [Sat, 7 May 2011 00:10:58 +0000 (17:10 -0700)]
am dcb6bd62: am 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard

* commit 'dcb6bd62cd4d7874d17a4f1b47b343dd88c4546a':
  docs: update screens dashboard and add opengl dashboard

13 years agoam 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard
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