45737 Commits

Author SHA1 Message Date
Jeff Sharkey
0cb736f754 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev
* commit '2b46774ff950270365238e12e4a336e2004500e2':
  Guard against MountService throwing NPE.
2015-01-09 19:21:24 +00:00
Jeff Sharkey
2b46774ff9 Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 2015-01-09 19:14:29 +00:00
Dianne Hackborn
a319aa800d Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev
automerge: 54f9b1e

* commit '54f9b1eedc86a3066bedf3d8ea3e8ffbb83cb678':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
2015-01-09 19:11:44 +00:00
Dianne Hackborn
54f9b1eedc Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 2015-01-09 19:08:50 +00:00
Dianne Hackborn
b3d4cb369e Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
  file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
  defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
  to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
2015-01-09 09:54:06 -08:00
Jeff Sharkey
9708669b2f Guard against MountService throwing NPE.
Fall through to below logic and return null instead of crashing the
entire app.  We already tell developers the value may be null.

Bug: 17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe
2015-01-08 14:00:15 -08:00
Dianne Hackborn
16e4324dd9 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev
* commit 'cb8d8e10b0c1163914aca85f8e3b73a0cac86fb4':
  Fix issue #18827122: system server crashed on broadcasting...
2015-01-08 21:46:53 +00:00
Dianne Hackborn
29cd7f1962 Fix issue #18827122: system server crashed on broadcasting...
...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
2015-01-08 10:58:45 -08:00
Christopher Tate
413ec4a657 am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
* commit 'bee49807dde9f19d5163e87b71fe17392bfe857c':
  Support single-package backup rejection by the transport
2015-01-07 23:23:14 +00:00
Christopher Tate
bee49807dd Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 2015-01-07 23:19:50 +00:00
Ben Murdoch
d4bc95770d am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
* commit '1eee52b1aa0ba0cc05ac513d0fa91de9ee643faf':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
2015-01-07 15:55:12 +00:00
Ben Murdoch
574fa34dd5 Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
2015-01-07 15:13:48 +00:00
Paul Miller
c2a17fff85 am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
* commit 'a517e81e2b1594da3e12c0547aabac5f357ce97b':
  Fix crash on pasting text in a WebView
2015-01-07 01:17:32 +00:00
Paul Miller
a517e81e2b Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev 2015-01-07 01:08:35 +00:00
Yin-Chia Yeh
c2112a7598 am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
* commit '8d46f934ca56e057182882034d796cc03e960c4d':
  Camera: doc update for color aberration modes
2015-01-07 00:04:13 +00:00
Yin-Chia Yeh
8d46f934ca Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev 2015-01-06 23:59:03 +00:00
Christopher Tate
b89e1405cf Support single-package backup rejection by the transport
We now cleanly handle the case of the transport blacklisting specific
packages from key/value backup.  Previously we would halt the entire
backup pass and reschedule if the transport returned any error from
performBackup(pkg).  Now, we recognize the TRANSPORT_PACKAGE_REJECTED
result from that invocation, and properly drop that package's work
but proceed with running the rest of the backup queue as expected.

Bug 18694053

Change-Id: Id0dd6d59492bdea9f970540d776f37db0cc5d99c
2015-01-06 15:48:33 -08:00
Deepanshu Gupta
e15f580b9d am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '2bd01ebfa99815d4fb6b4e77754146a22cf66d03':
  Add preferences rendering.
2015-01-06 22:29:17 +00:00
Deepanshu Gupta
2bd01ebfa9 am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '7ed145493d3f5bea32c567980f77cc42f613197e':
  Add preferences rendering.
2015-01-06 22:22:36 +00:00
Paul Miller
f6bf1d7b30 Fix crash on pasting text in a WebView
WindowDecorActionBar and Chrome's ContentViewCore each have their own ActionMode
reference. ActionModeImpl.finish() nulls WindowDecorActionBar's reference and
calls mCallback.onDestroyActionMode() to null ContentViewCore's reference. But
if the callback is deferred, there is a period when the ActionMode is finished
(and mCallback is null), but ContentViewCore doesn't know. ContentViewCore may
try to invalidate() the ActionMode, which will crash on the null mCallback.

Make ActionModeImpl more permissive so that calling invalidate() during this
period does nothing.

BUG:18758329
Change-Id: I407fa0e0cd3cffa217e165caed83130d44760316
2015-01-06 11:32:02 -08:00
Yin-Chia Yeh
941aac0c07 Camera: doc update for color aberration modes
Code-gened document update for camera2 spec.

Bug: 18915494
Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
2015-01-06 18:46:15 +00:00
Paul Jensen
6c93739f2f am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.
* commit '9ffb53cb1131eeac5c246e7378455bb4b64293f5':
  Clear process DNS NetID binding when expiring or releaseing legacy requests.
2015-01-06 14:49:09 +00:00
Paul Jensen
9ffb53cb11 Clear process DNS NetID binding when expiring or releaseing legacy requests.
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.

bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
2015-01-06 09:43:04 -05:00
Deepanshu Gupta
7ed145493d am 7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '7081a114d4ee190c746f337057b0f84928c162dd':
  Add preferences rendering.
