Commit Graph

7588 Commits

Author SHA1 Message Date
Benjamin Franz
5c1fbadb1a Merge "Throw security exception for non-parent aware APIs" into nyc-dev 2016-04-08 12:02:26 +00:00
Jorim Jaggi
7c3912e4ab Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev 2016-04-07 23:40:44 +00:00
Tim Murray
d8ca02f252 Merge "Improve service start/creation tracing." into nyc-dev 2016-04-07 23:19:38 +00:00
Jorim Jaggi
d53f09254e Dismiss docked stack when opening non-resizable activity
- Also move the toast to SysemUI as a cleanup.

Bug: 27341740
Bug: 28026841
Change-Id: Ic6196ed75511751c6fadb12fa24574c881100f65
2016-04-07 16:07:27 -07:00
Tim Murray
b6f5a4292b Improve service start/creation tracing.
bug 27998068

Change-Id: If18ab5d293f0bb0dfbfbed2f2af383c349464963
2016-04-07 15:37:43 -07:00
Alexander Hills
5418765d4d Merge "Adds support for MessagingStyle" into nyc-dev 2016-04-07 19:59:20 +00:00
Alex Hills
fc737def02 Adds support for MessagingStyle
This change adds support for the new MessagingStyle, which
supports a fully back-and-forth messaging/chat experience
within the notification display itself.

Bug:28043958
Change-Id: Ibb9c2a0784f028d8cf01bd3cee4fecc5f72d68cd
2016-04-07 15:19:14 -04:00
Phil Weaver
d408b995c3 Merge "Allow tests to change UiAutomation flags." into nyc-dev 2016-04-07 16:35:27 +00:00
Ricky Wai
035e924470 Fix work profile screen timeout policy
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.

Bug: 27493348
Change-Id: Ia1ec1cafc7665c54816833af64e0f446a77a55b2
2016-04-07 17:16:03 +01:00
Alexander Hills
a5ec16e367 Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev 2016-04-07 13:52:58 +00:00
Benjamin Franz
bd7ae782ed Throw security exception for non-parent aware APIs
When the parent instance of DPM is used to call an API that is not
parent-aware, we should throw a security exception.

Bug: 27532279
Change-Id: I90abeb4c8522cb9af798301c1bb2048579596993
2016-04-07 10:15:02 +01:00
Alex Hills
9ab3a238b3 Adds a content-intent-launching-activity flag to WearableExtender
This adds a flag to WearableExtender (and Action.WearableExtender)
indicating that the attached ContentIntent will launch an activity
on Wear, which lets the platform know that it can (and should)
generate a sleek transition for the launching of said intent (as
opposed to the intent causing change in the background).

Bug:28019194
Change-Id: Id8b422ea52c5e941e38558aaf31ce2cf4bb7c6f3
2016-04-06 17:20:11 -04:00
Selim Cinek
f2a587b424 Merge "Changed the default if the notification time is shown" into nyc-dev 2016-04-06 20:48:09 +00:00
Selim Cinek
82404bc068 Merge "Deprecated the contentinfo and the number" into nyc-dev 2016-04-06 20:45:56 +00:00
Selim Cinek
0ff1ce6075 Changed the default if the notification time is shown
By default the notification time is not shown anymore.

Bug: 27431551
Change-Id: I68f19450d0de795a51644e939a3fd64366c0abb6
2016-04-06 12:22:46 -07:00
Selim Cinek
0f9dd1e2f5 Deprecated the contentinfo and the number
It was mainly adding noise to the notification
rather than useful information.

Bug: 27431551
Change-Id: Ie22c9935d60eeac1cca5d9ce97239aadfac9b3cf
2016-04-06 12:18:31 -07:00
Tony Mak
a01c1f0d90 Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev 2016-04-06 18:39:21 +00:00
Adam Powell
c0eb067ceb Merge "Fragment#setUserVisibleHint guard" into nyc-dev 2016-04-06 17:26:53 +00:00
Robin Lee
589b855719 Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev 2016-04-06 17:01:24 +00:00
Adam Powell
3e10ae927c Fragment#setUserVisibleHint guard
Bug 28026606

