347 Commits

Author SHA1 Message Date
Debashish Chatterjee
31beb6db09 Merge "framework/base changes to add new voicemail provider sample." 2011-05-26 07:45:28 -07:00
Brian Carlstrom
ba1a667b1d Remove need for onActivityResult from KeyChain API
Change-Id: I97bb9db06978f6dc039d22bfee116671d7b3e336
2011-05-25 10:27:46 -07:00
Ying Wang
8f40e58712 Merge "Fix intermediate src dir for framework.jar" 2011-05-24 16:27:17 -07:00
Jason parks
01425365a8 Add public API to do NDEF push.
Change-Id: I102da9bbc6d78577a26fa03ee363a60abc389d6c
2011-05-24 15:22:07 -05:00
Jeff Sharkey
a462079303 Observe screen on/off events in NetworkPolicy.
The POLICY_REJECT_BACKGROUND policy requires that network traffic be
blocked when a UID goes into the background.  Even if the UID has an
activity in the foreground, it's considered "background" if the screen
is turned off.

This changes watches for SCREEN_ON/OFF broadcasts, and rule generation
now observes screen state.  It also introduces an observer pattern so
that ActivityManager doesn't directly know about NetworkPolicy, and
moves the service management into SystemServer.

Change-Id: Ie7a84929d3ca60ae4578d47e19d5a8da10fd8d58
2011-05-23 18:39:56 -07:00
Debashish Chatterjee
acd6f5fcfa framework/base changes to add new voicemail provider sample.
Changes are primarily to include documentation for the new sample
code under resources tab of external android documentation.

Change-Id: If2b24e37819ae7d5145226681051605a96711ce2
2011-05-19 13:21:48 +01:00
Ying Wang
65ee22aa01 Fix intermediate src dir for framework.jar
Intermediate src dir for JAVA_LIBRARIES should be in the common
intermediate dir.

Change-Id: Ib16ddd63aed080cdd1494204b347c1e1e1beafcb
2011-05-18 09:48:40 -07:00
Jeff Sharkey
d5cdd597b8 First pass at NetworkPolicy and activity tracking.
New system service that maintains low-level network policy rules and
collects statistics to drive those rules.  Will eventually connect to
netfilter kernel module through NetworkManagementService and "netd".

Begin tracking foreground activities in ActivityManagerService, which
is updated as part of OOM adjustment.  Eventually a network policy of
POLICY_REJECT_BACKGROUND will reject network traffic from background
processes.

Change-Id: I5ffbbaee1b9628e9c3eff6b9cb2145fc5316e64d
2011-05-13 16:20:21 -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
Scott Main
c44b885577 am cda9fda4: am 4c8fa6d1: am 1c71fffe: update platform version number for docs
* commit 'cda9fda4fdeac3c3ce24df27e1c24c72d5b70960':
  update platform version number for docs
2011-05-05 15:27:30 -07:00
Scott Main
4c8fa6d135 am 1c71fffe: update platform version number for docs
* commit '1c71fffeb5d6a241ccbe7f035ce0d030eaeef562':
  update platform version number for docs
2011-05-05 15:18:19 -07:00
Scott Main
1c71fffeb5 update platform version number for docs
Change-Id: If0866ab1544ce0f5e70bbbe93d30ed27c4403406
2011-05-05 14:49:47 -07:00
Robert Ly
427a51ab73 am 232ea51c: am 7c8be3a7: am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
* commit '232ea51c9c1af7a56e2315de863d65382c7c9a67':
  adding the usb apis to the resources browser
2011-05-04 13:20:11 -07:00
Robert Ly
7c8be3a75d am 762481f0: Merge "adding the usb apis to the resources browser" into honeycomb-mr1
* commit '762481f0b58ac41b7583f74315fcb213ca0eb630':
  adding the usb apis to the resources browser
2011-05-04 13:14:48 -07:00
Robert Ly
8cdb2e2d83 adding the usb apis to the resources browser
Change-Id: I79e9f93ebfa3aaf03e4f4deeb70d6c5a7a4ad07f
2011-05-02 17:49:05 -07:00
Brian Carlstrom
b9a07c18e6 Adding KeyChain API and IKeyChainService
Change-Id: Id3eaa2d1315481f199777b50e875811e3532988a
2011-04-20 13:35:31 -07:00
Bjorn Bringert
50e657bb2d Add Java API for writing TTS engines
This removes the old non-public C++ API for TTS
engines and replaces it with a Java API.

