Commit Graph

53319 Commits

Author SHA1 Message Date
Felipe Leme
46475e4028 Merge "Clarified usage of onDetach() and onCreate() when setRetainInstance() is set to true. BUG: 25455734" 2015-11-05 02:19:06 +00:00
Chris Tate
adf0698b40 Merge "Make WorkSource version of alarm listener API @SystemApi" 2015-11-05 02:02:49 +00:00
Chris Tate
e6ae842365 Merge "Docs: be explicit about oldState contract for backup helpers" 2015-11-05 01:49:24 +00:00
Christopher Tate
1203aa05f8 Docs: be explicit about oldState contract for backup helpers
Call out specifically that each helper must only consume the
prior-state data that it produced in the first place, not reading
beyond its own part of the state file.

Bug 25473872

Change-Id: I1f24a5738a799eb21d966510372a0f3852436166
2015-11-04 17:35:17 -08:00
Tomasz Mikolajewski
0c55387059 Merge "Add support for opening files in specified MIME type to DocumentsProvider." 2015-11-04 23:17:14 +00:00
Chris Tate
49ab8dd5f3 Merge "Fix BlobBackupHelper state tracking" 2015-11-04 21:42:55 +00:00
Riley Andrews
29869c3893 Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d am: 2c740f1dcf am: 6c1144dc0f
am: 132bb1e4b1

* commit '132bb1e4b10755d2bc0810135511fd999badbe4b':
  Convert ashmem bitmap thresholds to constants.
2015-11-04 20:43:38 +00:00
Riley Andrews
132bb1e4b1 Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am: c8bb39d98d am: 2c740f1dcf
am: 6c1144dc0f

* commit '6c1144dc0f8b2452ca2a204ca471e2d23339d5a3':
  Convert ashmem bitmap thresholds to constants.
2015-11-04 20:37:18 +00:00
Riley Andrews
2c740f1dcf Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
am: c8bb39d98d

* commit 'c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
  Convert ashmem bitmap thresholds to constants.
2015-11-04 20:24:36 +00:00
Julia Reynolds
f3d8f26034 Merge changes I49660236,I56a7970a
* changes:
  Delete unused code.
  Unhide setting for CTS testing.
2015-11-04 19:44:49 +00:00
Christopher Tate
f2d753ec46 Make WorkSource version of alarm listener API @SystemApi
WorkSource is not public API but this should be available to
system support modules.

Change-Id: I7283ab8aa5c5e298959d21a5c8fe55ed119bc6a3
2015-11-04 11:30:52 -08:00
Christopher Tate
e491d142b2 Fix BlobBackupHelper state tracking
The disk-friendly use of BufferedInputStream in state parsing was
actually breaking the state management system when multiple helpers
are involved in backup.  The BufferedInputStream would blithely
pre-fetch 8K from the state file -- but that would consume some
state data that the dispatcher and subsequent helpers needed to see
in order to properly evaluate prior state themselves.  The contract
here is that when using the helper mechanism, state-data consumption
must *only* consume as much data as the helper originally stored
into the file.

Switching to a direct-read stream instead fixes the problem by
avoiding read overrun.  The rest of the changes are expanded
debugging output that made diagnosis possible.

Bug 25473872

Change-Id: I91de38dfec96f589700479f41ac26f144ba4463c
2015-11-04 10:57:37 -08:00
Chong Zhang
d564792383 Merge "Construct ActivityOptions near top level" 2015-11-04 18:56:34 +00:00
Filip Gruszczynski
3958658c71 Merge "Remove blink during the freeform -> recents transition." 2015-11-04 18:55:06 +00:00
Chong Zhang
280d332bd4 Construct ActivityOptions near top level
This saves some duplicate constructions of the ActivityOptions
object from Bundle.

Bug: 23755120
Change-Id: Ie8be54a2e4e84a6a1f3c51e4f2966f7fb0bf1c28
2015-11-04 10:41:26 -08:00
Filip Gruszczynski
14b4e57c1b Remove blink during the freeform -> recents transition.
We achieve the desired result by prolonging the last frame of the
animation until recents tells that it drew its content. The CL also
includes cleanup that moves code that depends heavily on WindowState
fields into that class.

