Commit Graph

6067 Commits

Author SHA1 Message Date
Dianne Hackborn
2133afc77a am d21b695f: am 22433a33: Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev
* commit 'd21b695f8b344b12e623694db86856a89642d934':
  Fix issue #21814207 and issue #21814212 (alarm manager)
2015-06-17 22:43:51 +00:00
Chris Wren
93b046d64f am 65d94514: am e222a444: Merge "Revert "remove setLatestEventInfo"" into mnc-dev
* commit '65d94514c90566ce4b8298b091357616a5bcb69c':
  Revert "remove setLatestEventInfo"
2015-06-17 21:27:08 +00:00
Chris Wren
e222a44429 Merge "Revert "remove setLatestEventInfo"" into mnc-dev 2015-06-17 21:03:24 +00:00
Chris Wren
dfdb52abe6 Revert "remove setLatestEventInfo"
This reverts commit 965097321d.

Change-Id: I658bb2611fe8f983309e962d6772d1bd80ed586e
2015-06-17 21:03:11 +00:00
Chris Wren
824bd9e0f2 am 59489bb3: am c20c1eec: Merge "remove setLatestEventInfo" into mnc-dev
* commit '59489bb3b5b7c89dcaa66f53edb9fc1da4655333':
  remove setLatestEventInfo
2015-06-17 20:30:17 +00:00
Chris Wren
c20c1eec9e Merge "remove setLatestEventInfo" into mnc-dev 2015-06-17 20:05:11 +00:00
Dianne Hackborn
a750a63d63 Fix issue #21814207 and issue #21814212 (alarm manager)
Issue #21814207: AlarmManager.setAndAllowWhileIdle should also allow wake locks.

Introduce a whole new infrastructure for providing options when
sending broadcasts, much like ActivityOptions.  There is a single
option right now, asking the activity manager to apply a tempory
whitelist to each receiver of the broadcast.

Issue #21814212: Need to allow configuration of alarm manager parameters

The various alarm manager timing configurations are not modifiable
through settings, much like DeviceIdleController.  Also did a few
tweaks in the existing DeviceIdleController impl.

Change-Id: Ifd01013185acc4de668617b1e46e78e30ebed041
2015-06-17 11:41:45 -07:00
Rubin Xu
befbdb00f9 am a4f1642b: am dd862aeb: Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev
* commit 'a4f1642ba16c13779d6a8ef187096259bcd1fd6f':
  Deprecate SHA-1 in ManagedProvisioning (API doc change)
2015-06-16 21:25:28 +00:00
Chirag Shah
3db44d08ea am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev
* commit 'f40f46e94c773676158b3f7e9cd51157cc9a91d2':
  Allow 3P apps to provide structured data within AssistContent.
2015-06-16 21:24:48 +00:00
Benjamin Franz
3be79152cf am 84e38f68: am dbc86ad1: Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
* commit '84e38f687819e47ffe3bae1fd2588d0f22fafa90':
  Update documentation for PASSWORD_QUALITY_SOMETHING
2015-06-16 21:24:20 +00:00
Narayan Kamath
ba6e9b12a2 am 2d13fe56: am 275294db: Merge "Better systrace slices for application startup." into mnc-dev
* commit '2d13fe56eec54030fe09cae74c7a92be54c8bd19':
  Better systrace slices for application startup.
2015-06-16 21:24:04 +00:00
Rubin Xu
dd862aebda Merge "Deprecate SHA-1 in ManagedProvisioning (API doc change)" into mnc-dev 2015-06-16 18:15:33 +00:00
Chirag Shah
7f92f06742 Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 2015-06-16 16:54:03 +00:00
Benjamin Franz
dbc86ad170 Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev 2015-06-16 13:22:22 +00:00
Narayan Kamath
fbb32f6440 Better systrace slices for application startup.
This change adds three new timeslices :

- PostFork : As soon as possible after the app forks from the
  zygote. Can be used in conjunction with the system_server
  "Start proc:" event to derive an upper bound on fork() and
  zygote overhead.

- RuntimeInit & ActivityThreadMain for ZygoteInit#runtimeInit
  and ActivityThread#main.

ActivityThread#handleBindApplication and higher level functions
are already well instrumented in systrace. handleBindApplication
should occur immediately after ActivityThread#main.

Note that we use the Activity manager tag to make it easier to
correlate these new events with surrounding events (Start proc
and handleBindApplication) that are already using the AM tag.

bug: 21632700
Change-Id: Ibc01f1721f962c913f3c02a51763b6feb1eb6a4d
2015-06-16 12:06:31 +01:00
Benjamin Franz
c6a9653e0a Update documentation for PASSWORD_QUALITY_SOMETHING
Add a mention that PASSWORD_QUALITY_SOMETHING includes patterns.

