Commit Graph

58645 Commits

Author SHA1 Message Date
Chris Wren
ca925148e2 Merge "close a potential race condition in registerAsSystemService" into nyc-dev
am: 3b016f5445

* commit '3b016f544502dca8c162554c6ea42bd6727f4cde':
  close a potential race condition in registerAsSystemService

Change-Id: I925edd07ead39be9ec34c013ad00d34f0d600c06
2016-04-29 18:29:50 +00:00
TreeHugger Robot
3b016f5445 Merge "close a potential race condition in registerAsSystemService" into nyc-dev 2016-04-29 18:25:06 +00:00
Alan Viverette
acddbbcb21 Merge "Maintain internal consistency for TimePickerClockDelegate hour" into nyc-dev
am: 7544ac22e4

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

Change-Id: I1b46f64e197303507c5b3cb3c402438e51e993c3
2016-04-29 15:24:45 +00:00
Lorenzo Colitti
52e5f2e5ec 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: Ib9f1352386ebe667ec5d3d110f64e080c04c103d
2016-04-29 15:24:42 +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
Tim Volodine
01a3ddd116 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: I941ff4185ff90dc640f47c2ba9e32ce8a41dbb28
2016-04-29 14:40:16 +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
Chris Wren
b66a16d975 close a potential race condition in registerAsSystemService
Bug: 27555424
Change-Id: I1537fd1aae3dba83de22d1b245bddd0a3922d289
2016-04-29 10:07:48 -04: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
Andreas Gampe
289da55c68 Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev
am: ecd73f48fe

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

Change-Id: I5c46dc39de8c1a9fd3ddec59e1440b3a6e65d9e7
2016-04-29 07:15:58 +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
Jorim Jaggi
1ef9359662 Merge "Remove optimization to report config change" into nyc-dev
am: df551dda12

* commit 'df551dda1289598c209d75f6b99322e82866e2c0':
  Remove optimization to report config change

Change-Id: Ida68bae850d55f3feb59c596bdef3e5d48e67b77
2016-04-28 20:32:52 +00:00
Jorim Jaggi
df551dda12 Merge "Remove optimization to report config change" into nyc-dev 2016-04-28 20:28:38 +00:00
Jeff Sharkey
065be97490 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev
am: 8c2fb9edae

* commit '8c2fb9edae4413074186e3d84ccff0eba41b2cae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ibc26a4ee84531976e72cc30f2c2862be9a30d28b
2016-04-28 19:24:58 +00:00
TreeHugger Robot
8c2fb9edae Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev 2016-04-28 19:06:28 +00:00
Alan Viverette
2a993b4f6d Maintain internal consistency for TimePickerClockDelegate hour
Hour was not updated correctly when a new hour was selected using the
radial picker or when AM/PM was changed, which prevented programmatic
calls from working.

Bug: 28398738
Change-Id: I0c1ffd9f9e569d980e72e74dc62568a56930afc4
2016-04-28 12:56:09 -04:00
Jeff Sharkey
ce18c81677 Introduce "unlocking" vs "unlocked" nuance.
There is a narrow window of time during user unlock where we're
reconciling user storage and dispatching the "unlock" status to
various internal system services.  While in this "unlocking" state,
apps need to be told that the user still isn't actually "unlocked"
so they don't try making calls to AccountManager, etc.

The majority of internal services are interested in merging together
both the "unlocking" and "unlocked" state, so update them.

Clarify naming in AccountManagerService to make it clear that a local
list is being used, which mirrors the naming in MountService.

To match UX/PM requested behavior, move PRE_BOOT_COMPLETED dispatch
after the user is unlocked, but block BOOT_COMPLETED dispatch until
after all PRE_BOOT receivers are finished to avoid ANRs.

Bug: 28040947, 28164677
Change-Id: I57af2351633d9159f4483f19657ce0b62118d1ce
2016-04-28 10:51:39 -06:00
Michael Wright
b3324b4a2e Merge "Properly parcel HdrCapabilities." into nyc-dev
am: 5bddeaa

* commit '5bddeaa9bce6325c900eeabaa6a1cdfaf83910c6':
  Properly parcel HdrCapabilities.

Change-Id: I768887156c78cca859db6123a2bb184f12295ab0
2016-04-28 15:05:44 +00:00
TreeHugger Robot
5bddeaa9bc Merge "Properly parcel HdrCapabilities." into nyc-dev 2016-04-28 15:01:31 +00:00
Chet Haase
5d9a186435 Merge "Document behavior of object references in Animator classes" into nyc-dev
am: faa5726