Bug: 24913782
Change-Id: I5ee5b18504dd4a86c24033d17eca21cd31936bca
2015-11-04 09:53:22 -08:00
Clara Bayarri
f7fea166d4 Intercept activity start with ConfirmCredentials
When the calling user is a work profile and the device has
file based encryption enabled, show the work challenge via the
Confirm Credentials APIs before launching the requested activity.

A companion CL in Settings will add support to the Confirm
Credentials flow to read the given intent extra and fire it when
the authorization succeeds.

This is part of the Separate Work Challenge feature.
Note nobody will see this yet as the feature is conditioned by
file based encryption.

Change-Id: I303890095936b1fd1f6a99d645724dffba144345
2015-11-04 16:46:41 +00:00
Clara Bayarri
243336b3f9 Merge "Create a File Based Encryption check API" 2015-11-04 16:35:51 +00:00
Alan Viverette
0a1a5e3781 Merge "Reduce CascadingMenuPopup's reliance on internal ListView state" 2015-11-04 15:22:58 +00:00
Alan Viverette
78a8df4919 Merge "Always call legacy performLongClick()" 2015-11-04 15:09:27 +00:00
Julia Reynolds
43f1befac2 Delete unused code.
Change-Id: I49660236b4d40010885b2ee3f8d03b5b258a035e
2015-11-04 08:42:13 -05:00
Clara Bayarri
965da39942 Create a File Based Encryption check API
Change-Id: Ibf41f98818ea801b9f690200c340be80c3b9bf31
2015-11-04 12:27:39 +00:00
Riley Andrews
0394a0c399 Convert ashmem bitmap thresholds to constants.
Bug 25256717

Change-Id: I23e2795ef8798d83bf60dcbd6ff2e7093fcaa9b0
Signed-off-by: Riley Andrews <riandrews@google.com>
2015-11-03 23:52:17 -08:00
Tomasz Mikolajewski
b344b894ca Add support for opening files in specified MIME type to DocumentsProvider.
Change-Id: I5453d6d699069ec59521917c024f173d2ae67565
Bug: 18113606
2015-11-04 16:24:00 +09:00
Felipe Leme
b1444578d4 Clarified usage of onDetach() and onCreate() when setRetainInstance() is set to true.
BUG: 25455734

Change-Id: I667629b76dcc39b0d2415cd368629720a77ed337
2015-11-03 17:42:45 -08:00
Ian Pedowitz
18896e0893 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 am: d6f3e38738
am: 87455c7397

* commit '87455c7397605fba4bf3ad04af8df3c599a7a6ba':
  Limit persistent ashmem backed fds to a minimum of 128kB.
2015-11-03 23:34:54 +00:00
Ian Pedowitz
87455c7397 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029
am: d6f3e38738

* commit 'd6f3e38738c88821b28b2571d034fc1b189a35de':
  Limit persistent ashmem backed fds to a minimum of 128kB.
2015-11-03 22:21:48 +00:00
Chet Haase
1d17ee041d Merge "Un-hide FloatProperty and IntProperty" 2015-11-03 22:16:14 +00:00
Ian Pedowitz
95fc53b029 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
am: 966d6040c6

* commit '966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
  Limit persistent ashmem backed fds to a minimum of 128kB.
2015-11-03 22:05:23 +00:00
Ian Pedowitz
966d6040c6 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev 2015-11-03 21:58:30 +00:00
Chet Haase
8240c97b01 Un-hide FloatProperty and IntProperty
These simple utility classes (used internally since Property was first introduced
way back in Jellybean) are the best way to avoid autoboxing when using the Property
approach to ObjectAnimator. But since their hidden, developers have to use the
autoboxing version (Property, the superclass) or know to come up with their own
primitive-optimized property subclasses.

This CL simply un-hides these two classes to make them usable outside of the framework.

Issue #21722783 Make [Int|Float]Property public

Change-Id: I7f3a456d108bf48587d711255d3577cce3ac5e24
2015-11-03 13:41:46 -08:00
Dianne Hackborn
24937d235d resolve merge conflicts of 3aee38c86e to master.
Change-Id: I9ff3f92b37e24f5f0527a0034b159920f6d7ffe1
2015-11-03 12:47:12 -08:00
Fyodor Kupolov
598ee3f6c2 Merge "Introduced short-term lock for UMS internal state" 2015-11-03 20:06:25 +00:00
Fyodor Kupolov
8240275381 Introduced short-term lock for UMS internal state
Added mUsersLock - short-term lock for internal state, when interaction and
synchronization with PM is not required. Modifications to mUsers and
mRemovingUserIds must be guarded by 3 locks: mInstallLock, mPackagesLock and
mUsersLock. While reads can use mUsersLock.

