Commit Graph

5935 Commits

Author SHA1 Message Date
Svetoslav
3f8a2f73ec am 21ec5f62: am 597059d5: Merge "Adding missing permission API to fragment" into mnc-dev
* commit '21ec5f6256794755abee83c4daf8737f2ff30e10':
  Adding missing permission API to fragment
2015-06-03 23:20:05 +00:00
Svetoslav
a2011d232b Adding missing permission API to fragment
Change-Id: I90309a23a08a82f0ab93eb4f6185db09e035aac1
2015-06-03 15:43:59 -07:00
Svetoslav
f766363a36 am 1df1f713: am f559546d: Merge "Add annotations to a new API" into mnc-dev
* commit '1df1f7137edb8ffa342a2cb4384e583290ee7b24':
  Add annotations to a new API
2015-06-03 02:22:58 +00:00
Svetoslav
f559546d8c Merge "Add annotations to a new API" into mnc-dev 2015-06-03 01:01:41 +00:00
Svetoslav
9ce9a15f62 Add annotations to a new API
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
2015-06-02 17:59:31 -07:00
Nicolas Prevot
8a4dbac598 am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev
* commit '83366d500f48f73b8465c7e6cbe83c7a5aa91bbe':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
2015-06-02 22:28:46 +00:00
Svetoslav
c87f485da5 am 7c773529: am 3aa3f5f8: Merge "Fix java doc" into mnc-dev
* commit '7c773529afeff7d88386045c75b1eab994ae4ea9':
  Fix java doc
2015-06-02 22:28:42 +00:00
Svetoslav
12e7abc659 am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev
* commit '703c7f9e776bb900f19c4dc30c03c6a22c833aba':
  Add API to hint whether to show on-board UI before a permission request.
2015-06-02 22:15:46 +00:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Svetoslav
3aa3f5f892 Merge "Fix java doc" into mnc-dev 2015-06-02 22:09:18 +00:00
Svetoslav
aa048b6242 Fix java doc
Change-Id: I927a1766e1e4cac99d0d7999fef568b82af769af
2015-06-02 15:08:48 -07:00
Svetoslav
c5ff0020a2 Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 2015-06-02 21:53:20 +00:00
Svetoslav
20770ddbd4 Add API to hint whether to show on-board UI before a permission request.
bug:21511988

Change-Id: I9d1d7adf34b68074e65510f53b6e642cf784cf6b
2015-06-02 14:48:38 -07:00
Amith Yamasani
9984f181c5 am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev
* commit '52f26b6399cd28bfaa5822cb4c3a5340404f7800':
  Temporarily whitelist an app for network during doze
2015-06-02 21:10:40 +00:00
Robin Lee
9aa9054169 am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev
* commit '805402de76dc983b2b785d77531f81ab6eea5f87':
  Device policy: consistent javadoc and annotations
2015-06-02 21:10:18 +00:00
Robin Lee
24613fae6b am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev
* commit 'b35307343a72a24165e8adceec2fba8222ef86eb':
  Revert "Consistent documentation and annotations for DPMS"
2015-06-02 21:09:09 +00:00
Robin Lee
b95551290a am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev
* commit '9b286dd637775d157b273cdb8dfec9e83af5c050':
  Consistent documentation and annotations for DPMS
2015-06-02 21:09:03 +00:00
Nicolas Prevot
64bf7b2870 Make ACTION_PROVISION_MANAGED_DEVICE public.
Also remove the doc saying that factory reset is impossible if there
is a device owner: the device owner may not set the user restriciton
DISALLOW_FACTORY_RESET.

BUG:19889110

Change-Id: Iadc084a38e541061c0b0c95bfc95da73d48842d7
2015-06-02 14:04:41 -07:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00
Robin Lee
25e264507c Device policy: consistent javadoc and annotations
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted/fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: Iadfa78c5170bf4899a9daaf93c3d4e9d8b170a45
2015-06-02 11:55:21 -07:00
Robin Lee
49ec19ef6c Revert "Consistent documentation and annotations for DPMS"
This reverts commit 695142a17a.