* commit 'faa572608c7d62b116d3b9c6f28bd7eaddf8dba2':
  Document behavior of object references in Animator classes

Change-Id: Ic57273c1be809c14a642993ac09e203c1fb7247b
2016-04-28 14:41:43 +00:00
Chet Haase
faa572608c Merge "Document behavior of object references in Animator classes" into nyc-dev 2016-04-28 14:33:35 +00:00
Alex Hills
2a1a315713 Merge "Move allowGeneratedReplies to Action" into nyc-dev
am: 9de0f87

* commit '9de0f87e9708f86b46a3c38d4d091c2bc1ba9885':
  Move allowGeneratedReplies to Action

Change-Id: Ic391eb188644107aaa3401bf2a7d64f6ce867a76
2016-04-28 13:46:34 +00:00
TreeHugger Robot
9de0f87e97 Merge "Move allowGeneratedReplies to Action" into nyc-dev 2016-04-28 13:41:49 +00:00
Andrei Stingaceanu
c3176ea42b Merge "Fix ListView losing scroll position" into nyc-dev
am: adde076

* commit 'adde076fcba30d1571e985ee36687d3f4300438b':
  Fix ListView losing scroll position

Change-Id: I84c1f81403633d8e6f7c4b4ed95c018004878205
2016-04-28 09:26:36 +00:00
Clara Bayarri
adde076fcb Merge "Fix ListView losing scroll position" into nyc-dev 2016-04-28 09:20:47 +00:00
Martijn Coenen
1b65983aa9 Merge "Fix API review comments, add remove callback." into nyc-dev
am: d19191d

* commit 'd19191d4dcdefeebe0409d65740ee006c9e8a6a2':
  Fix API review comments, add remove callback.

Change-Id: I9ae9906df2f8ab3fdeb6c3e84a31ba66dcc7ca44
2016-04-28 05:43:17 +00:00
Martijn Coenen
d19191d4dc Merge "Fix API review comments, add remove callback." into nyc-dev 2016-04-28 05:34:05 +00:00
Lorenzo Colitti
40ead811e0 Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev
am: 1d3c594

* commit '1d3c59457c9bcf30e6ecb898e64d9d9725e7803e':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: Ic58f5be8dce42c17213ef261f348eda31c6c11e7
2016-04-28 05:25:22 +00:00
Jorim Jaggi
c880a803d1 Merge changes Idb555b01,If8acf31b into nyc-dev
am: 831ecc8

* commit '831ecc81f982282bdcc2121c2fa3ece22ac997e0':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ib61028c751a31b437fb459bd094c2fedadd40abe
2016-04-28 05:25:19 +00:00
TreeHugger Robot
1d3c59457c Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev 2016-04-28 04:01:11 +00:00
Jorim Jaggi
1793d4769b Remove optimization to report config change
Since activity manager only issues a configuration change when
we are not relaunching the activity, the optimization to suppress
that on the client side is not needed anymore and only leads to
issues where there is a change in smallest_width but we are not
relaunching the activity because the change doesn't cross a size
threshold.

Bug: 28050773
Change-Id: I303c190bd7390363d1030edcdb2913b7c64c666d
2016-04-27 20:59:40 -07:00
Lorenzo Colitti
c5be12e7ac Make isCaptivePortal perform both HTTP and HTTPS probes.
Also a couple of minor cleanups and logging tweaks.

Bug: 26075613
Change-Id: I67b09e96d72764179339b616072bb2ce06aabf33
2016-04-28 11:23:10 +09:00
Jorim Jaggi
c875ae74ba Don't move forced resizable info activity to the front
If we start the forced resizable activity with an existing task,
avoid moving that task to the front. This can cause that a previous
task that was moved to the back gets moved to the front again just
because we started that activity. That's not good.

Bug: 28223489
Change-Id: If8acf31b8be98b82665de1015d5621331c37fb64
2016-04-27 19:19:04 -07:00
Dianne Hackborn
e96bf3ccdd Merge "Fix issue #28431297: Crash in system process" into nyc-dev
am: 1a2f993

* commit '1a2f993ba5a81899500b989683364708025e13a5':
  Fix issue #28431297: Crash in system process

