Commit Graph

246497 Commits

Author SHA1 Message Date
Amanda Kassay
935c4835ac Merge "Update studio_tos modal with correct id. b/28425669" into mnc-mr-docs
am: 8d21a984a6

* commit '8d21a984a65884698d3b91f91b07f3391ec28f6d':
  Update studio_tos modal with correct id. b/28425669

Change-Id: Ic0bbcb91b272c6230bbf7a6f6ec3725dff04acdc
2016-04-29 17:33:53 +00:00
Amanda Kassay
8d21a984a6 Merge "Update studio_tos modal with correct id. b/28425669" into mnc-mr-docs 2016-04-29 17:26:28 +00:00
Clara Bayarri
9c3cebf729 Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev
am: 88545ce446

* commit '88545ce4463939b90be1e5141b1dc3c1994fa35d':
  Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it

Change-Id: I6738c82f8e390596b267782e5e8d872041b5c089
2016-04-29 16:45:29 +00:00
Alan Viverette
e6eee3dd41 Merge "Only change picker modes when used in dialog" into nyc-dev
am: be58946330

* commit 'be58946330c918f7912ff318030f99acb25e6098':
  Only change picker modes when used in dialog

Change-Id: I9900c12d284d353d491f3e4e3d299c2682761221
2016-04-29 16:38:20 +00:00
Clara Bayarri
88545ce446 Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev 2016-04-29 16:38:14 +00:00
Alan Viverette
be58946330 Merge "Only change picker modes when used in dialog" into nyc-dev 2016-04-29 16:31:16 +00:00
Lajos Molnar
c79c6b8b50 Merge "media: document MediaFormat.KEY_FRAME_RATE better" into nyc-dev
am: 017567ae1d

* commit '017567ae1d7c67e44824ee32a812638b88b48779':
  media: document MediaFormat.KEY_FRAME_RATE better

Change-Id: Iac43805c0124a05fab6f136c8e734c681a1562a8
2016-04-29 16:12:18 +00:00
Adrian Roos
dd3ef2dd9b Merge "A11y: Show title if ticker is not available" into nyc-dev
am: bc243b5f49

* commit 'bc243b5f4905d9891ff5bf04fc8d25bbf016f539':
  A11y: Show title if ticker is not available

Change-Id: I77c89a25dec8f673964a2ef89199d1515e01ee43
2016-04-29 16:07:09 +00:00
TreeHugger Robot
017567ae1d Merge "media: document MediaFormat.KEY_FRAME_RATE better" into nyc-dev 2016-04-29 16:04:16 +00:00
Adrian Roos
bc243b5f49 Merge "A11y: Show title if ticker is not available" into nyc-dev 2016-04-29 15:59:44 +00:00
Clara Bayarri
962694db38 Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it
Bug: 28197210
Change-Id: I798a891b1de9777f652a46c1d938e23c0c62f783
2016-04-29 16:56:02 +01:00
Adam Powell
82b9565bd1 Backport ChooserTarget package source check from N
Fix a bug where a ChooserTargetService could supply a ChooserTarget
pointing at a non-exported activity outside of its own package and
have it launch.

Bug 28384423

Change-Id: I3f5854f91c5695ad9253d71055ef58224df47008
2016-04-29 15:38:13 +00:00
Alan Viverette
47b6df128e Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev
am: 7544ac22e4

* commit '7544ac22e474547a3cbeaff0dcaf163bbbd4fca7':
  Maintain internal consistency for TimePickerClockDelegate hour

Change-Id: I50c1a3294b6e42673dc598539f2223215419d82e
2016-04-29 15:24:41 +00:00
Lorenzo Colitti
c9733b0696 Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev
am: a4daf16b57

* commit 'a4daf16b578c456104f59f05ac374101426d1376':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: I0dbba8203b58be5bd27557af9ef55aaac699cba9
2016-04-29 15:24:39 +00:00
Alan Viverette
7544ac22e4 Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev 2016-04-29 15:22:07 +00:00
TreeHugger Robot
a4daf16b57 Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev 2016-04-29 15:17:41 +00:00
John Reck
88e7238235 Merge "Support transform\'d GraphicBuffers" into nyc-dev
am: 6d42b5c6e3

* commit '6d42b5c6e399a10799d2bba3f7113dd198cbcae6':
  Support transform'd GraphicBuffers

Change-Id: Ie80d130a6fd797acd3dafe85f63229a6d43e5c4e
2016-04-29 14:55:24 +00:00
John Reck
9e9f51b333 Merge "Video source test & bugfix" into nyc-dev
am: a1c06675dd

* commit 'a1c06675dd2a83ce445f27b46cddab80f8c743e6':
  Video source test & bugfix