Change-Id: Iaa2abe7e8bcecc5177a395b0dab8f66cc7100d3d
2015-06-02 18:25:28 +00:00
Robin Lee
695142a17a Consistent documentation and annotations for DPMS
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted or fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: I8d86d0968c2af3595f268828ea1625f1ed256d50
2015-06-02 11:15:34 -07:00
Amith Yamasani
af575b9f8e Temporarily whitelist an app for network during doze
API to allow an app to be whitelisted for network and wakelock
access for a short period. So even if the device is in idle
mode, such apps can be given a chance to download the payload
related to a high priority cloud-to-device message.

This API is meant for system apps only.

A new permission CHANGE_DEVICE_IDLE_TEMP_WHITELIST is required
to make this call.

Bug: 21525864
Change-Id: Id7a761a664f21af5d7ff55aa56e8df98d15511ca
2015-06-02 11:05:03 -07:00
Dianne Hackborn
4f57deb990 am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev
* commit '0d69c19dcdc3df11c28d3981b086c40e94d860be':
  Update VoiceInteractionService from API review.
2015-06-02 14:21:28 +00:00
Dianne Hackborn
9ed0c4109d Merge "Update VoiceInteractionService from API review." into mnc-dev 2015-06-01 22:28:45 +00:00
Dianne Hackborn
2ee5c368f8 Update VoiceInteractionService from API review.
This may even manage to retain compatibility with existing
binaries!  (For now.)

Change-Id: I3b1386287a6b9b20b57ac2e2444fd6f458837277
2015-06-01 11:42:04 -07:00
Barnaby James
fab12f200a am 4ead90a1: am 6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev
* commit '4ead90a1c200f144e91d176b4c1627b1bad37f45':
  Minor VoiceInteractor documentation fixes.
2015-06-01 17:09:02 +00:00
James Cook
fcce03b608 am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
* commit '3c668bac5a670999719e2a5c9d8a719b5422ea38':
  assist: Fix reported colors/styles for TextView/Switch
2015-06-01 15:26:00 +00:00
Barnaby James
6fad7e7f42 Merge "Minor VoiceInteractor documentation fixes." into mnc-dev 2015-05-30 21:57:48 +00:00
James Cook
63b6320af4 Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 2015-05-29 17:30:23 +00:00
James Cook
5cfaae4aae assist: Fix reported colors/styles for TextView/Switch
Changes to the data provided to AssistStructure:
* Text foreground color is correct even if the view has not yet been
painted.
* Text background color is now always 1 (TEXT_COLOR_UNDEFINED) for a
TextView, as it has no separate concept of background color.
* Switch now reports the text size/color/style of the label text
(usually user visible) rather than the on/off text on the button
itself (usually hidden in Material, and not usually revelant when
visible).

Bug: 21080375
Change-Id: I7e15f68d89510a76cab76031c2c8ca6ca3f32435
2015-05-28 15:52:44 -07:00
Dianne Hackborn
e6562d903b am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev
* commit 'da71e1004082427e36db21c39f47b13e0afa8ed4':
  Add new API to set URI on AssistContent.
2015-05-28 22:35:39 +00:00
Dianne Hackborn
4573dddcce Merge "Add new API to set URI on AssistContent." into mnc-dev 2015-05-28 21:35:41 +00:00
Dianne Hackborn
09d57fe9b3 Add new API to set URI on AssistContent.
Also rework how we transfer AssistContent and AssistStructure
to the assistant, so they are delivered as completely separate
objects rather than the kludgy bundling them in the assist
data thing.

Change-Id: Ib40cc3b152bafeb358fd3adec564a7dda3a0dd1d
2015-05-28 11:44:58 -07:00
Doris Liu
babeb97ed2 am 434a90c4: am 36e39974: Merge "Set a HW layer for Fragment alpha animation" into mnc-dev
* commit '434a90c4d845527f19a5f7ad046d32918bb7fba3':
  Set a HW layer for Fragment alpha animation
2015-05-28 01:32:32 +00:00
Doris Liu
36e3997451 Merge "Set a HW layer for Fragment alpha animation" into mnc-dev 2015-05-28 01:05:06 +00:00
Fyodor Kupolov
e3d88fc251 am 8d5f04d9: am 12e5fec2: Merge "Fixed indentation in setProfileName method" into mnc-dev
* commit '8d5f04d9690f6526c57612d72922f29cb78c1be6':
  Fixed indentation in setProfileName method
