Commit Graph

2724 Commits

Author SHA1 Message Date
Adam Lesinski
ec1fb4184e am eebc0d09: am 1038bf1d: am 94499248: Merge "Add <feature-group> tag and change aapt badging" into lmp-dev
* commit 'eebc0d090d36f8d00b841faea1bb75444963272a':
  Add <feature-group> tag and change aapt badging
2014-07-24 23:49:51 +00:00
Adam Lesinski
d4bd75be4f Merge "Add <feature-group> tag and change aapt badging" into lmp-dev 2014-07-24 15:36:09 +00:00
Nicolas Prevot
b593e79436 am 498694c6: am 1b4a211d: am 4fe8fe2b: Merge "Making the clipboard work across users." into lmp-dev
* commit '498694c67112923f85f3572c4b7ad093283d1f68':
  Making the clipboard work across users.
2014-07-24 19:59:48 +00:00
Alan Viverette
f6a5fd39a0 am 8ec7d394: am 014089cd: am 82b83fb5: Merge "Use activity for brightness dialog" into lmp-dev
* commit '8ec7d394252ee801ded0bde940c8f7358cbc9099':
  Use activity for brightness dialog
2014-07-23 22:00:07 +00:00
Adam Lesinski
2c72b6822d Add <feature-group> tag and change aapt badging
A <feature-group> represents a set of features required
for an app to be compatible with a device. Multiple
<feature-group> elements represent a logical 'or'
of required features.

Features defined in the old way with <uses-feature> tags
under the <manifest> tag are automatically added to each
feature-group defined.

Defining a <feature-group> means that any default
features are not included (such as android.hardware.touchscreen)
and declared permissions do not imply any features.

Change-Id: I45626f0fdc546e47bcf2aead7ef05ebcca12b023
2014-07-23 14:11:46 -07:00
Nicolas Prevot
f1939901d2 Making the clipboard work across users.
When copying from the parent: the ClipData can be pasted in the managed profile.
When copying from a managed profile: it can be pasted in the parent,
unless the policies says it's disabled. In which case, the clipboard of the parent becomes empty.
Supporting content uris.

BUG: 15186236

Change-Id: I522564a7c07ff21df137adcda980bb52e5739964
2014-07-24 10:25:57 +00:00
Alan Viverette
f84bc66b21 Merge "Use activity for brightness dialog" into lmp-dev 2014-07-23 18:50:38 +00:00
Jeff Davidson
d73aa15516 am a98f35ba: am dfe72ae3: am 69c976c6: Merge "Expose NETWORK_SCORE_SERVICE as @SystemApi." into lmp-dev
* commit 'a98f35ba7e61f75123a8829a7e2368e6bc138a03':
  Expose NETWORK_SCORE_SERVICE as @SystemApi.
2014-07-23 17:02:44 +00:00
Jeff Davidson
5ad20790a1 Expose NETWORK_SCORE_SERVICE as @SystemApi.
Bug: 15833200
Change-Id: Ide17bf0065ca7f5ab13e913dd6078b6c62741243
2014-07-23 09:41:40 -07:00
Narayan Kamath
4c6ce23816 Remove copy of Locale.adjustLanguageCode.
(cherry picked from commit 1d31a5f824)

Change-Id: I7b30a153a44dc1f99a9ddfe256b770d7305a74b7
2014-07-23 11:09:26 +01:00
Alexandra Gherghina
0e9ac20d7e Do Not Merge Per-user API for master sync
Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit 222aea8bd997807784dc99ca53f63280d384fdf0)
2014-07-22 20:15:45 +00:00
Alexandra Gherghina
d6babbb6ce Merge "Per-user API for master sync" 2014-07-17 19:51:18 +00:00
Narayan Kamath
fbc5b48568 am acd4f7cf: am b5c714fc: am e242111c: Merge "Remove copy of Locale.adjustLanguageCode."
* commit 'acd4f7cf37487c55c6b15aa40f2da57b542dcebb':
  Remove copy of Locale.adjustLanguageCode.
2014-07-22 13:53:12 +00:00
Dianne Hackborn
4944bc0c40 am 4db59328: am d8b0edbf: am 8f5105c6: Merge "Add permissions associated with app ops." into lmp-dev
* commit '4db593286f561ad5af1c32f9dbd12ebd8ca0d242':
  Add permissions associated with app ops.