Testing revealed that the following methods in UMS often cause contention:
- exists
- getUserInfo
- getProfileParent

They all now use a short-term lock mUsersLock for reads.

Bug: 24979571
Change-Id: Ie3a22ea7cbb450c7969800fe2a4a2b2516165e5b
2015-11-03 11:56:33 -08:00
Dianne Hackborn
3aee38c86e Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505 am: 9a13cc6992
am: a09ac2d998

* commit 'a09ac2d998fdc901fb65b57a061cc445922e081f':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
2015-11-03 19:40:43 +00:00
Chad Brubaker
9f591aeb8b Merge "Add stub isSameTrustConfiguration API" 2015-11-03 18:38:37 +00:00
Alan Viverette
7611a6de6c Always call legacy performLongClick()
Adding performLongClick(x,y) broke compatibility for widgets that
overrode the no-arg performLongClick() and expected to receive a call.
This CL ensures that the no-arg method is called and the (x,y) data is
preserved for use in the default implementation.

Bug: 25411884
Change-Id: Ib0a3fb02d4c08ef64ce3a7165aa83bf0688aa50e
2015-11-03 13:32:20 -05:00
Dianne Hackborn
9a13cc6992 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev
am: 71e4984505

* commit '71e49845054a3a7dacc51efc4fe658818caec048':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
2015-11-03 18:27:18 +00:00
Alan Viverette
00aa5103e2 Reduce CascadingMenuPopup's reliance on internal ListView state
Bundles cascading menu information and stores it in a stack representing
the hierarchy of added menus.

Bug: 23970448
Change-Id: I1621d9eb30ff173767b6ebad2a1977127c42d0ad
2015-11-03 13:03:15 -05:00
Gustav Sennton
8966460103 Merge "Load WebView from one out of a list of packages, reland." 2015-11-03 17:50:07 +00:00
Riley Andrews
8cee7c1711 Limit persistent ashmem backed fds to a minimum of 128kB.
Bug 25256717

Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
2015-11-03 17:46:15 +00:00
Julia Reynolds
e2549af1b8 Unhide setting for CTS testing.
Change-Id: I56a7970a3613eb930f565befcfa86cf33702c74c
2015-11-03 08:47:42 -05:00
Dianne Hackborn
fcc95a6d2c Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
I think what probably happened is that since we only report an app
going in to the "interaction" state as an interaction event to usage
stats, apps that sit around in that state forever will only see one
interaction at the start and never again.  So usage stats could start
thinking they are idle.

Fix this by having the activity manager report an interaction event
for such long running applications at least once a day.

Also, because it is correct and for paranoia by protected us another
way, system uids should never go in to standby.

Change-Id: I8a3805bfca86cbe78560488a649ecd07427da99a
2015-11-02 16:15:35 -08:00
Mikhail Naganov
9daceaf609 Small update to WebResourceRequest.isRedirect
Specify that 'isRedirect' is only true for server-side redirects.

Bug: 22346196
Change-Id: I9a8c31476c796265f554327dfff46778c5f84399
2015-11-02 15:38:29 -08:00
Makoto Onuki
5263492de6 Merge "Allow DO to disable camera device-wise." 2015-11-02 22:00:09 +00:00
Makoto Onuki
759a763f5f Allow DO to disable camera device-wise.
Bug 24538855

Change-Id: I421690f14ee57fa818d2b233fe48a90a0a575a9e
2015-11-02 13:33:58 -08:00
Rob Carr
31b09bdcdd Merge "Sync SurfaceView position changes to parent render." 2015-11-02 21:30:56 +00:00
Jun Mukai
4c759ca99f Merge "Fix: ToolType() check -> isFromSource()." 2015-11-02 21:27:24 +00:00
Jun Mukai
36a9946b23 Fix: ToolType() check -> isFromSource().
Change-Id: I8e13a179dc076cc44248662e6e8fd60e8cc69a3f
2015-11-02 13:15:00 -08:00
Wale Ogunwale
02a5a6bb9b Merge "Added StackId object for checking what features a stack supports" 2015-11-02 20:38:39 +00:00