Change-Id: I109bce6ecd35feaa045b61a7226b2a19344d2cda
2016-04-06 09:57:40 -07:00
Julia Reynolds
fa305fcc6b Merge "Documentation update for interruption filters." into nyc-dev 2016-04-06 15:34:09 +00:00
Robin Lee
ee5eb934e3 Remove bool return from setAlwaysOnVpnPackage
Bug: 27533151
Change-Id: I4c656488e69cb5247dbb9cfd62d6f6f7043f9a90
2016-04-06 16:30:22 +01:00
Julia Reynolds
dd0605b052 Documentation update for interruption filters.
Bug: 27901142
Change-Id: I977f7dc4010dc826e06dfb01ad6db68380b80fde
2016-04-06 10:33:14 -04:00
Benjamin Franz
4a53c8e702 Merge "Document which APIs are callable on the parent instance" into nyc-dev 2016-04-06 12:17:26 +00:00
Benjamin Franz
66b45f01ff Document which APIs are callable on the parent instance
In DPM it is possible to retrieve a parent instance to set policies
that are applied to the profile parent. Extend the javadoc to clarify
which APIs are actually callable on the parent instance.

Bug: 27532279
Change-Id: I7ed40f8c3c7c3089283489bff41a04c70239d5a4
2016-04-06 11:59:49 +01:00
Chris Tate
71f4e14402 Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev 2016-04-05 21:51:20 +00:00
George Mount
dc63f7c624 Merge "Restore fragment transaction animation state information." into nyc-dev 2016-04-05 17:27:34 +00:00
Tony Mak
089d840383 xxxTrustAgentConfiguration should be supported in the parent DPM instance
1. Fix trust agent config does not persist across reboot
2. xxxTrustAgentConfiguration now supported in parent DPM instance

Bug: 27601827

Change-Id: I6ea4a089bf590d6c44be40318f3a69c35c54f796
2016-04-05 17:42:55 +01:00
Robin Lee
691b1a6005 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 2016-04-05 14:04:40 +00:00
Adam Lesinski
a149c42071 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 2016-04-05 02:22:52 +00:00
Phil Weaver
d8e88836fe Allow tests to change UiAutomation flags.
Changing Instrumentation to modify the existing
UiAutomation when one with different flags is requested.

Also checking if UiAutomation is destroyed before disconnecting at the
end of a test.

Bug: 27365874
Bug: 27864279
Change-Id: Ia6efc4f89cc30dbe29286f30f8e9cb8f6fdb4712
2016-04-04 17:52:17 -07:00
Adam Lesinski
3ad1b4899f Fix issue with overridden configuration in onConfigurationChanged
When using applyOverrideConfiguration, subsequent callbacks to
onConfigurationChanged didn't take into account the locally overridden
configuration. This patches the incoming configuration to match
what is expected by the application.

Bug:27644297
Change-Id: I3a090e9862a56470d999aa0aa4d5bae29f533a11
2016-04-04 15:24:48 -07:00
Christopher Tate
d43879c5e4 API feedback: clarify onQuotaExceeded() documentation
Bug 27530914

Change-Id: I5d185cfe9c7e0392a26d84e0e60d210ed6755016
2016-04-04 12:54:43 -07:00
George Mount
41fb99480c Restore fragment transaction animation state information.
Bug 17487986

Change-Id: Ic5154b0dd00f07804a1008f8b9f8328f1b2ec06c
2016-04-04 12:32:44 -07:00
Jeff Sharkey
7d718bb252 Merge "Support direct-boot tests." into nyc-dev 2016-04-03 03:59:23 +00:00
Jeff Sharkey
b5e89c6deb Support direct-boot tests.
Add shell commands to check on current FBE status and system ready
status.  Mark variables without first-class locking as volatile.