Bug: 20441473
Change-Id: I2608f36e338fb2bfbace80d49ee805841d59fa17
2015-06-16 11:23:38 +01:00
Chirag Shah
61f794a70f Allow 3P apps to provide structured data within AssistContent.
For providing structured metadata to the assistant, we've decided to
standardize on JSON-LD (met with Paige/Ulas/Fabian), and decided the
data to be specified via:

AssistContent.setStructuredData(String structuredDataJson)

This method can be documented for 3P developers as allowing developers
to provide metadata to the assistant with the JSON-LD standard.

This would be centered more about content displayed on the screen,
rather than actions based, so we added it to the AssistContent class

Updated doc: go/setStructuredData

Change-Id: I816f69fd6896df822e30d6c71d840bd01f47e544
2015-06-15 17:48:41 -07:00
George Mount
8acb658b2a am c28834f7: am 8af78483: Merge "Limit shared element transition to shared elements and children." into mnc-dev
* commit 'c28834f7786bbbd1452bf7b33b21b5e7438365e5':
  Limit shared element transition to shared elements and children.
2015-06-15 20:07:45 +00:00
George Mount
8af7848355 Merge "Limit shared element transition to shared elements and children." into mnc-dev 2015-06-15 19:43:57 +00:00
Rubin Xu
d92e75776c Deprecate SHA-1 in ManagedProvisioning (API doc change)
Bug: 21153521
Change-Id: Ie4ee70063457260e147e6c00458f96ccc6a425e0
2015-06-15 14:43:48 +01:00
Chris Wren
965097321d remove setLatestEventInfo
Bug: 18510449
Change-Id: I2f950b92a9c13fc29bf5642d44fd2fcce79e65fd
2015-06-15 08:22:05 -04:00
Svet Ganov
d85e7d06e0 am 174b86de: am 715cf2ac: Make AppOpsManager#permissionToOp API public
* commit '174b86dede42cf63c99d16f32f312069e9c74634':
  Make AppOpsManager#permissionToOp API public
2015-06-14 01:36:18 +00:00
Svet Ganov
715cf2ac0b Make AppOpsManager#permissionToOp API public
We need this API to implement permission checker API
in the support lib that takes into account both app
ops and permissions.

bug:21277214

Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
2015-06-14 00:50:38 +00:00
Dianne Hackborn
2712ce948a am 6e2fb78f: am e554cc96: Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev
* commit '6e2fb78fbe3ce50182f0ad928748aeada57a44cf':
  Implement some control over ALLOW_WHILE_IDLE alarms.
2015-06-12 19:54:28 +00:00
Chris Wren
604f6cf113 am 63cae6c8: am 17de4b2a: Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev
* commit '63cae6c8caa77b6b1cdc45423ed6ec771f6c485b':
  remove usage of deprecated method setLatestEventInfo
2015-06-12 19:54:23 +00:00
Dianne Hackborn
e554cc9659 Merge "Implement some control over ALLOW_WHILE_IDLE alarms." into mnc-dev 2015-06-12 19:38:39 +00:00
Dianne Hackborn
3d1933c45f Implement some control over ALLOW_WHILE_IDLE alarms.
Since these alarms allow you to bypass the idle restrictions,
we don't want them to be so open-ended like other alarms.  This
implements a policy where the alarm manager will only deliver these
types of alarms every X minutes to each application.  For this
initial implementation, X is 1 minute under normal operation and
15 minutes when in idle mode.

To do this, I needed to introduce a new internal allow-while-idle
flag for system alarms, which applications can't get, and doesn't
have these new restrictions.

Also tweaked how the alarm manager handles the alarm window, so it
doesn't change if the alarm gets rescheduld; the window is now always
what as computed based on the time when the alarm was first
given to it.

Finally, fix TimeUtils to be able to correctly print times that
are > 999 days.

Change-Id: Ibad8c6a7c14b0624b54e82267be23224b4c31e84
2015-06-12 12:37:35 -07:00
Chris Wren
17de4b2a73 Merge "remove usage of deprecated method setLatestEventInfo" into mnc-dev 2015-06-12 19:28:54 +00:00
Rubin Xu
b8fd9182d6 am 23d5a49b: am 6161eb34: Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev
* commit '23d5a49bf3a36f0431154ecc4d8776a3d44e94d0':
  Update doc of ACTION_PROVISION_MANAGED_DEVICE
2015-06-12 18:54:19 +00:00
Rubin Xu
6161eb3494 Merge "Update doc of ACTION_PROVISION_MANAGED_DEVICE" into mnc-dev 2015-06-12 18:27:45 +00:00
Dianne Hackborn
ccd6d0c14d am d55860d9: am 8a435ced: Merge "Fix APIs." into mnc-dev
* commit 'd55860d990587509f0e9624c44494172f3e24714':
  Fix APIs.
2015-06-12 17:31:21 +00:00
Dianne Hackborn
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00
Alex Klyubin
88fc537102 am d3f2657e: am 738241f9: Merge "Document that DownloadManager supports HTTPS." into mnc-dev
* commit 'd3f2657ee3655eb07d3772d6ce0b7fdbfe2cf48d':
  Document that DownloadManager supports HTTPS.
