Christopher Tate
1ecb55a2be
Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev
...
am: 71f4e14
2016-04-05 23:24:59 +00:00
Chris Tate
71f4e14402
Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev
2016-04-05 21:51:20 +00:00
George Mount
5f2be085d2
Merge "Restore fragment transaction animation state information." into nyc-dev
...
am: dc63f7c6
2016-04-05 17:36:11 +00:00
George Mount
dc63f7c624
Merge "Restore fragment transaction animation state information." into nyc-dev
2016-04-05 17:27:34 +00:00
Robin Lee
892af97b0b
Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev
...
am: 691b1a6
2016-04-05 14:13:30 +00: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
ea0186c2c1
Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev
...
am: a149c42
2016-04-05 02:28:26 +00:00
Adam Lesinski
a149c42071
Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev
2016-04-05 02:22:52 +00: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
7fc8b9ce48
Merge "Support direct-boot tests." into nyc-dev
...
am: 7d718bb
* commit '7d718bb252fe2bdee0c9c728a1e6e4892deb8ac7':
Support direct-boot tests.
Change-Id: I65205c39260d68130de4787eb2be724006ff8a66
2016-04-03 04:07:02 +00: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
eeb25cb544
Merge "Don\'t performPendingDeferredStart on fragments that aren\'t added" into nyc-dev
...
am: 7af7e3d
2016-04-02 01:27:09 +00: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
5e61e92f11
Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev
...
am: 1747022
2016-04-01 23:19:10 +00:00
George Mount
1747022004
Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev
2016-04-01 23:06:59 +00:00
Joe LaPenna
6a935d1aa8
Merge "Fix NPE in AlarmManager.cancel(...)" into nyc-dev
...
am: f38aa6b
2016-04-01 22:29:34 +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
Alan Viverette
b02fc79930
Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev
...
am: f045808
2016-04-01 20:27:19 +00: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
Adam Lesinski
75babad207
Merge "ResourcesManager: Fix a cache issue" into nyc-dev
...
am: ce2a399
2016-04-01 19:05:10 +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
1174768d99
Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev
...
am: 228137f
2016-04-01 18:34:39 +00: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
ceeab499ac
Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev
...
am: 032a76f
2016-04-01 16:27:01 +00: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
Kenny Guy
5ad78dbd4c
Merge "Allow PO to check if it is in a managed profile." into nyc-dev
...
am: fa7b672
2016-04-01 14:29:00 +00:00
Kenny Guy
fa7b6723e6
Merge "Allow PO to check if it is in a managed profile." into nyc-dev
2016-04-01 14:23:51 +00:00
Clara Bayarri
89203de878
Remove unused import for KeyboardShortcutGroup
...
Left it in accidentally when removing default method.
Change-Id: I6af0712624ffaefff4cb4ad2a9e5a86d7104d2e7
2016-04-01 14:40:34 +01:00
Christopher Tate
e6dc55c327
Merge "API review: WallpaperManager" into nyc-dev
...
am: 9c4ec06
2016-03-31 19:33:49 +00:00
Chris Tate
9c4ec06988
Merge "API review: WallpaperManager" into nyc-dev
2016-03-31 19:24:42 +00:00
Robin Lee
8d0373c8fd
Merge "API to approve CA certificates" into nyc-dev
...
am: f1fe782
2016-03-31 18:31:32 +00:00
Robin Lee
f1fe782e91
Merge "API to approve CA certificates" into nyc-dev
2016-03-31 18:26:32 +00:00
Joe Onorato
d1d3cfb1b6
Merge "Include process state in association tracking" into nyc-dev
...
am: d0f83b7
2016-03-31 17:49:18 +00:00
Joe Onorato
d0f83b7bca
Merge "Include process state in association tracking" into nyc-dev
2016-03-31 17:09:24 +00:00
Robin Lee
2f7e1e487c
API to approve CA certificates
...
Bug: 18224038
Change-Id: Id928872cd70dac5a5ecfdcd52150fe6dea544e3b
2016-03-31 18:06:44 +01:00
Kenny Guy
ffa3840cf3
Allow PO to check if it is in a managed profile.
...
Method was @hide because we only intended to add
managed users in a later release, however we added
createAndManageUser which allows it.
Bug: 27261765
Change-Id: I029f8ef35a3065f7fc598b5f854c8d8cdc9c555d
2016-03-31 16:40:57 +01:00
Andrei Stingaceanu
4c0fc48aa7
Merge "AfW - suspend apps - API polish" into nyc-dev
...
am: aa60469
2016-03-31 15:36:58 +00:00
Andrei Stingaceanu
aa60469445
Merge "AfW - suspend apps - API polish" into nyc-dev
2016-03-31 10:57:58 +00:00
Michal Karpinski
2d884a207b
Merge "Adjusting javadocs for process logging" into nyc-dev
...
am: 31f59f1
2016-03-31 10:02:57 +00:00
Michal Karpinski
31f59f1106
Merge "Adjusting javadocs for process logging" into nyc-dev
2016-03-31 09:56:24 +00:00