Fix bug where UI automation would crash while device was locked by
marking it as forced direct-boot aware.

Bug: 26498834
Change-Id: Ib4dfb9350925e5413f93a09baacf84c62f2ba0ea
2016-04-02 19:31:19 -06:00
Adam Powell
7af7e3d18e Merge "Don't performPendingDeferredStart on fragments that aren't added" into nyc-dev 2016-04-02 01:09:00 +00:00
George Mount
1747022004 Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev 2016-04-01 23:06:59 +00:00
Adam Powell
b963c99c3a Don't performPendingDeferredStart on fragments that aren't added
Framework edition

When setting a user visibility hint on a fragment it was possible to
have a FragmentManager already set due to a transaction being composed
but before the commit, so only checking that we have one isn't
sufficient for determining whether we should perform a pending
deferred start. This could happen easily with ViewPager adapters. Use
isAdded() instead.

Also fix a bug where we could set our internal tracking of fragments
that need a deferred start incorrectly.

Bug 27814550

Change-Id: I3be65728650c48d27a3a9dd4ca15f52006d14ab9
2016-04-01 15:29:04 -07:00
Joe LaPenna
f38aa6ba2b Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev 2016-04-01 22:22:46 +00:00
Joe LaPenna
33ee4bf18b Fix NPE in AlarmManager.cancel(...)
If AlarmManager.cancel is called before any component has had a chance
to register an alarm, sWrappers will not have been set, as it is only
initialized in setImpl.

When cancelling an alarm and sWrappers does not exist, log a warning and
return early.

BUG: 27972657
Change-Id: Ied10719ba1d154f97eecfc32f429fd9ce39bf747
2016-04-01 14:07:35 -07:00
George Mount
056b7d5403 Removed improper check on mCalledExitCoordinator.
Bug 27969302

mCalledExitCoordinator can be nulled before the onResume is called,
so it cannot be used to determine whether or not the Activity is
a caller or called.

Change-Id: Ie3696ed59b89cfc8c6145d22bc230111f0813701
2016-04-01 13:19:35 -07:00
Alan Viverette
f04580852d Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev 2016-04-01 20:17:16 +00:00
Alan Viverette
48728c2179 Clean up Dialog annotations, lint warnings, and declarations
No functional changes.

Change-Id: If38c9d829d83e762f8c2d05c2fe060c56804b38f
2016-04-01 15:00:10 -04:00
Adam Lesinski
ce2a399032 Merge "ResourcesManager: Fix a cache issue" into nyc-dev 2016-04-01 18:53:22 +00:00
Adam Lesinski
0cd9a7ea3b ResourcesManager: Fix a cache issue
Forgot to cache the creating of ResourcesImpl during an Activity
override config update.

Bug:27644297
Change-Id: I65d9086f6d32f5adc7231aa3a1797d4f00c4b9a9
2016-04-01 11:48:10 -07:00
Alan Viverette
228137fa26 Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev 2016-04-01 18:22:20 +00:00
Alan Viverette
a9a75f506e Refactor DatePickerDialog constructors to avoid early callback
Bug: 27475444
Change-Id: I2536f969ca734f3977163305c1d33ee0e2e222fc
2016-04-01 13:22:10 -04:00
Clara Bayarri
032a76f94b Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev 2016-04-01 16:18:28 +00:00
Robin Lee
ce5c4009cf Switch to work challenge if MP calls resetPassword
If the profile owner wants to set a lock screen for a profile which they
created, we should let them. This will cancel any lock screen
unification that has been set up.

Attempting to clear the password will continue to throw
SecurityException if called from a managed profile.

Bug: 26682008
Change-Id: Ia09aef879a21c074ccb517905e43f62696837998
2016-04-01 16:12:32 +00:00