The new API is still @hidden, until it has been approved.

Bug: 4148636
Change-Id: I7614ff788e11f897e87052f684f1b4938d539fb7
2011-04-15 10:04:31 +01:00
Dianne Hackborn
bcbab36843 Merge "Rework thumbnails in activity manager." 2011-04-08 18:28:14 -07:00
Dianne Hackborn
f26fd99a7c Rework thumbnails in activity manager.
We now only keep a thumbnail for the task, not for each
activity.  However if you use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET,
we will make a new secondary thumbnail for that series of
activities.  There is a new API for the app to get these
secondary thumbnails.

Also set a default thumbnail size for non-xlarge screens
so we have thumbnails on phones.  (We need some smarter
code in the platform for computing the actual thumbnail
dimensions of the current device).  And add a test app
to show recent tasks + thumbnails.

Change-Id: Ic36759f6635522118a2cb7f156662229a610c492
2011-04-08 18:16:21 -07:00
Joe Onorato
5e88ac73ce Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.
Change-Id: I9307d0d323f1b65816b3e097bf9c4d92f3962b2f
2011-04-08 16:21:34 -07:00
Joe Onorato
43a17654cf Remove the deprecated things from Config.java. These haven't been working since before 1.0.
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
2011-04-07 19:23:05 -07:00
Brian Carlstrom
08065b9f09 Tracking merge of dalvik-dev to master
git cherry-pick --no-commit  a80febd83c8bf0b6717da2a7136179bdc906a5b7

git cherry-pick --no-commit  5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd

git cherry-pick --no-commit  4886db14c9eee4b6fee69bd54c57c5af04709c4c

git cherry-pick --no-commit  560c685e448769904047507b9484ce8111967d7e

git cherry-pick --no-commit  63dde7a2fcfa53dc531558635b64cea613d3cdb4

git cherry-pick --no-commit  74e5cb91060a379d98dd3a333b5f231bfb4f502e

git cherry-pick --no-commit  1cc8c9708b555e2e338b7798d38887a2fefcfea6

git cherry-pick --no-commit  09625a21f5abe0c0db15757f58585d552d62c3d7

git cherry-pick --no-commit  fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458

git cherry-pick --no-commit  a68cb7fa3ab42854768b8145ff85231663770292

git cherry-pick --no-commit  716beb1c131dd2c6b805d4f681debaa20075010c

git cherry-pick --no-commit  8c29b1097a7afe3a77e27546a56e396f3620a4ec

git cherry-pick --no-commit  9c6a1a55d1c8086c1cc57464eea43725694ff70c

git cherry-pick --no-commit  b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8

Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
2011-04-01 16:00:23 -07:00
Scott Main
4cead493fd am 02a7f8eb: am 5c35c059: am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
* commit '02a7f8eb3a5680a5b4c00b649b461bcb65c665e4':
  docs: update makefile to show javadocs diffs for api level 12
2011-03-30 16:40:03 -07:00
Scott Main
5c35c05909 am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12
2011-03-30 12:12:15 -07:00
Scott Main
d3b62c961b docs: update makefile to show javadocs diffs for api level 12
Change-Id: I1ac584db778ec14b18129785126159f692459158
2011-03-29 16:25:16 -07:00
Brian Carlstrom
a9602db3d5 Tracking SamplingProfiler change in libcore
Change-Id: Ic45a1570c01340a5406468a9d0f2a5357175fd80
2011-03-24 17:06:41 -07:00
Nick Pelly
a64e2ad4da resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp
Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42
2011-03-14 10:28:11 -07:00
Nick Pelly
38d0d5628d am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).
* commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2':
  Implement new NFC-EE API's as shared library (frameworks/base).
2011-03-10 16:32:28 -08:00
Nick Pelly
367f41f8f6 Implement new NFC-EE API's as shared library (frameworks/base).
Change-Id: I45c4eaf59ec78167fc236fdd59676465a5e1bcb7
2011-03-10 16:03:46 -08:00
Mike Lockwood
7866be2b76 am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
  DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 15:16:32 -08:00
