50138 Commits

Author SHA1 Message Date
Mathias Agopian
7f3289c95e Add SurfaceTexture logging
Change-Id: If1b74be5230813fb76429935d88b9d4a7c41700c
2011-05-11 18:01:51 -07:00
Mathias Agopian
402ff24aa1 Implement {Surface|SurfaceTextureClient}::setSwapInterval()
Change-Id: I8382e346ddaa2c4c8ff56ac3ffd7f0109572f188
2011-05-11 18:01:51 -07:00
Mathias Agopian
a6b717b52a new tests for SurfaceTexture synchronous mode
Change-Id: Icfdaa625238246f8d0224efe28fdf2c1c24203f8
2011-05-11 18:01:51 -07:00
Mathias Agopian
5bbb1cf9d7 Add the concept of synchronous dequeueBuffer in SurfaceTexture
Change-Id: Ic94cbab092953243a0746e04bbe1b2eb0cc930ef
2011-05-11 18:01:51 -07:00
Mathias Agopian
ed3894c07a unify SurfaceTexture and Surface
Change-Id: I49da2f5d8408e4cd7e148cfb777bb4ff68cd8f37
2011-05-11 18:01:51 -07:00
Mathias Agopian
0297dcae8f Fix a bug where setgeometry couldn't be undone
This change the binder protocol between SurfaceTextureClient
and SurfaceTexture. dequeueBuffer() now takes the requested
parameters for the buffer. SurfaceTexture decides if the
buffer needs to be reallocated and does the allocation
if needed. In that case it returns BUFFER_NEEDS_REALLOCATION
to tell SurfaceTextureClient that it needs to call
requestBuffer (which all parameters have been removed) to
acquire a pointer to the buffer.

dequeueBuffer and requestBuffer could be folded into a single
IPC call, but we chose to optimize the case where buffers are
not created and avoid some complexity in the marshalling code.

Change-Id: I097a7f6f40a3491e10f3f3742eab33999286c304
2011-05-11 18:01:51 -07:00
James Dong
f605a5aae5 Merge "Fix setDataSource(Context, Uri, Map<String,String> headers)" 2011-05-11 17:52:32 -07:00
Andreas Huber
e4e7b48e33 Fix setDataSource(Context, Uri, Map<String,String> headers)
must not throw an exception if headers == null.

Change-Id: Ic8ddac597707129693874222fb2ebc5a84b8fff6
2011-05-11 16:54:41 -07:00
RoboErik
f32e8d9542 Merge "Update Calendars table to v300" 2011-05-11 16:47:17 -07:00
John Reck
91b1963510 Merge "Add ROOT_ID to Accounts column" 2011-05-11 16:12:00 -07:00
James Dong
8d773a52a8 Merge "Expose the track informational event for testing" 2011-05-11 15:59:29 -07:00
Mathias Agopian
e8c926868f Merge "fix libagl surface initialization" 2011-05-11 13:43:04 -07:00
Mathias Agopian
21bb1c7a1f fix libagl surface initialization
this broke recently when removing copybit support.

Change-Id: I5cc7ff7f49268411c6c2cfb2d97590d52b13dbd5
2011-05-11 13:41:09 -07:00
Irfan Sheriff
12ec74c1a7 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
2011-05-11 13:12:19 -07:00
Robert Ly
62242d5ceb am 9d93c9c4: am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board
* commit '9d93c9c4d761aa25fb61988bf40a900a18de79ae':
  doc change: adding link to pic board
2011-05-11 13:12:16 -07:00
Wink Saville
1dd21d2751 am e86dbac5: am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
* commit 'e86dbac583f442e37bfaa95f9427f491b62d53f3':
  Refactor IccRecords and IccCard
2011-05-11 13:11:17 -07:00
Conley Owens
5911f958e8 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.
2011-05-11 13:10:56 -07:00
Jake Hamby
afd28ac6ec am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
* commit 'ee60f3fb1b4e61ac8027293a658ba710e36d36b6':
  Enable support for SMS national language shift tables.
2011-05-11 13:09:42 -07:00
Eric Fischer
2b50d884c9 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
2011-05-11 13:09:13 -07:00
Eric Fischer
989523fd44 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
2011-05-11 13:08:50 -07:00
Joe Onorato
d21ab0e151 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.
2011-05-11 13:07:55 -07:00
Robert Greenwalt
fc82cb170c am 441bc9a6: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
* commit '441bc9a6f41ca1678a6c965bec7e2f18227ac100':
  Fix the adding of host routes.
2011-05-11 13:07:38 -07:00
Christopher Tate
a0f5bb10a5 Merge "Full local backup infrastructure" 2011-05-11 12:51:31 -07:00
Dianne Hackborn
b48be8a540 Merge "resolved conflicts for merge of 037b54cf to master" 2011-05-11 12:50:39 -07:00
James Dong
9e836a7d2e Expose the track informational event for testing
Change-Id: I0f12d62d4a36dde76823f7f39e075184c1916504
2011-05-11 12:00:21 -07:00
Dianne Hackborn
2ba3e80f94 resolved conflicts for merge of 037b54cf to master
Change-Id: I1bc2827596a349963d8aa2b63b3f7801f155668a
2011-05-11 10:59:54 -07:00
Irfan Sheriff
f450fd6af6 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
2011-05-11 10:06:33 -07:00
Irfan Sheriff
aa1fd70100 am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread
* commit '8dd85f80ba9c463f5616b47eceb620fe21203f4f':
  Move Wifi Ap configuration to flat file