Change-Id: I0205afb269ade5c45c19df082e56955bf6bc93ca
2016-04-29 14:55:22 +00:00
Paul Lawrence
9959cc8792 Merge "Check permission on clearPassword and other CryptKeeper APIs" into nyc-dev
am: 1658fff3a9

* commit '1658fff3a92ce6ad13f41ce5faf7fcdfe3ca2673':
  Check permission on clearPassword and other CryptKeeper APIs

Change-Id: Iee6132f112991a8486b7c77d22a8f72f8705a657
2016-04-29 14:50:02 +00:00
John Reck
6d42b5c6e3 Merge "Support transform'd GraphicBuffers" into nyc-dev 2016-04-29 14:49:21 +00:00
John Reck
a1c06675dd Merge "Video source test & bugfix" into nyc-dev 2016-04-29 14:49:13 +00:00
Paul Lawrence
1658fff3a9 Merge "Check permission on clearPassword and other CryptKeeper APIs" into nyc-dev 2016-04-29 14:43:13 +00:00
Tim Volodine
7e2e50cef4 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev
am: c750474fd1

* commit 'c750474fd17e4cc9ccb536d76d83c16d5a521a3c':
  [WebView] Add documentation regarding geolocation api on secure origins.

Change-Id: I785e311619de1d3893f4c1a175f58281e0d02d02
2016-04-29 14:40:12 +00:00
TreeHugger Robot
c750474fd1 Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev 2016-04-29 14:34:20 +00:00
Paul Lawrence
0bbd108aa1 Check permission on clearPassword and other CryptKeeper APIs
Note - this should only ever be called from LockScreen after getting
the password to avoid the double prompt

Bug: 28376346
Change-Id: Ic44df4fdcc23408c56b1b9375deed1c6ad2af544
2016-04-29 07:30:53 -07:00
Abodunrinwa Toki
c2cd9cca86 Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev
am: d971a9d5f2

* commit 'd971a9d5f2f945d89728af7fffe1e692c1c91e3b':
  Ensure FloatingToolbar is not rendered at negative x, y coordinates.

Change-Id: I2db5a9b674c0319b7c07a18ee763fcc1d90da7ea
2016-04-29 14:09:05 +00:00
Chris Wren
b66a16d975 close a potential race condition in registerAsSystemService
Bug: 27555424
Change-Id: I1537fd1aae3dba83de22d1b245bddd0a3922d289
2016-04-29 10:07:48 -04:00
Abodunrinwa Toki
d971a9d5f2 Merge "Ensure FloatingToolbar is not rendered at negative x, y coordinates." into nyc-dev 2016-04-29 14:04:06 +00:00
Tony Mak
9d94734a9d Add metric for managed profile setting
am: 7a5b17bb98

* commit '7a5b17bb9873b24ab6a38dc210612aa726613504':
  Add metric for managed profile setting

Change-Id: I308a5cc91750c299f9856ed0529544ec61500dd8
2016-04-29 13:41:53 +00:00
Tony Mak
7a5b17bb98 Add metric for managed profile setting
Bug: 28281560
Change-Id: I6ec0a8dbfea179476335b9d624020b80e51e97a8
2016-04-29 13:36:46 +00:00
Lorenzo Colitti
fb628c078c The legacy DHCP client is gone. Delete the settings.
Bug: 27192644
Change-Id: I5bc23f3e269e17d50fa2531a57fb0e2049ae18bf
2016-04-29 22:19:23 +09:00
Tim Volodine
b0e9798e52 [WebView] Add documentation regarding geolocation api on secure origins.
Update to javadoc comments saying that for apps targeting N and up
the geolocation api is only supported on secure origins.
On non-secure origins requests to geolocation api are automatically
denied without calling the corresponding
WebChromeClient#onGeolocationPermissionsShowPrompt method.

BUG: 28080869
Change-Id: I57726f7f3b3d38db0535f742b1f74c40c1f1ce8b
2016-04-29 12:59:27 +00:00
Paul Jensen
08ec0e53b8 Don't pass URL path and username/password to PAC scripts
The URL path could contain credentials that apps don't want exposed
to a potentially malicious PAC script.

Bug: 27593919
Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed
2016-04-29 10:57:13 +00:00
Lorenzo Colitti
3fef7230d2 Address review comments on ag/962875.
Bug: 27824851
Change-Id: I7dd553a926b10faf6e0c2b0e3ed9d8e91b3cccf0
2016-04-29 18:00:03 +09:00
Andreas Gampe
d79cc4391d Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev
am: ecd73f48fe

* commit 'ecd73f48fe219cf238c4c2ec692c42855787bde0':
  Frameworks/base: Use holder in FileUtils