2015-01-05 23:32:53 +00:00
Deepanshu Gupta
9c8f8ed8a8 am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
* commit '4a5baeaec9294dbb43fe3b36a44b3176101756b6':
  resolved conflicts for a0bc2e7e to lmp-mr1-dev
2015-01-05 23:30:18 +00:00
Deepanshu Gupta
4a5baeaec9 Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev 2015-01-05 23:26:04 +00:00
Dianne Hackborn
24bc8d761a am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev
* commit '298071951210ae23c8023c4dc8f82da5d1760211':
  Fix issue #18901214: APR: Frequent crash in android
2015-01-05 23:09:07 +00:00
Dianne Hackborn
2980719512 Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 2015-01-05 23:03:48 +00:00
Filip Gruszczynski
8117eda6f1 am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
* commit '8c6b59f46da3e65ce157fe40a08f1c1fbba3e1c2':
  Add system api for disabling touch events in wallpaper behind the window.
2015-01-05 22:50:29 +00:00
Filip Gruszczynski
8c6b59f46d Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 2015-01-05 22:46:14 +00:00
Dianne Hackborn
b182955a1e Fix issue #18901214: APR: Frequent crash in android
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path.  This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
2015-01-05 14:40:24 -08:00
Alan Viverette
bde76419c1 am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
* commit '1f3f47b3680547dbb764db173e02d833e12d65a2':
  Avoid double-translating View background
2015-01-05 22:32:10 +00:00
Alan Viverette
1f3f47b368 Merge "Avoid double-translating View background" into lmp-mr1-dev 2015-01-05 22:26:54 +00:00
Alan Viverette
b15703c9b4 Avoid double-translating View background
Reverse-translate the canvas before passing to Drawable.draw() so that
we don't double-apply the drawable's translation.

BUG: 18904688
Change-Id: I8450de9b240ddeae887b4e1003c0608da814a001
2015-01-05 14:20:42 -08:00
Alan Viverette
bf80d2737f am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
* commit '748902420d26b2868296303be7df89d0c25b7f2b':
  Don't override dialog icon drawable unless valid resource ID was set
2015-01-05 21:43:27 +00:00
Alan Viverette
748902420d Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 2015-01-05 21:39:13 +00:00
Filip Gruszczynski
fe56835934 Add system api for disabling touch events in wallpaper behind the window.
Bug: 18721756
Change-Id: I40b749a9916536d52042e5dd49a23575bedad754
2015-01-05 12:57:19 -08:00
Alan Viverette
5c2d8f7d51 Don't override dialog icon drawable unless valid resource ID was set
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.

BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
2015-01-05 12:56:45 -08:00
Alan Viverette
154d251ee6 am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev
* commit '22a3163f1da8387e42c68c459f5667ac10744a3c':
  Fix selector bug
2015-01-05 20:28:06 +00:00
Alan Viverette
22a3163f1d Merge "Fix selector bug" into lmp-mr1-dev 2015-01-05 20:23:47 +00:00
Alan Viverette
db7eefbbfd am dd508581: Use min when comparing AM and PM text lengths
* commit 'dd508581216ef3ef47bd474316232f269db43f03':
  Use min when comparing AM and PM text lengths
2015-01-05 20:06:32 +00:00
Alan Viverette
dd50858121 Use min when comparing AM and PM text lengths
Also cleans up code a little to prevent unnecessary re-computation
of lower-cased strings and use final where possible.

BUG: 18874813
Change-Id: I852eb7a281aed64ac36e95f32f5fa410f50abfa4
2015-01-05 11:28:12 -08:00
Jinsuk Kim
877919bb18 am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev
* commit '6cfb44952a76303fe1c7cc75b545cb8aad72eecf':
  CEC: Let MHL device be of type 'source'
2015-01-05 07:16:24 +00:00
Jinsuk Kim
e416d0f67b CEC: Let MHL device be of type 'source'
MHL devices should be of type source that can stream AV contents
to the connected TV. This should be supported by the API
HdmiDeviceInfo.isSourceType().

Bug: 18897172
Change-Id: I7dcbd7773127bf26797c204504a12c3e2ebbd83b
2015-01-05 16:07:28 +09:00
Deepanshu Gupta
f5b02eb7c4 resolved conflicts for a0bc2e7e to lmp-mr1-dev
The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.

This change also fixes the typo in the original change which was fixed
in a subsequent change.

Original commit: 12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a
fix for typo: cb09bc45c58740af953874f9915306d351fc3d9d

Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
2014-12-30 14:07:29 -08:00
Michael Wright
9570045713 am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev
* commit 'a33424a540ea725d4b513ee713931c66e62721a2':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
2014-12-30 19:45:47 +00:00
Michael Wright
a33424a540 Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 2014-12-30 19:40:52 +00:00
Svetoslav
72da9ed886 am e5ea48a7: Fix a race in accessibility manager.
* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
  Fix a race in accessibility manager.
2014-12-29 18:23:54 +00:00
Svetoslav
e5ea48a7fe Fix a race in accessibility manager.
The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.

bug:18840784

Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
2014-12-29 09:40:46 -08:00
Michael Wright
446e019a06 Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
This prevents our lint tooling from complaining that we're passing
invalid values when trying to get the MediaProjectionManager.

Bug: 18830590
Change-Id: I34633248e895b0ac7f5083e18a7d2385ca6f8adb
2014-12-23 17:01:49 -08:00