2015-05-28 00:26:12 +00:00
Fyodor Kupolov
12e5fec238 Merge "Fixed indentation in setProfileName method" into mnc-dev 2015-05-27 23:56:06 +00:00
Fyodor Kupolov
78f1314a69 Fixed indentation in setProfileName method
Change-Id: I819bfd509b184b7952d8f9c466c9418353f890cb
2015-05-27 16:52:45 -07:00
Barnaby James
b47c9e1a17 Minor VoiceInteractor documentation fixes.
BUG: 21393267
Change-Id: I4369693a92d312e8b744df09829f7d114c300be0
2015-05-24 12:10:47 -07:00
Amith Yamasani
fa41be53ee am 031f1bc9: am 7870550a: Merge "Add getPermissionGrantState method in device policy" into mnc-dev
* commit '031f1bc9ee6d79591e4bf2c4c30d616e87fc6f6b':
  Add getPermissionGrantState method in device policy
2015-05-23 00:26:32 +00:00
Amith Yamasani
7870550a1b Merge "Add getPermissionGrantState method in device policy" into mnc-dev 2015-05-23 00:05:47 +00:00
Doris Liu
de9284de88 Set a HW layer for Fragment alpha animation
Bug: 8554227
Change-Id: I58035001fe8f37a02dfe84e7ecd5074ab033129a
2015-05-22 16:45:02 -07:00
Amith Yamasani
184b3753de Add getPermissionGrantState method in device policy
This is to have a way to query what permission state was set by
the profile owner.

Bug: 21356830
Change-Id: Ie396e946b4285267c1d95f82b9d9765b43697d3c
2015-05-22 13:55:57 -07:00
Dianne Hackborn
271e92c197 am da517da8: am fa4d547d: Merge "Improve reporting to apps of transaction too large failures." into mnc-dev
* commit 'da517da8d9292cf12465545528ad6e11bbc79d0a':
  Improve reporting to apps of transaction too large failures.
2015-05-22 19:17:36 +00:00
Dianne Hackborn
ad15bee4ff am c60f010e: am 8b20cdb2: Merge "Add API to track usage time of apps." into mnc-dev
* commit 'c60f010edcb197451d087207b0c9527d74cff245':
  Add API to track usage time of apps.
2015-05-22 01:37:15 +00:00
Dianne Hackborn
e5c4262109 Improve reporting to apps of transaction too large failures.
If the app tried to do various things with too much data --
starting an activity, starting a service, sending a broadcast --
this would fairly silently fail with little indication of what
was going on.  Fix this in two ways:

- Now when the native code generates a TransactionTooLargeException,
  it may include an additional message in it telling you how much
  data was in the parcel being sent, to help you understand why
  this happening.

- In all the framework code paths where we call to the system and
  may fail, convert these failures into a a runtime exception and
  rethrow them back to the app so that it will clearly get the
  above message.

Change-Id: I745159b97d3edb6fca86aa09cbc40c1f15a7d128
2015-05-21 18:19:50 -07:00
Dianne Hackborn
8b20cdb27b Merge "Add API to track usage time of apps." into mnc-dev 2015-05-22 01:12:44 +00:00
Craig Mautner
f41e2e6391 am 4c20f59f: am 15dddf38: Merge "For getHomeActivity() only return current user." into mnc-dev
* commit '4c20f59f76fc6a7c5c4dc3d6e3087395cf5686de':
  For getHomeActivity() only return current user.
2015-05-22 00:00:15 +00:00
Dianne Hackborn
b5a380d409 Add API to track usage time of apps.
This adds a new ActivityOption for the caller to ask the
system to track the time the user is in the app it launches,
delivering the result when they are done.

The time interval tracked is from when the app launches the
activity until the user leaves that app's flow.  They are
considered to stay in the flow as long as new activities
are being launched or returned to from the original flow,
even if they cross package or task boundaries.  For example,
if the originator starts an activity to view an image, and
while there the user selects to share, which launches gmail
in a new task, and they complete the share, the time during
that entire operation will be included.

The user is considered to complete the operation once they
switch to another activity that is not part of the tracked
flow.  For example, use the notification shade, launcher, or
recents to launch or switch to another app.  Simply going
in to these navigation elements does not break the flow
(although the launcher and recents stops time tracking of
the session), it is the act of going somewhere else that
completes the tracking.

The data is delivered to the app through a PendingIntent,
which includes the total time the app was in the flow along
with a time break-down by app package.

Change-Id: If1cf8892d422c52ec5042eba0e15a8e7e8f83abf
2015-05-21 16:45:29 -07:00