2015-06-12 16:22:43 +00:00
Alex Klyubin
738241f93c Merge "Document that DownloadManager supports HTTPS." into mnc-dev 2015-06-12 16:02:17 +00:00
Rubin Xu
a4f9dc1cf0 Update doc of ACTION_PROVISION_MANAGED_DEVICE
It also supports an optional extra EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE

Bug: 21797182
Change-Id: Ie145e6a79dd7eebdbb4cc58e1baba761b9cc5bbf
2015-06-12 15:18:59 +01:00
Chris Wren
1ce4b6d3c6 remove usage of deprecated method setLatestEventInfo
Bug: 18510449
Change-Id: I56a77991c729990e501f402e007dfa79ee57621e
2015-06-12 10:16:04 -04:00
Rubin Xu
d841ebb7e7 am c13ea212: am 5c82d2cc: Change references to APK Certificate to Signature
* commit 'c13ea21249455708a5d1ffb42ef0a4751214c6b1':
  Change references to APK Certificate to Signature
2015-06-12 10:17:44 +00:00
Rubin Xu
5c82d2cc17 Change references to APK Certificate to Signature
The fact that currently apk signature is certificates is just
implementation details.

Bug: 20820366

Change-Id: Icdd02cb51a550ea71ff83a84e2bdfcc21f8d43ed
2015-06-12 10:32:24 +01:00
Dianne Hackborn
ece0f4f519 Fix APIs.
Issue #21039494: API Review: android.os.PowerManager.isDeviceIdleMode()
Issue #21347000: API Review: android.content.IntentFilter
Issue #20654534: API Review: android.app.assist

Also allow use of ActivityManager.setWatchHeapLimit on any platform
build as long as the calling app is debuggable.

Change-Id: Ic597e596fa772fcdf2553b64f444b3d9269e8b92
2015-06-11 18:07:43 -07:00
Adam Lesinski
6b7d2ec164 am 9598abea: am 2e49bfa6: Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev
* commit '9598abea3160328bbf98ca5eb04f7b1502417469':
  UsageStats: Change INTERACTION to SYSTEM_INTERACTION
2015-06-11 22:43:20 +00:00
Dmitriy Ivanov
4aad8a4c0d am ff004b9f: am 99fc7e95: Merge "Add path to native libraries inside apk" into mnc-dev
* commit 'ff004b9f2f5d6e3fdae82548d74681e9789b8b51':
  Add path to native libraries inside apk
2015-06-11 22:16:56 +00:00
Adam Lesinski
2e49bfa6f0 Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" into mnc-dev 2015-06-11 22:02:37 +00:00
Adam Lesinski
c8e8729244 UsageStats: Change INTERACTION to SYSTEM_INTERACTION
SYSTEM_INTERACTION events are signals to the system for a package's
implicit actions (service bound, etc).

These should not affect the API visible stats like lastTimeUsed, etc.
USER_INTERACTION is for user initiated actions (notification interaction, etc).

Bug:21761781
Change-Id: I4585cf35fbb158612a3c737710108bec34e89183
2015-06-11 22:01:45 +00:00
Dmitriy Ivanov
99fc7e95c5 Merge "Add path to native libraries inside apk" into mnc-dev 2015-06-11 21:55:01 +00:00
Alex Klyubin
66629bc540 Document that DownloadManager supports HTTPS.
Bug: 14112655
Change-Id: I37708553b7ae2f48dcd574f3c66daa8dfdd00f3a
2015-06-11 14:34:44 -07:00
George Mount
c855f7d08f Limit shared element transition to shared elements and children.
Bug 20257189

Shared element transitions should target the shared elements
or their children. When no target is given to a transition,
the transition should target the shared element. If a target
is given, it should also be able to target the children of
the shared element.

This is solved by wrapping the shared element transition
with a TransitionSet. The set is given the targets of all
shared elements and their children. Further, if no target
is given for a transition, the transition is given only
the shared elements as targets.

Change-Id: Ic015ca12e291ccbb47e20a49b11e3825da3e6e85
2015-06-11 13:23:17 -07:00
Craig Lafayette
6c5acdbc93 am 7ff09f2b: am 77b2d49a: Merge "Remove device initializer status messages" into mnc-dev
* commit '7ff09f2be0be1ad5f9c7b9dce31084522fb30608':
  Remove device initializer status messages
2015-06-11 18:08:58 +00:00
Craig Lafayette
77b2d49abb Merge "Remove device initializer status messages" into mnc-dev 2015-06-11 17:45:03 +00:00
Benjamin Franz
95b555fc90 am 8b5c2e8a: am d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev
* commit '8b5c2e8acd01c87204ba0b842a35c625be174e5b':
  Align the behaviour of different lock task modes
2015-06-11 16:38:36 +00:00
Benjamin Franz
d168d184c0 Merge "Align the behaviour of different lock task modes" into mnc-dev 2015-06-11 16:15:37 +00:00