Commit Graph

2693 Commits

Author SHA1 Message Date
Adam Powell
91d67f9c7d am bd90f0ce: am 186802ac: am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev
* commit 'bd90f0ce2d052d2e0d753e0cc7b10a1f658b496e':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
2014-07-21 18:22:48 +00:00
Adam Powell
e49d939378 Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
This allows the calling app to supply a set of alternative extras to
be sent along with the target intent if the user chooses specific
items from the full set available on the device. When replacement
extras have the same key as extras in the initial intent, the
replacement extras dominate.

Change-Id: I5d64c80447386f22402b71291bb289a74015d619
2014-07-18 16:27:11 -07:00
Jae Seo
c2809b7597 am cdc49c6c: am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev
* commit 'cdc49c6c4a9e106b220b29a7da68141489a0d175':
  TIF: Add TvParentalControlManager
2014-07-18 03:37:10 +00:00
Jae Seo
54a4634983 Merge "TIF: Add TvParentalControlManager" into lmp-dev 2014-07-17 18:11:21 +00:00
Jae Seo
6057102dbb TIF: Add TvParentalControlManager
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.

Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.

Bug: 13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
2014-07-17 16:29:36 -07:00
Michael Wright
1da8349645 am a2ed68e5: am e9f933cd: am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev
* commit 'a2ed68e55381450b9259c8399082fd48155b0c64':
  Add MediaProjection APIs.
2014-07-18 00:37:44 +00:00
Michael Wright
c39d47a8e7 Add MediaProjection APIs.
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.

The screen sharing case is implemented, but all of audio capturing
is still forthcoming.

Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
2014-07-17 14:30:19 -07:00
Eino-Ville Talvala
ef33384939 am 9971ee27: am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
* commit '9971ee27026b799f7e09fabd53ba07c5b43bfd93':
  Add PackageManager features for differentiating camera2 devices
2014-07-17 21:06:22 +00:00
Martin Kosiba
9ab6dbc624 am 6239ed0c: am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager.
* commit '6239ed0c67b2e981e80e9eac29d9aecd01a99cda':
  Allow for appending of resources to an AssetManager.
2014-07-17 21:04:53 +00:00
Dianne Hackborn
bf507a0cba am 68f35ec2: am dbec91c0: Implement issue #16330060: Inform ActivityManager about WebView...
* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
  Implement issue #16330060: Inform ActivityManager about WebView...
2014-07-17 18:22:17 +00:00
Vinit Deshpande
b42cf4ea56 am ff5ceb0d: am 0b4d73dd: Merge "Introduce RTT Manager" into lmp-dev
* commit 'ff5ceb0d89c549682b498522f052d61c776bff03':
  Introduce RTT Manager
2014-07-17 18:20:48 +00:00
Sailesh Nepal
909d1b5755 resolved conflicts for merge of 03e88771 to master
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
2014-07-17 11:05:42 -07:00
Martin Kosiba
7df3625d5b Allow for appending of resources to an AssetManager.
BUG: 11505352
Change-Id: Ifa290580a6dc63c2f471d0bbf5f066db14aed4d7
2014-07-17 18:10:02 +01:00
Dianne Hackborn
fee756ff91 Implement issue #16330060: Inform ActivityManager about WebView...
...state changes.

Add a new API to tell the activity manager about a new dependency
one process has on another package.  Start using it already for
when apps is Context.createPackageContext() to load code from another
app.

Also do some work on getting the monitoring of proc/uid states
in shape so it can be used by unundled code, along with an
AppImportanceMonitor class for doing so.

Some small fixes and additions to VoiceInteractionService.

Improve handling of unaccounted/overcounted battery use so that
they aren't shown to the user unless they are significant.