Mike Lockwood
40bbf9295d DO NOT MERGE: Backport USB accessory support to gingerbread
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 23:09:12 -08:00
Mike Lockwood
c4308f01c9 Move USB framework support from android.hardware to android.hardware.usb package
Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 08:07:20 -08:00
Robert Ly
44b362c340 fixing resource browser for renderscript samples because the samples moved
Change-Id: Ic63399f8f6ff0b33461a8e6c8ce1ce398bd8085f
2011-02-28 15:53:15 -08:00
Xavier Ducrohet
7719436342 am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'b732b7b5e8192501360edc15fb8c6399d11fb97d':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 10:15:48 -08:00
Xavier Ducrohet
b732b7b5e8 am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 10:10:38 -08:00
Xavier Ducrohet
6504490cde am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 09:16:38 -08:00
Robert Ly
7a2222b260 am d2acfd6d: am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb
* commit 'd2acfd6d04545562fcacd266e175461f26b25da9':
  Doc change: fixing renderscript samples
2011-02-17 20:23:49 -08:00
Robert Ly
6518f486a5 Doc change: fixing renderscript samples
Change-Id: Ie5d17df121ec4bc5fd46448c1670d306322b92d8
2011-02-17 18:44:31 -08:00
noda
7640caaf91 WAPPushManager, WAP Push over SMS message handler
The WAPPushManager is a new, optional service for handling WAP Push
over SMS messages.  This service allows a carrier to designate a high
priority handler for specific WAP Push over SMS messages without
affecting other WAP Push over SMS, binary SMS, or SMS text messages.
It is also optional, so that it can be configured out of the target
image resulting in no change in the WAP Push over SMS handling
behavior compared to the current AOSP.

- This patch contains the WAPPushManager itself, the associated test
  code, and the modifications to telephony to use the WAPPushManager.

Change-Id: I4f7fb5b68fc666da9bdeeea525e8797ae317e4b5
2011-02-18 00:31:24 +09:00
Scott Main
d3b6abc466 am 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb
* commit '2b0c6fdfff0faf17163d126ac21c1651e4053968':
  docs: revise a couple sample app names to match side nav
2011-02-15 11:38:50 -08:00
Scott Main
d873e660c5 docs: revise a couple sample app names to match side nav
Change-Id: Ia45e78fe005c80934d70b585558cb4c6c0f52f30
2011-02-15 10:58:34 -08:00
Adam Cohen
b9d3e5ec93 am c7f15f5c: am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb
* commit 'c7f15f5cbb68e138e739f6e6d7e1605c48cad2a4':
  Adding StackWidget sample code
2011-02-11 15:29:43 -08:00
Winson Chung
2fc779eaeb am 40683904: am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb
* commit '4068390434c366b814dc0885ae5ef5fc0cf50eff':
  Associated changes for 'Adding sample for collection widgets backed by content providers.'
2011-02-11 15:29:35 -08:00
Adam Cohen
5a1b63572b Merge "Adding StackWidget sample code" into honeycomb 2011-02-11 15:19:38 -08:00
Winson Chung
06d2fa705b Associated changes for 'Adding sample for collection widgets backed by content providers.'
Change-Id: Ic872675f4645497dd1478b6c7e3074b029ea66ad
2011-02-11 11:27:23 -08:00
Adam Cohen
fca67c5525 Adding StackWidget sample code
Change-Id: I4c469f25147f733a3a09cdea0db407cd4e9f62ca
2011-02-10 19:12:41 -08:00
Roman Nurik
5d82abe586 am b8d74fd9: am 8635908d: Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb
* commit 'b8d74fd962e7a8595e5aeadb78b5e7eacea52e8a':
  Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery
2011-02-07 17:27:58 -08:00
Roman Nurik
8635908da1 Merge "Update resources data JSON, sample screenshot, and SDK makefile for Honeycomb Gallery" into honeycomb 2011-02-07 17:22:43 -08:00
Scott Main
5e2b123e48 am 236e9db9: am 62e97010: enable javadoc filtering for api level 11 and disable preview doc mode
* commit '236e9db9f31f6b93f6f21cd3b09df7c19dde16dd':
  enable javadoc filtering for api level 11 and disable preview doc mode
2011-02-07 16:41:21 -08:00
Scott Main
62e9701099 enable javadoc filtering for api level 11 and disable preview doc mode
Change-Id: I12e5f295145ef037beda0e1a3ae0358cf5a2b590
2011-02-07 16:35:46 -08:00