Change-Id: I46aec10a524e6864b414d12bb2a79bc24d8b47ae
2016-04-28 01:16:12 +00:00
Dianne Hackborn
1a2f993ba5 Merge "Fix issue #28431297: Crash in system process" into nyc-dev 2016-04-28 01:07:26 +00:00
Christopher Tate
294957370e Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev
am: 0731806

* commit '07318065b22ba13ae003d7803a3e48e441f9f6e5':
  Make sure FIRST_LAUNCH is after PACKAGE_ADDED

Change-Id: I91418919b5907986d13b7f9e113ab4c02fa7746a
2016-04-28 00:50:37 +00:00
Chris Tate
07318065b2 Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev 2016-04-28 00:41:02 +00:00
Dianne Hackborn
e761777323 Fix issue #28431297: Crash in system process
Don't allow null URIs to get put into the notification path.

Change-Id: I4f68f438960c8a90c7b417feaa2e19968a3a200a
2016-04-27 17:03:52 -07:00
Badhri Jagan Sridharan
b0ec5e2114 Merge "Add low power stats to batteryhistory" into nyc-dev
am: 5149abe

* commit '5149abe73eb52e5b0df16572397a58c295e23da3':
  Add low power stats to batteryhistory

Change-Id: I9778ada1ccc73041f4682c29d9c8d4ad1bf9e5c1
2016-04-27 23:51:39 +00:00
Badhri Jagan Sridharan
5149abe73e Merge "Add low power stats to batteryhistory" into nyc-dev 2016-04-27 23:32:19 +00:00
Adrian Roos
4dd85783ca Merge "Fix MessagingStyle HUNs" into nyc-dev
am: 5aa8e7d

* commit '5aa8e7d1f12f78dde892bdc6698550e8d1c558c4':
  Fix MessagingStyle HUNs

Change-Id: Ia69ff8eb3ab8a650af205b17e8f64bc877b7df64
2016-04-27 23:32:18 +00:00
Selim Cinek
b12c2e98e9 Merge "Handle empty bigTexts more gracefully" into nyc-dev
am: 1689203

* commit '1689203d5cc33c2490169d7998cf3ffbeb5d35fc':
  Handle empty bigTexts more gracefully

Change-Id: I3e81fdf19cdb4dd9a81e7cd1e1fd61769de0fdf1
2016-04-27 23:31:59 +00:00
Phil Weaver
44e272b469 Merge "Fix several accessibility magnification issues." into nyc-dev
am: 1f70f0b

* commit '1f70f0b7d60ad0b98fe6597162769bce8b85e3ed':
  Fix several accessibility magnification issues.

Change-Id: Ib174d8ff353fd990c5b3119b0728ec942784fbdc
2016-04-27 23:31:54 +00:00
Felipe Leme
3b17597fc5 Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev
am: 0db93ce

* commit '0db93cea0fef6aa73caa0ef422b8e0a4e45a24e5':
  Tethering and Data Saver: There Can Be Only One!

Change-Id: I876c9a30e9451b1c346296c233068bdfb579f584
2016-04-27 23:31:49 +00:00
Adam Powell
a3aef2a2b1 Merge "Don\'t lose content change during rollback for loader already started" into nyc-dev
am: 8ff7d16

* commit '8ff7d162c624f9889a8e90ac10b6b554869fef6e':
  Don't lose content change during rollback for loader already started

Change-Id: Ia0ac5631a4f0368121bfeda9d1e74b16d5cf0c31
2016-04-27 23:31:37 +00:00
Adrian Roos
975c918d24 Merge "Fix remote input view clobbering" into nyc-dev
am: 1a101db

* commit '1a101dbc81151942eafaa95762c2e3fd53ceb05f':
  Fix remote input view clobbering

Change-Id: I5166a5594e846576f395031978490be5aa412cd9
2016-04-27 23:31:30 +00:00
Michael Wright
b082890149 Properly parcel HdrCapabilities.
Since the field might be null, we can't just read and write the
object directly. Use Parcel's convenience methods to do so safely
instead.

Bug: 28427070
Change-Id: I6460c9cb43dc6da97d5fd9edeaa78bdaaf105446
2016-04-27 19:28:29 -04:00
Adrian Roos
5aa8e7d1f1 Merge "Fix MessagingStyle HUNs" into nyc-dev 2016-04-27 23:17:08 +00:00