Aravind Akella
2a8be3c9b5
am b78c1679: am 1f9b32f0: Sensor documentation fixes.
...
* commit 'b78c16793b1542ff786bc6ae58cafa876b4bce45':
Sensor documentation fixes.
2014-10-14 17:48:29 +00:00
Jesse Hall
3e1732907b
am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
...
* commit '05bbbebb475a2816d60c4a8ec140cccddc16b269':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
2014-10-14 17:22:33 +00:00
Aravind Akella
1f9b32f006
Sensor documentation fixes.
...
Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1
2014-10-13 22:25:46 +00:00
Jesse Hall
8d3cf106aa
am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
...
* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
2014-10-13 22:08:31 +00:00
Jesse Hall
d4b38fe5c0
am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev
...
* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
2014-10-13 22:03:59 +00:00
Jesse Hall
d7e559675c
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
...
If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.
Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.
This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)
Bug: 17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
2014-10-13 11:01:15 -07:00
Marcin Kosiba
103817ed36
am 4c8dd87a: am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
...
* commit '4c8dd87a9e952a3ca157411b1a374c83064c9b2f':
Remove the default WebView text encoding resource entirely.
2014-10-13 09:55:22 +00:00
Marcin Kosiba
58ee8a966a
am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
...
* commit '4f3ee426f62662f590c056ce44f005cd716f9870':
Remove the default WebView text encoding resource entirely.
2014-10-13 09:47:01 +00:00
Marcin Kosiba
4f3ee426f6
am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
...
* commit '437517573b53b17765eba9b0b98055915bf3a4a1':
Remove the default WebView text encoding resource entirely.
2014-10-13 09:42:58 +00:00
Marcin Kosiba
437517573b
Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
2014-10-13 09:37:36 +00:00
George Mount
4ab9626411
am e25130d4: am e6308c7e: am 52fb8a42: am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
...
* commit 'e25130d4e54f14913976c61408fee949d9f3cf8f':
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
2014-10-10 23:21:06 +00:00
Christopher Tate
697c94a4ab
am 702f2747: am f1178b23: am 2c15bbc8: am 1133e29f: Tweak wallpaper restore rejection threshold
...
* commit '702f2747b5731371558f8e4bb448582023831fda':
Tweak wallpaper restore rejection threshold
2014-10-10 23:20:52 +00:00
George Mount
e6308c7eb2
am 52fb8a42: am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
...
* commit '52fb8a4245aad87972bb6b52697fcd2dd111fe99':
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
2014-10-10 22:53:47 +00:00
Christopher Tate
f1178b23ac
am 2c15bbc8: am 1133e29f: Tweak wallpaper restore rejection threshold
...
* commit '2c15bbc8382ac7e5f04d149c8f576261f1dca334':
Tweak wallpaper restore rejection threshold
2014-10-10 22:52:57 +00:00
Dianne Hackborn
5457d5ccb6
am 8f6928f1: am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev
...
* commit '8f6928f1399620ce432b82d046912e2030d6511c':
Improve some docs, fix some debugging.
2014-10-10 21:06:48 +00:00
George Mount
52fb8a4245
am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
...
* commit '1a285496fb504d4c4d41e97a7c3b67210c1a67ef':
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
2014-10-10 20:52:22 +00:00
George Mount
1a285496fb
Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
2014-10-10 20:48:10 +00:00
Dianne Hackborn
e61e68d001
am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev
...
* commit '18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63':
Improve some docs, fix some debugging.
2014-10-10 20:47:07 +00:00
George Mount
5ac9b20b41
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
...
Bug 17938614
Change-Id: Ia341fdd63ab57ec16a3de6349b7eb07fdc0a48ae
2014-10-10 13:22:36 -07:00
ztenghui
6a7335acd8
am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev
...
* commit '3406be853d21af58d551adbde805706f43ef51e2':
Support negative value in exponential data in the pathData.
2014-10-10 20:12:06 +00:00
ztenghui
5237c0c3c9
Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev
2014-10-10 19:59:23 +00:00
ztenghui
897f6daeff
Support negative value in exponential data in the pathData.
...
Now "1e-5" will not be separated as "1e" and "-5".
Add one test for this use case.
Make sure we print out the pathData when path parsing has error.
b/17919923
Change-Id: I10a00ce21166cfb5a009c49c1a93f40eeb956d83
2014-10-10 11:11:34 -07:00
Christopher Tate
2c15bbc838
am 1133e29f: Tweak wallpaper restore rejection threshold
...
* commit '1133e29f22252cc36102f41204c3de35779e49d2':
Tweak wallpaper restore rejection threshold
2014-10-10 18:05:32 +00:00
Christopher Tate
1133e29f22
Tweak wallpaper restore rejection threshold
...
Raise the height ratio threshold slightly in order to start accepting
restores of height=1920 images onto height=2560 devices.
Bug 17882661
Change-Id: I63b47817fdf754cda9a052bddb62aee764522c6f
2014-10-10 17:54:14 +00:00
Tom O'Neill
2a30585a4f
am 58d0b623: am 1db0cce0: Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev
...
* commit '58d0b623f124c9bee3fe6aba33182c0ff6b1c28a':
Fix a race where NLP consent dialog can be shown unnecessarily
2014-10-10 17:16:23 +00:00
Svetoslav
d7c3816f84
am f874a06b: am e78aa531: am 9ab1b1bb: am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev
...
* commit 'f874a06b952bafefb1ab2df8634b18ca30731eaf':
Fix child view ordering for accessibility.
2014-10-10 17:15:08 +00:00
Dianne Hackborn
a22d2fc319
am 57af6ac7: am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue #17906468 : Allow search request to fall back to global search" into lmp-dev
...
* commit '57af6ac767ff7063adbff694ff784e9ddc442a7e':
Implement issue #17906468 : Allow search request to fall back to global search
2014-10-10 17:14:36 +00:00
Jorim Jaggi
1137ea7eaf
am 782994ef: am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev
...
* commit '782994efd30a153af44c38a9871d24fecb0eb609':
Apply color to progress bar for notifications
2014-10-10 17:01:07 +00:00
Adam Powell
f0eba02485
am 0f61804f: am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev
...
* commit '0f61804f18988dd547d3d56aef40a13aa59d3ce6':
Document that MarginLayoutParams margins should be positive.
2014-10-10 17:00:35 +00:00
Adam Powell
de640f0210
am 02091f07: am 19a9e6c2: Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev
...
* commit '02091f071ad2b4754c9f4c7a66738d0d661c0c0e':
Throw a more descriptive exception when adding null to a ViewGroup
2014-10-10 17:00:30 +00:00
Tim Kilbourn
9d285e7f99
am 79297f3c: am bb76d5cd: am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev
...
* commit '79297f3c1c7898a194310169ef499889ed544a57':
Don't start SearchDialog on television.
2014-10-10 16:59:04 +00:00
Jeff Hao
915bd5ca4f
am 4b34b329: am 6b7515dd: Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev
...
* commit '4b34b329fb242985eedec63418b50357b00f6bd8':
Improve priority ordering of apps when performing boot dexopt.
2014-10-10 16:58:14 +00:00
Christopher Tate
eb129805b5
am 05d7f0df: am a4d5471f: am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
...
* commit '05d7f0dfe8352aab87d35f42209b1d34ae30b2d1':
Turn on dimension validation in wallpaper restore
2014-10-10 16:57:50 +00:00
Adam Lesinski
557b8d7cbd
am bd1867e4: am 03be7ab5: am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev
...
* commit 'bd1867e48e9655c266fa901ec7bc9f85f8fb5c11':
Remove UsageEvents#resetToStart() as it doesn't work
2014-10-10 16:57:35 +00:00
ztenghui
39af6ae064
am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev
...
* commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da':
Support dot separation as the svg path data did.
2014-10-10 16:57:03 +00:00
Marcin Kosiba
fd1ac83f63
Remove the default WebView text encoding resource entirely.
...
Having the default text encoding in config.xml makes it seem like
it's something that could be changed, but upon further inspection
we can't see any good reason for anyone to ever want to change it
from UTF-8.
BUG: 17634120
Change-Id: I10a09ab1d65590c29efb10222abfa08ca52b5c84
2014-10-10 17:20:58 +01:00
Tom O'Neill
1db0cce028
Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev
2014-10-10 15:26:30 +00:00
Dianne Hackborn
18d2d51ee3
am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev
...
* commit '7ea69880bdbf2c51140460dcfd063dc015c3ce26':
Improve some docs, fix some debugging.
2014-10-10 14:44:59 +00:00
Eino-Ville Talvala
874d982c4d
am 58d5a8b6: am 7e7a14c5: am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev
...
* commit '58d5a8b646ed479d12109a94b9ebd37be79e4662':
Camera2: Docs cleanup, especially units and range
camera2: Update docs only for legacy devices
2014-10-10 04:26:51 +00:00
Dianne Hackborn
75a6e82bcc
am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
...
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
Put in real "code" (aka marketing) name.
2014-10-10 04:26:40 +00:00
Jeff Sharkey
1855d0da8b
am 8a1df415: am b4248495: am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev
...
* commit '8a1df4154d0e1296a3f03fa2aaf852ac08f68f36':
Bring along more ApplicationInfo fields.
2014-10-10 04:26:29 +00:00
Dianne Hackborn
7ea69880bd
Merge "Improve some docs, fix some debugging." into lmp-dev
2014-10-10 01:27:13 +00:00
Dianne Hackborn
ab4a81b3c6
Improve some docs, fix some debugging.
...
- Add docs to Binder, Messenger, ResultReceier to explain their
relation (or lack there-of) to process lifecycle.
- Clarify some aspects of process lifecycle for services.
- Fix help text of am command.
- Fix per-package dumping of battery stats to not include history.
- Fix per-package dumping of proc stats to only include aggregated
and current stats and fix some formatting.
- Fix per-process dumping of meminfo to have an option to interpret
the input as a package, so including all processes that are
running code of that package.
- Fix top-level per-package debug output to correctly include all
of these improvements and give them a little more time (10s) to
complete for timing out.
Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
2014-10-09 18:21:59 -07:00
Svetoslav
e78aa53123
am 9ab1b1bb: am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev
...
* commit '9ab1b1bbe62aa0424214bb5bbcfd707cb8ac8199':
Fix child view ordering for accessibility.
2014-10-10 00:32:15 +00:00
Dianne Hackborn
d190a5ca4c
am 0e259ce2: am 6166a824: Merge "Implement issue #17906468 : Allow search request to fall back to global search" into lmp-dev
...
* commit '0e259ce2d7ed09c58993da5c5b63966e8f467c82':
Implement issue #17906468 : Allow search request to fall back to global search
2014-10-10 00:30:33 +00:00
Svetoslav
9ab1b1bbe6
am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev
...
* commit 'c43caf52a61e56d5ed78f947fc8c299ad5273abf':
Fix child view ordering for accessibility.
2014-10-10 00:10:38 +00:00
Svetoslav
c43caf52a6
Merge "Fix child view ordering for accessibility." into lmp-dev
2014-10-10 00:03:54 +00:00
Svetoslav
88e447b576
Fix child view ordering for accessibility.
...
When reporting views to accessibility services we are ordering the
children in a parent based on their location on the screen. The
initial implementation worked pretty well in practive but violated
the transitivity property leading to rare crashes in apps. The current
implementation does not violate transitivity but does not produce
good ordering.
Given the lack of time and to minumize risk this change uses the
old strategy which works most of the time and if that fails we
fall back to the current strategy. Coming up with a correct strategy
that produces good results requires more time.
bug:17887986
Change-Id: I1c233ecdf318befc315e793696ac48bd6c652ab6
2014-10-09 16:40:47 -07:00
Alan Viverette
cda9841a8b
am f1d23f9c: am fe087d38: Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev
...
* commit 'f1d23f9cc1992b936c98e2882eb5a3d766129fe7':
Fix invalid bounds detection in ExploreByTouchHelper
2014-10-09 22:23:11 +00:00
Jorim Jaggi
51650235c1
Merge "Apply color to progress bar for notifications" into lmp-mr1-dev
2014-10-09 22:01:56 +00:00