Commit Graph

245370 Commits

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

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

Change-Id: I08a5dd9daaa66717212aa553babe9701fadb17bf
2016-04-29 17:39:04 +00:00
Jason Monk
fd57ea730e Don't show data disabled icon when user isn't setup
Change-Id: I2d540b8c0cb613cbf120ffadc404ee03d0447a8b
Fixes: 28246388
2016-04-29 13:37:58 -04:00
Amanda Kassay
a7700c08fc Merge "Update studio_tos modal with correct id. b/28425669" into mnc-mr-docs am: 8d21a984a6
am: 935c4835ac

* commit '935c4835aca0507b57d8d5aee7e5b544d4856f32':
  Update studio_tos modal with correct id. b/28425669

Change-Id: I38a93109a57589551f3abd539604b439a605b82d
2016-04-29 17:36:09 +00:00
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
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
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
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
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
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
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
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
TreeHugger Robot
ecd73f48fe Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev 2016-04-29 07:09:28 +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
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
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
98a418758d Merge "Add Complex XML Resources guide to docs" into nyc-dev 2016-04-29 00:13:42 +00:00
TreeHugger Robot
05be517fb7 Merge "ImageWallpaper: Only draw on valid surfaces" into nyc-dev 2016-04-29 00:13:23 +00:00
TreeHugger Robot
4d33455c4f Merge "Fixed wrong loop variable (AKA: I, Y U NO J?)" into nyc-dev 2016-04-29 00:11:42 +00:00
Jim Miller
8d38894d1f Merge "Clean up fingerprint enrollment API" into nyc-dev 2016-04-28 23:48:42 +00:00
Chong Zhang
c56ca11611 Merge "Fix restoring surface for child windows" into nyc-dev 2016-04-28 23:18:29 +00:00
Chong Zhang
b7b4a56a6e Fix restoring surface for child windows
Use allAppWindows instead of windows, as windows doesn't contain
any child windows, it causes the child windows to be not restored
until the child window does relayout.

bug: 28296945

Change-Id: I7d272e660752002c08349128c3958aa041979c34
2016-04-28 15:44:50 -07:00
Felipe Leme
6173185432 Fixed wrong loop variable (AKA: I, Y U NO J?)
BUG: 27366993
BUG: 28451218
Change-Id: I8455ada4194e7fc44ae7448e5cd763d22065fd2e
2016-04-28 15:37:20 -07:00
Adrian Roos
53560f1c8b ImageWallpaper: Only draw on valid surfaces
Previously, the wallpaper would draw even when
the surface had been destroyed, leading to
crashes.

Change-Id: I6465e832abb3bfd92495bca9b60dac474b35f6d6
Fixes: 28329816
2016-04-28 15:22:51 -07:00
Jean-Michel Trivi
b97fdfa39a Merge "Additional alarm sounds for N" into nyc-dev 2016-04-28 22:14:02 +00:00
Jim Miller
c12eca8b59 Clean up fingerprint enrollment API
The enrollment API was using userId and groupId interchangeably.
This cleanes up the interface to consistently use userId.

Partial fix for bug 28268635

Change-Id: I678e4b17a25f82c5cf17db49cd23f862be11667b
2016-04-28 15:12:53 -07:00
Philip P. Moltmann
3c757036a3 Delay callback from printerRegistry after Constr.
If the leader inside of the printer registry can immediately initalize
the callback is called in the same thread as the contructor is
executing. Hence in this case the mPrinterRegistry field is used before
written.

Change-Id: I45239d2792f6c31ec215ddb01131038882ff0136
2016-04-28 15:11:26 -07:00
Christopher Tate
98f1ff0558 Don't wedge full data backups by blocking the data consumer thread
In particular, don't ask the producer about error overrides when
it is still relying on the consumer to do its job first.  This
needs to be policy for *any* transport-side error condition, not
just the one that was previously handled safely.  Any transport-
initiated error "on the fly" means that the app-facing side of
the engine doesn't know to stop feeding data, and mustn't be
consulted with any blocking request.

We also now detect unexpected PACKAGE_REJECTED by the transport
after data streaming has begun, and translate that to the general
TRANSPORT_ERROR for correct handling down the line.

Bug 28399225
Bug 28375634

Change-Id: I613dc21bc9f2d23e6520eed6c3ac2e9dbc1d88dc
2016-04-28 15:07:31 -07:00
Nadia Benbernou
948627eeaa Add api to WearableExtender for setting and getting the dismissal id.
Bug:27696581

Change-Id: Idf37234a9fd1d54e2fab0a4d5bfab70bbb1a3ba5
2016-04-28 17:57:25 -04:00
Sudheer Shanka
a2650a958b Move spinner_dropdown_restricted_item to Settings.
RestrictedDropdownPreference is in Settings and currently not
used by anything else, so corresponding layout
spinner_dropdown_restricted_item to Settings.

Bug: 28390118
Change-Id: I3a1b53dc80ba9329d6ffd40562db0c0587a34666
2016-04-28 14:24:04 -07:00
Andrew Solovay
ce2dae9c16 docs: Updated support library overview, CPd from mnc-mr-docs am: dd3b48de2f am: 04893309eb am: f31c9f4e8c
am: 6a5ce2914a

* commit '6a5ce2914a0360cf08c6b49a9f3ef66ad9fe6a1c':
  docs: Updated support library overview, CPd from mnc-mr-docs

Change-Id: I0874460d818d6c86fa95acf5075c46402c94b935
2016-04-28 21:23:06 +00:00
Andrew Solovay
6a5ce2914a docs: Updated support library overview, CPd from mnc-mr-docs am: dd3b48de2f am: 04893309eb
am: f31c9f4e8c

* commit 'f31c9f4e8c606dcabad6eb63ac7801b77d1de328':
  docs: Updated support library overview, CPd from mnc-mr-docs

Change-Id: Iff6598a73fcffdfc8d576d2722b4c434d0f0ce3f
2016-04-28 21:20:43 +00:00