Change-Id: I22dd79a73f4e70103d3f8964494aebc8a31f971c
2014-07-16 22:50:31 -07:00
Eino-Ville Talvala
7040e9f7fe Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 2014-07-17 02:40:09 +00:00
Eino-Ville Talvala
611fecec08 Add PackageManager features for differentiating camera2 devices
Also rename DNG capability to RAW.

Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8
2014-07-17 10:58:16 -07:00
Vinit Deshpande
7686c061b7 Introduce RTT Manager
Change-Id: Ic9a16d587897b272f85cdb2b8c52b51bca060d18
2014-07-17 00:45:20 +00:00
Sailesh Nepal
001bbbb239 TTY: frameworks/base changes
This CL makes the following changes:
  1. New public APIs:
    - TelecommManager.getCurrentTtyMode: This is used to
      get current TTY mode. It's used by Telephony to set
      the phone state before calls are created (which is why
      it can't be a Conneciton API).
    - TelecommConstants.TTY_MODE_*: These are constants
      copied from Phone.java
    - TelecommConstants.ACTION_CURRENT_TTY_MODE_CHANGED: This
      action is fired when the current TTY mode changes.
      Apps can listen to this before and during a call.
      The old version of this was in TtyIntent.java which
      I deleted.

  2. New private API
    - TelecommManager.isTtySupported: This is used by
      Telephony to hide the TTY settings on devices
      that don't support TTY

  3. Various updates to use the constants renamed in this CL

Change-Id: I652b095af30cc2732a06829dc23492e5355660da
2014-07-16 21:14:58 +00:00
Narayan Kamath
2631fda583 am b6c2cce1: am baba92bd: Merge "Dexopt for Context.createPackageContext when code is included." into lmp-dev
* commit 'b6c2cce1233ce77565a7980752876ec73f10c537':
  Dexopt for Context.createPackageContext when code is included.
2014-07-16 19:21:05 +00:00
Narayan Kamath
b1b745790e am 095a96b1: am 4adbb78f: Merge "Adjust nativeLibraryDir for package contexts of multiArch installs." into lmp-dev
* commit '095a96b1e0715e5a4436f093f6dd31eec6409ae8':
  Adjust nativeLibraryDir for package contexts of multiArch installs.
2014-07-16 18:11:29 +00:00
Jeff Sharkey
faee1741db am 97308915: am 5ddccbd2: Merge "Add code cache directory for apps." into lmp-dev
* commit '9730891509b0c7bb50b0b2ecf498c3b993dcef39':
  Add code cache directory for apps.
2014-07-16 17:04:05 +00:00
Jeff Sharkey
d0a2de06a7 Merge "Add code cache directory for apps." into lmp-dev 2014-07-16 16:25:13 +00:00
Andrew Solovay
d75fd88ee5 am 9053f216: am ebbabf28: am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit '9053f216f1d1c5bf4b71281a3de77a665d060cf1':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:59:56 +00:00
Andrew Solovay
f7cecf8f4b am c8fcb3bc: am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit 'c8fcb3bcdb71fe16624bea146a67b13c150adb82':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:36:16 +00:00
Andrew Solovay
c8fcb3bcdb am 57553775: am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs
* commit '575537759222e0277c3979e33342407aa7ca1a78':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
2014-07-16 13:29:08 +00:00
Jeff Sharkey
4ed745d359 Add code cache directory for apps.
This provides a directory where apps can cache compiled or optimized
code generated at runtime.  The platform will delete all files in
this location on both app and platform upgrade.

Bug: 16187224
Change-Id: I641b21d841c436247f35ff235317e3a4ba520441
2014-07-15 22:13:26 -07:00
Jeff Sharkey
6b5dbcbfc5 am 76014649: am 21c0fec8: Merge "Mark resource-only splits as hasCode=false." into lmp-dev
* commit '7601464965dd43b946fa8c0c29aff54da31aa3e5':
  Mark resource-only splits as hasCode=false.
2014-07-16 03:33:00 +00:00
Jeff Sharkey
78a130144b Mark resource-only splits as hasCode=false.
PackageManagerService now skips dexopt for split APKs that don't
declare they have code.  Also surface more detailed error messages
in logs.

Bug: 14975160
Change-Id: Ie6078dba724815020cee59b7fc52317e88ca097a
2014-07-15 20:18:39 -07:00
Jeff Sharkey
2c509a774d am beb50dd9: am 5417dd75: Merge "Parse more split APK manifest details." into lmp-dev
* commit 'beb50dd93279b18ebc07827b96a6a406da107af1':
  Parse more split APK manifest details.
2014-07-16 03:00:27 +00:00
Jeff Sharkey
da96e137bc Parse more split APK manifest details.
Allow split APKs to define activities, services, receivers,
providers, and metadata.  However, support for many manifest items
are explicitly omitted.

Only dexopt split APKs that include code.

Bug: 14975160
Change-Id: I2fbf99e2a62328aa2185e5924755af33060282fc
2014-07-15 18:50:00 -07:00
Narayan Kamath
2053168eb4 Dexopt for Context.createPackageContext when code is included.
The package manager now keeps track of per ISA dex-opt state.

There are two important things to keep in mind here :

- dexopt can potentially be very slow. In cases where the target
  package hasn't been dexopted yet, this can take multiple seconds
  and may cause an ANR in the caller if the context is being
  created from the main thread.
- We will need to remove the constraint that dexopt can only be
  requested by the system (or root). Apps will implicitly be
  requesting dexopt by asking for package contexts with code included.
  It's important to note that unlike dalvik, the dexopt stage in ART
  isn't optional. ART cannot load classes directly from dex files.

bug: 15313272
Change-Id: I0bd6c323a9c1f62f1c08f6292b7f0f7f08942726
2014-07-16 19:23:52 +01:00
Narayan Kamath
d8723bd3d6 Merge "Adjust nativeLibraryDir for package contexts of multiArch installs." into lmp-dev 2014-07-16 01:00:53 +00:00
Narayan Kamath
7dba6eb3ac Adjust nativeLibraryDir for package contexts of multiArch installs.
When we're creating a package context for a multi-arch app,
adjust the native library directory to match the bitness of
the process creating the context.

This change also removes apkRoot (which wasn't really being used)
and replaces it with a fully constructed secondary library path.
The secondary library path is a transitional measure until we
can reorganize the system image so that we can use nativeLibraryRoot
for system paths as well (nativeLibraryRootRequiresIsa will then
be true for all packages except for legacy installs).

bug: 16013931

Change-Id: I5ae090334b377b9e087aecf40075fab81b20b132
2014-07-16 13:37:16 +01:00
Amith Yamasani
2502d23ade am 8f1d6eeb: am 6053e05a: Merge "App restrictions schema and parser" into lmp-dev
* commit '8f1d6eebaa8dd7c30b3ee318211aacb06603bc0d':
  App restrictions schema and parser
2014-07-16 00:42:08 +00:00
Deepanshu Gupta
cc0c78c98b am dbc322c7: am 0f71531f: Merge "Support Locale.toLanguageTag on Java 6" into lmp-dev
* commit 'dbc322c7b6d2da8e4dc24a85d8c2039a947e27ae':
  Support Locale.toLanguageTag on Java 6
2014-07-15 22:04:03 +00:00
Craig Mautner
003582f2f4 am a60bb211: am 30636967: Merge "Launch activity behind launching task." into lmp-dev
* commit 'a60bb211f2a51036bb02942deca6f718001527ec':
  Launch activity behind launching task.
2014-07-15 19:12:23 +00:00
Amith Yamasani
3cc8b491be am 83f39b51: am 1c44f4c7: Merge "Revert some new APIs for restrictions provider" into lmp-dev
* commit '83f39b510d6bd8237018500496aa8673b15e9332':
  Revert some new APIs for restrictions provider
2014-07-15 19:12:15 +00:00
Narayan Kamath
50a8891a6c am b1bc099e: am 0928aa4c: Merge "Fix multiArch parsing for ApkLite." into lmp-dev
* commit 'b1bc099e0a18ab1ae7bb15be414f53b7dd762cd2':
  Fix multiArch parsing for ApkLite.
2014-07-15 17:10:23 +00:00
Andrew Solovay
5ae1335477 cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38
Doc had inaccurately said that getLaunchIntentForPackage() throws an
exception if the package name is not recognized; in fact, it returns
null. Also cleaned up some style issues for that Javadoc item.

Doc is staged to:

http://asolovay.mtv:9655/reference/android/content/pm/PackageManager.html#getLaunchIntentForPackage(java.lang.String)

Bug: 15022655
Original SHA1: I2eab0956eaedac71289e19a3618a3553908f8c38

Change-Id: Ief8dfaac248ba03779c6f13237aff9b26d362fd9
2014-07-15 15:08:58 -07:00
Amith Yamasani
c8c8425b51 App restrictions schema and parser
Documented the restrictions schema in RestrictionsManager docs.
Added a parser to read the meta-data and XML file on the device.
Added more types and methods in RestrictionEntry to accomodate some
new types and construction modes.
Added a styleable for restriction attributes.

Slight tweak to permission response params.

Bug: 14582645
Change-Id: I193d1162741d110c100831cab33b48e2baf7426c
2014-07-15 17:16:54 -07:00
Craig Mautner
00e7ba05ac Merge "Launch activity behind launching task." into lmp-dev 2014-07-15 16:05:04 +00:00
Craig Mautner
bb74246278 Launch activity behind launching task.
Use ActivityOptions.makeLaunchTaskBehindAnimation() to launch tasks
behind the current task. Includes animations for launching and
launched tasks.

Fixes bug 16157517.

Change-Id: I0a94af70b4748592e94673b958ee824cfb3d7ec0
2014-07-15 11:36:25 -07:00
Deepanshu Gupta
c97b4d3996 Merge "Support Locale.toLanguageTag on Java 6" into lmp-dev 2014-07-15 16:05:01 +00:00
Deepanshu Gupta
5cd9dde5a2 Support Locale.toLanguageTag on Java 6
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
2014-07-15 12:56:04 -07:00
Amith Yamasani
4d922e6f74 Merge "Revert some new APIs for restrictions provider" into lmp-dev 2014-07-15 16:04:58 +00:00
Amith Yamasani
5470bc184a Revert some new APIs for restrictions provider
Simplify back to being a broadcast receiver and add an extra to
indicate that a new request is desired vs. returning a pending
response from before.

Change-Id: Iafd16ed98293a2cc09006d2cce097fc3d590bbe2
2014-07-15 09:43:20 -07:00
Jeff Sharkey
b45b2d55fc am 9b4ec01d: am 384b8a0a: Merge "Public API for PackageInstaller!" into lmp-dev
* commit '9b4ec01d60736513ec11ab64b52f49d2d9ce68c7':
  Public API for PackageInstaller!
2014-07-15 13:41:46 +00:00
Jeff Sharkey
69ea974f17 Merge "Public API for PackageInstaller!" into lmp-dev 2014-07-15 00:41:06 +00:00
Jeff Sharkey
6c833e07a0 Public API for PackageInstaller!
Flesh out documentation and finalize first cut of API.  Also surface
installLocation and splitNames through PackageInfo.

Bug: 14975160, 15348430
Change-Id: Ic27696d20ed06e508aa3526218e9cb20835af6a0
2014-07-14 23:06:52 -07:00
Ying Wang
749bd5d322 Fix docs build.
Change-Id: I03b87aedcd5aedd8be665aa480fdeae8eafbde0e
2014-07-14 23:21:52 -07:00