60512 Commits

Author SHA1 Message Date
Dianne Hackborn
311cbe1b83 Merge "Some small binder shell command improvements." 2016-01-29 22:20:39 +00:00
Chris Tate
4fff321f9f Merge "Stage backup/restore data in a cache subdir rather than root" 2016-01-29 22:09:04 +00:00
Sergey Poromov
86cfe51863 Merge "Fix BackupManager to really send MSG_RESULT when onResult is called." 2016-01-29 21:49:22 +00:00
Alan Viverette
04415b4765 Merge "Add DENSITY_DEVICE_STABLE constant" 2016-01-29 21:41:38 +00:00
Chien-Yu Chen
d7085a40bd Merge "Correct cameraserver UID" 2016-01-29 21:39:51 +00:00
Wale Ogunwale
76d159fdcb Merge changes I96fdf9b4,Ia85d9d89,I1fd23114
* changes:
  Added isDockable field to RunningTaskInfo
  Display warning toast when we try to launch unresizeable app in split-screen
  Don't allow non-dockable activities/tasks in docked stack.
2016-01-29 21:14:17 +00:00
Wale Ogunwale
21b6058fff Added isDockable field to RunningTaskInfo
Allows the caller to know if the task can go in the docked stack.

Bug: 26774816
Change-Id: I96fdf9b4df0ac87d84492e1504baac3ca0767d37
2016-01-29 12:52:14 -08:00
Christopher Tate
e5f51c212c Stage backup/restore data in a cache subdir rather than root
Also make sure not to do the restorecon() before the file is
created.

(Also fix binder identity bug in the 'bmgr fullbackup' flow.)

Bug 26834865

Change-Id: Ia8a59eeb55762264163c8b310caae5e303413571
2016-01-29 12:47:45 -08:00
Adam Lesinski
9fa3cd3d86 Merge "BatteryStats: Fix DivideByZero error" 2016-01-29 20:42:42 +00:00
Adam Lesinski
a426817a06 BatteryStats: Fix DivideByZero error
As we hand out proportional blame to apps for transmitting/receiving
packets, make sure to check that the total packets sent never
becomes zero.
Bug:26873610

Change-Id: I3e0fc3c9e8d4dafce2e88c75d8f44701d8fba0d4
2016-01-29 12:41:27 -08:00
Alan Viverette
d7bbc8a92f Add DENSITY_DEVICE_STABLE constant
The existing DENSITY_DEVICE gets updated by ActivityThread following
configuration changes that affect density, so just a docs update there.

Bug: 26854123
Change-Id: I69dfca99a6038ed9cf8b2f2c007cdbc4a399dd8a
2016-01-29 15:40:38 -05:00
Wale Ogunwale
2e4089478f Merge "Use resizeMode integer instead of resizeable boolean." 2016-01-29 20:12:14 +00:00
Chien-Yu Chen
b8b4e85879 Correct cameraserver UID
Bug: 24511454
Change-Id: I967c50c781d03754a093bae6a64b2e35a023f046
2016-01-29 12:03:04 -08:00
Jeff Davidson
3c2feda8a5 Merge "Revert Network Stats API stub for tracking of metered networks." 2016-01-29 19:08:52 +00:00
Andreas Gampe
4c79fea9ef Frameworks/base: Stop profiling on uncaught exception
When "handling" an uncaught exception, make an attempt to stop
profiling. In case profiling was active, this will avoid losing
the profiling buffer.

Bug: 26291225
Change-Id: Ie5f5517b46ed89d0456a4aac9d4ff3b713d1d8aa
2016-01-29 10:45:14 -08:00
Jeff Davidson
921d15b58a Revert Network Stats API stub for tracking of metered networks.
Bug: 25813958
Change-Id: I9d2835b7bacfffef05b1588f1301afc70f5f582f
2016-01-29 10:36:52 -08:00
Anna Galusza
f3e5d1d483 Merge "Add API for IME control by Accessibility Services." 2016-01-29 16:58:07 +00:00
Sergey Poromov
4b51d99a01 Fix BackupManager to really send MSG_RESULT when onResult is called.
Previously it send MSG_FINISHED.
I'm surprised why backup test app was successfully receiving appropriate callbacks...