2011-05-11 09:45:36 -07:00
Daniel Sandler
01defe403f Merge changes I21e9629e,I535ed3ba
* changes:
  Create an XML config flag to turn the navbar off.
  It's lights out for you, navigation bar!
2011-05-11 09:31:08 -07:00
Irfan Sheriff
8dd85f80ba Merge "Move Wifi Ap configuration to flat file" into gingerbread 2011-05-11 09:15:48 -07:00
Robert Ly
9d93c9c4d7 am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board
* commit '65bab344789b248cdc9334523e3b04f5a2c155b4':
  doc change: adding link to pic board
2011-05-11 09:11:41 -07:00
Robert Ly
65bab34478 am f3cdea93: am a45e4f4d: doc change: adding link to pic board
* commit 'f3cdea937b8b659f959d5e77f4a17f749f85c6ae':
  doc change: adding link to pic board
2011-05-11 09:08:42 -07:00
Robert Ly
f3cdea937b am a45e4f4d: doc change: adding link to pic board
* commit 'a45e4f4df59e4037408f6b9c0ddf4a7c57eaa273':
  doc change: adding link to pic board
2011-05-11 09:04:52 -07:00
Daniel Sandler
0129b31ff4 Create an XML config flag to turn the navbar off.
This will eventually be replaced by something else, probably
in Configuration, that allows the WM to tell everyone
(including the status bar) whether there exist hardware
home/back/etc. keys.

Change-Id: I21e9629ed43de4a944ad75e5b9d6d4ada8aba23f
2011-05-11 11:54:11 -04:00
Andreas Huber
4fbb313830 Merge "Leave the number of output buffers up to surface flinger and friends." 2011-05-11 08:11:11 -07:00
Andreas Huber
ba75239e1f Merge "Make sure the ogg extractor returns appropriate error codes." 2011-05-11 08:10:42 -07:00
Daniel Sandler
1d4d30aebd It's lights out for you, navigation bar!
Views requesting lights out mode will cause the navbar to
disappear (this is useful for viewing videos/photos/etc
using every pixel of the screen).

But there's a catch: any user activity at all will cause the
lights to come back on and the navbar to return.

Change-Id: I535ed3ba9ae7fab3282c402be256add765395b6f
2011-05-11 09:48:52 -04:00
Robert Ly
a45e4f4df5 doc change: adding link to pic board
Change-Id: I1ac52d18285285f6e330265db15f103a473a26de
2011-05-10 22:57:31 -07:00
Guang Zhu
496d94f234 Merge "add more logging into DRT" 2011-05-10 19:15:59 -07:00
Guang Zhu
49171bc479 add more logging into DRT
Need the extra log to track down a test hang issue

Change-Id: I1556f27b64296fcd39bc49ecbdd14347213bb9a2
2011-05-10 19:08:08 -07:00
RoboErik
651c02e61f Update Calendars table to v300
Change-Id: I8e922f97733faed800a91ea926e1a3bea229ebea
2011-05-10 18:18:34 -07:00
Christopher Tate
4a627c71ff 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
2011-05-10 17:52:51 -07:00
Daisuke Miyakawa
56ed7038b9 Merge "Remove an unnecessary word from javadoc" 2011-05-10 17:41:44 -07:00
Daisuke Miyakawa
979154ffd3 Remove an unnecessary word from javadoc
Change-Id: I6e24f72d547753ff40c7a09e95e9b28e13828f1e
2011-05-10 17:18:55 -07:00
Jason Sams
ed0fd52301 Merge "Add code for generating fifo command packing." 2011-05-10 16:46:35 -07:00
Wink Saville
e86dbac583 am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
* commit 'db08ff768b144c6ad8b326300d95c0c60e40f2eb':
  Refactor IccRecords and IccCard
2011-05-10 16:31:36 -07:00
Wink Saville
db08ff768b Merge "Refactor IccRecords and IccCard" into honeycomb-LTE 2011-05-10 16:28:33 -07:00
Conley Owens
041aa34e08 am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."
* commit '87d86044c0f15ae2ffc0350271c76ff874fb413b':
  Add missing clean-up of idmap file descriptors.
2011-05-10 16:19:29 -07:00
Andreas Huber
45179fae8d Leave the number of output buffers up to surface flinger and friends.
Change-Id: Iebb90f45793793aeb08d1cf9706e29a7cefae792
2011-05-10 16:17:44 -07:00
Andreas Huber
f5c9995ddd Make sure the ogg extractor returns appropriate error codes.
Change-Id: I36cbf58aa6fa9195e1cc052f91e1183f57069d03
2011-05-10 16:16:27 -07:00