Change-Id: I0536c714958e365c8032da94fd24729023814827
2016-04-29 07:15:55 +00:00
TreeHugger Robot
ecd73f48fe Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev 2016-04-29 07:09:28 +00:00
Jaewan Kim
89fcf299e5 Merge "PIP: Prevent PIP icons in Recents from blinking when PIP is closed" into nyc-dev
am: cbb128a5d8

* commit 'cbb128a5d8f8e6c028239603139d17b6b6cbd885':
  PIP: Prevent PIP icons in Recents from blinking when PIP is closed

Change-Id: Ifa111f4caee8bce0892f76dba1ac2267895f3a80
2016-04-29 06:03:42 +00:00
Jaewan Kim
cbb128a5d8 Merge "PIP: Prevent PIP icons in Recents from blinking when PIP is closed" into nyc-dev 2016-04-29 05:57:42 +00:00
Andreas Gampe
0693fd85f6 Frameworks/base: Use holder in FileUtils
Use a holder for an uncommon Pattern instance in FileUtils.

Allows to compile-time initialize:
* android.os.FileUtils

Bug: 28174137
Change-Id: I4a7a388795a96678b4b26e4f2c02b1117d6a67f6
2016-04-28 19:33:05 -07:00
destradaa
6469c233fb Fixes on handling messages from apps to host.
- Ensure that app to host events are not filtered out
- Populates the app handle appropriately for clients to reference the
  nano app sending the event

Bug: 28273520
Bug: 28272149

Change-Id: I7373fc84abcadc2ab17109484f2d04b02a474593
2016-04-28 19:12:56 -07:00
Chong Zhang
7021174287 Do not change surface properties when waiting for transition to ready
Window could become drawn before transition is ready, when transition
is waiting for the animation spec. If we show the surface too early,
one or more frame will be shown with wrong scale.

bug: 28296945
bug: 27742244
Change-Id: I34e84ed8a37ecdb71eb975351f1ee39d14dfba25
2016-04-28 18:31:24 -07:00
Sungsoo Lim
6884651554 Merge "Another intent sent by both system and apps." into nyc-dev
am: 71619aa437

* commit '71619aa437f40e5b4e760111852883cdca055d0b':
  Another intent sent by both system and apps.

Change-Id: Ic1dfcbd670828fbc404c21a02a785f9d0e8fb6cb
2016-04-29 01:28:05 +00:00
Rohit Agrawal
341b4d071f Merge "AAPT: ProGuard config for components in main dex." into nyc-dev
am: ab45664130

* commit 'ab45664130064cd44cc5ceb85d41de90b995819b':
  AAPT: ProGuard config for components in main dex.

Change-Id: I30a095ba5b2ee1a4d5f7c329cd4cf22cb77ba18e
2016-04-29 01:25:25 +00:00
TreeHugger Robot
71619aa437 Merge "Another intent sent by both system and apps." into nyc-dev 2016-04-29 01:21:10 +00:00
Rohit Agrawal
ab45664130 Merge "AAPT: ProGuard config for components in main dex." into nyc-dev 2016-04-29 01:19:08 +00:00
Amith Yamasani
9dee0bccd8 Merge "Stop user faster and clear stale broadcasts" into nyc-dev
am: ec6faca007

* commit 'ec6faca0078263dfbf2b41d11cdb14586e40fd75':
  Stop user faster and clear stale broadcasts

Change-Id: Ifb8e0cc842810af0c65a90cf5e923c348e6a4b3c
2016-04-29 00:56:42 +00:00
Suprabh Shukla
af6c419574 Adding null check on VolumeInfo
Storage manager returns null volumeInfo for a volume that is ejected.
Adding a null check to prevent crashing system ui.

Bug: b/28211502
Change-Id: Icd18dda8cad4e6020df3e4c5b3be6daaa3b22fbe
2016-04-28 17:56:37 -07:00
Amith Yamasani
ec6faca007 Merge "Stop user faster and clear stale broadcasts" into nyc-dev 2016-04-29 00:51:32 +00:00
Adam Lesinski
4ecfb5257c Merge "Add Complex XML Resources guide to docs" into nyc-dev
am: 98a418758d

* commit '98a418758dcde8fd2ce63d5a489487fdd371fed9':
  Add Complex XML Resources guide to docs

Change-Id: I1d639704050837c3fd7131bfb8d3939dca321a01
2016-04-29 00:20:52 +00:00
Adrian Roos
aa38a0cf25 Merge "ImageWallpaper: Only draw on valid surfaces" into nyc-dev
am: 05be517fb7

* commit '05be517fb77260c4aa8d4e803a860b110833b6ab':
  ImageWallpaper: Only draw on valid surfaces

Change-Id: I231cc54a73077448df66e2d0677d44df2b7a7c22
2016-04-29 00:18:07 +00:00