2014-07-22 13:53:04 +00:00
Narayan Kamath
b0490cdefe am b5c714fc: am e242111c: Merge "Remove copy of Locale.adjustLanguageCode."
* commit 'b5c714fca79028116db0b00157dc09616efeaa95':
  Remove copy of Locale.adjustLanguageCode.
2014-07-22 13:49:36 +00:00
Amith Yamasani
91963bf51c am 4fc62368: am ff053445: am f6feac69: API Review: Improvements to RestrictionsManager API
* commit '4fc623682a039650d86c4ccb87da66191573e2e3':
  API Review: Improvements to RestrictionsManager API
2014-07-22 00:17:18 +00:00
Amith Yamasani
9c44933958 API Review: Improvements to RestrictionsManager API
Use an activity intent for local approval instead of a type.
Use PeristableBundle instead of Bundle.
Pass requestId as an explicit argument in cases where it's required.

Bug: 16400892
Change-Id: Id882033f17c39aa9cd63a7eeb73bb7b51f98cf5b
2014-07-22 00:03:39 +00:00
Amith Yamasani
d84e59c70f am 5d5fa324: am b0cae189: am f8b67f1f: Rename setApplicationBlocked to setApplicationHidden
* commit '5d5fa324871437c3bd240ae231adae9bbea6b0ba':
  Rename setApplicationBlocked to setApplicationHidden
2014-07-21 22:37:09 +00:00
Amith Yamasani
e5bcff624f Rename setApplicationBlocked to setApplicationHidden
This corrects the expected behavior of the app state. Hidden apps
can be installed by the store to be brought out of hidden state.

Bug: 16191518
Change-Id: Id128ce971ceee99ba1dea14ba07ce03bd8d77335
2014-07-21 22:18:40 +00:00
Craig Mautner
ee4c9ffb10 am ca30ccb5: am 28d5d4df: am 52cf4df1: Merge "Rename flag and attribute per API council" into lmp-dev
* commit 'ca30ccb556f6814c5ac4352adb95c7eb22652d6b':
  Rename flag and attribute per API council
2014-07-21 19:23:51 +00:00
Jesse Hall
67877b6634 am c7777484: am c623c94c: am 65c75169: Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev
* commit 'c7777484547894a7817ac4428e5890dcf817262c':
  Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A
2014-07-21 19:20:28 +00:00
Dianne Hackborn
526e843499 am 65f62f23: am 39285ff1: am 1648dbb4: Merge "Fix issue #16400873: Apps that show ads as new tasks stay in recents..." into lmp-dev
* commit '65f62f236395b44a0c168f1ec72855197927a885':
  Fix issue #16400873: Apps that show ads as new tasks stay in recents...
2014-07-21 19:19:18 +00:00
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
Craig Mautner
1716baa6d3 Merge "Rename flag and attribute per API council" into lmp-dev 2014-07-21 15:42:19 +00:00
Craig Mautner
7f72f53704 Rename flag and attribute per API council
ActivityInfo.DO_NOT_PERSIST => PERSIST_NEVER.
android:persistableMode="doNotPersist" => "persistNever".

Fixes bug 16400594.

Change-Id: I94d25f7d2e3dc453b1251c89bce8c210a65dc331
2014-07-21 10:07:12 -07:00
Jesse Hall
19eb5cb80e Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev 2014-07-20 04:41:30 +00:00
Dianne Hackborn
33f5ddd1be Add permissions associated with app ops.
Change-Id: I575ad7a3ceea59486ca601f69760b14f6269511d
2014-07-21 20:15:59 -07:00
Jesse Hall
7f51706265 Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A
Bug: 15593761
Change-Id: Id1865cbf27c98a611cc6414fe47ee979c1d7cee2
2014-07-18 14:24:36 -07:00
Narayan Kamath
1d31a5f824 Remove copy of Locale.adjustLanguageCode.
Change-Id: Iba8c67890f95d50fadcd1245dc083d646fe6bcc1
2014-07-18 16:09:36 +01: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
Dianne Hackborn
13420f2311 Fix issue #16400873: Apps that show ads as new tasks stay in recents...
...even when I hit back or close the activity in UI

Change the semantics of NEW_DOCUMENT to have the recents entry be
removed by default when its activity is finished, with various ways
to explicitly turn off this behavior.

Change-Id: Idc717706d27de80f28b53ad76f9e375d85118d71
2014-07-20 15:58: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