Change-Id: Ia4950579a3dbf8b7383b8e48dd29b94bdd765cd8
2016-01-29 17:46:32 +01:00
Rubin Xu
a3b0c04f34 Merge "Watch out for null pointers when getting profile owner info" 2016-01-29 16:38:30 +00:00
Rubin Xu
945fd0074a Watch out for null pointers when getting profile owner info
Bug: 22776761
Change-Id: If9b7fe603c52b953633a81642b506c0b2fa8dc3a
2016-01-29 16:29:53 +00:00
Wale Ogunwale
b1faf60b89 Use resizeMode integer instead of resizeable boolean.
Changes activity manager and window manager to use resizeMode
as defined by ActivityInfo#resizeMode instead of a boolean.

Bug: 26774816
Change-Id: I8cef46d9fba6bfdd21df7da63ed5d5330ad03d4b
2016-01-29 07:44:33 -08:00
Alan Viverette
8ab1a37b76 Merge "Consume AbsListView touch events following a successful long-press" 2016-01-29 15:23:16 +00:00
Abodunrinwa Toki
649a401101 Merge "Fix floating toolbar rendering." 2016-01-29 15:03:03 +00:00
Robin Lee
ed8a5b3579 Merge "Replace broken UserHandle.SYSTEM check in LPU" 2016-01-29 13:27:25 +00:00
Abodunrinwa Toki
6be228c111 Fix floating toolbar rendering.
The code to size and position the floating toolbar and it's content
when there was no overflow menu was omitted. This caused bad
rendering of the toolbar and it's content when an existing toolbar
object was updated to go in the "no overflow" state.

Fixed the issue by properly updating the floating toolbar size
and positioning of it's contents in the "no overflow" state.

Bug: 25973599
Change-Id: I9305140f493bc36b87328571cd7645f184d9cf30
2016-01-29 12:22:29 +00:00
Benjamin Franz
dd231a16a1 Merge "Add policy to set the organization name" 2016-01-29 11:38:54 +00:00
Benjamin Franz
3e8a709064 Add policy to set the organization name
We allow the profile owner of a managed profile to set the name of the
managed organization.

This name is used as the default header message shown in the confirm
credentials screen a.k.a. work challenge.

Bug: 26638631
Change-Id: I03c5acc9fffe06cdb9d0d60dd1580b20e21783b1
2016-01-29 11:15:12 +00:00
Seigo Nonaka
8dc03bc034 Merge "Revive drop shadow of SuggestionWindow." 2016-01-29 09:53:54 +00:00
Mihai Niță
2d8d083dc7 Merge "Create the locale list with ICU4J's ListFormatter" 2016-01-29 07:43:23 +00:00
Seigo Nonaka
60490d1ad4 Revive drop shadow of SuggestionWindow.
The drop shadow of the SuggestionWindow was accidentally gone by
I579c0cc5b7f0dd337bff54af77828b8af25b13d2.

The reason of drop shadow disappearance is setting TRANSPARENT
background to the popup window.

To revive drop shadow of SuggestionWindow, follows the way of floating
toolbar.
- Create PopupWindow and make it transparent. (already exists)
- Wrap contents with RelativeLayout and set layout_margin and elevation
  to drop the shadow into the transparent PopupWindow.

The changes in Editor is for keeping this margin during re-calculation
of the contents width and position.

Bug: 15347319

Change-Id: I5a9bcbe29400d6193eb0532a5e711a78a12383cd
2016-01-29 15:29:56 +09:00
Selim Cinek
6e2c6ccd19 Merge "Media notifications may not have an icon" 2016-01-29 03:04:56 +00:00
Selim Cinek
acec8ad6cb Merge "Animating the work profile button location now" 2016-01-29 03:04:40 +00:00
Selim Cinek
d0803bb4ad Merge "Fixed a bug with the media notication template" 2016-01-29 03:04:22 +00:00
Selim Cinek
fdc738f9b8 Media notifications may not have an icon
Change-Id: Ie47bf144f4add49ec5ed92bb19db39ad116f0678
2016-01-28 19:02:21 -08:00
Selim Cinek
0d07c7eccd Animating the work profile button location now
Media notifications have them in a different location
so we'd like to animate it.

Change-Id: I50d289bc6ed73d56dcad8cebdcb7101e2aad6ea9
2016-01-28 19:02:21 -08:00
Selim Cinek
6ecc810ca2 Fixed a bug with the media notication template
The image could overlap with the buttons due to
the specced way. This is now fixed.

Change-Id: I346467d48b5f8337d09af4b20e5cdfcd41e12b81
2016-01-28 19:02:20 -08:00
Svetoslav Ganov
cda8cddaef Merge "Optionally support accessibility with UiAutomator" 2016-01-29 02:57:46 +00:00
Jeff Sharkey
d24544322f Merge "Exposing file:// beyond your app is bad, m'kay?" 2016-01-29 02:43:28 +00:00
Jun Mukai
411228fec1 Merge "Reset gSystemIcons when accessibility large icon settings has changed." 2016-01-29 02:24:14 +00:00
Jeff Sharkey
344744b496 Exposing file:// beyond your app is bad, m'kay?
For several releases now we've told developers that sharing raw files
between apps is a recipe for trouble.  There are at least three major
problems with sending raw files:

-- Apps sending generic intents can't know who is at the other end,
so they may not have access to shared storage locations.  This is
more likely now that runtime permissions require apps to explicitly
ask users for permission.

-- Apps making files in their private storage world-readable has been
deprecated for several releases, and now in N it's fully blocked.  If
we let these intents through, the receiving app would fail to open
the file, when the real blame rests on the sending app.

-- Devices with user profiles can't share raw files when using
cross-profile intent filters, since filesystem access is fully
locked down between users.

The time has finally come to communicate clearly that if you're
sharing content between apps, you need to use content:// Uris.  We
added the simple FileProvider several years ago to give apps a clean
way to migrate with minimal work on their part.

Bug: 26860922, 9069185
Change-Id: I075f627f6a0d6c7fca2c090ca133b9aae9801c64
2016-01-28 19:20:12 -07:00
Andrei Stingaceanu
8861cb002f Keyboard Shortcuts UI - add shortcuts to dialog.
This is the first UI iteration which contains elements for
displaying the keyboard shortcuts. Is is by no means final,
the following items (and maybe more) still need to be actioned:

* no UI for phone
* no view for system shortcuts (which contain icons)
* the shortcut items container needs a custom layout which
  needs to wrap and right align elements (prototype done)
* find or build an util which can produce human readable
  names of the baseCharacter and the modifiers (so far I
  found a few functions, none of them good)
* not pixel-perfect
* the scrollbar does not show
* the last separator (before the DONE button) is not
  visible

Change-Id: I0d191e9516ab8f4728f40b3eefe9d854249ee7a8
2016-01-29 02:07:22 +00:00
Yohei Yukawa
c67395256b Merge "Use LocaleList in KeyboardLayout." 2016-01-29 01:08:03 +00:00
Chris Tate
d61c302bf8 Merge "Extract crop hint rect from source wallpaper image" 2016-01-29 00:38:57 +00:00
Yohei Yukawa
5660fad798 Use LocaleList in KeyboardLayout.
As an exercise for a new API candidate LocaleList class, this CL does a
mechanical refactoring to replace Locale[] with LocaleList in
KeyboardLayout class.  Note that what changed in this CL is just an
implementation details that is never exposed to application developers.

One take-away from this exercise is that finding the best-match locale from
an ordered locale list is really a common pattern.  Perhaps we may want
to have a guideline for this kind of situation.

Change-Id: I142379afbaf24d524ff09cf6c7ee7720150f7489
2016-01-29 00:30:00 +00:00
Christopher Tate
1e1e2e013f Extract crop hint rect from source wallpaper image
Setting the wallpaper is still synchronous: the caller blocks until any
backend cropping/manipulation has completed.  There is a timeout (currently
30 seconds) on that to avoid wedging the caller arbitrarily.

Bug 25454501

Change-Id: Idca2fe1b10e4fa34d6d54865903d9a1b9e305e3c
2016-01-28 16:18:21 -08:00
Dianne Hackborn
2e931f56c7 Some small binder shell command improvements.
- Improve documentation.
- Add low-level access to input/output streams.

Change-Id: I3892be222d6fd919b164fa4e4882185940947f70
2016-01-28 15:20:48 -08:00
Ashutosh Joshi
d53aadc0ec Merge "Context hub API for applications" 2016-01-28 22:24:39 +00:00
Ashutosh Joshi
1d1ac54095 Context hub API for applications
Adding a System API for applications to access a context hub.

The API is not expected to be exposed to third party Android
applications in the medium term.

Change-Id: Ia2222317c913de6901f3912e4c89b5cfa398be85
2016-01-28 14:19:17 -08:00
Jeff Sharkey
a74cce6072 Merge "Fix activity-alias encryption awareness bug." 2016-01-28 20:32:16 +00:00
Jeff Sharkey
c26d59f6ab Fix activity-alias encryption awareness bug.
Since the activity-alias is backed by the same code as the original
activity definition, they should both have an identical encryption
awareness.  This fixes a bug where we accidentally dropped that value.

Bug: 26731340
Change-Id: I6ad615332df7d16542893a49e6997c88fc24334b
2016-01-28 13:30:07 -07:00