Commit Graph

44678 Commits

Author SHA1 Message Date
Amith Yamasani
2079133871 am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
* commit '4bf0356ee2058c7f033a41e02fa3eb86909c450c':
  Hide DISALLOW_OUTGOING_BEAM API
2014-10-14 22:04:01 +00:00
Dianne Hackborn
f23b29ad5a am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev
* commit 'a861a9d713c99b576c0e7284a65d50838c4f953a':
  Fix issue #10034864: Define YouTube application as the preferred...
2014-10-14 19:58:39 +00:00
Amith Yamasani
4bf0356ee2 am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
* commit '15a5f82f9b6b389614b1df78749bd627d97d5417':
  Hide DISALLOW_OUTGOING_BEAM API
2014-10-14 19:57:46 +00:00
Amith Yamasani
15a5f82f9b Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 2014-10-14 19:51:15 +00:00
Dianne Hackborn
a861a9d713 am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev
* commit '35de0e2872b64f78b596a850d6da2c483ba65bb5':
  Fix issue #10034864: Define YouTube application as the preferred...
2014-10-14 19:21:18 +00:00
Dianne Hackborn
35de0e2872 Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 2014-10-14 19:16:22 +00:00
Dianne Hackborn
f85e7af4d0 Fix issue #10034864: Define YouTube application as the preferred...
...handler for its Intents

Fix bug when a third party app is installed as an additional but
worse match for the intent.

Also raise up the limit for when we start printing logs about
overly large strict mode data.

And turn off the logs about services being created and destroyed,
since with the way things are using services these days these have
become way too spammy.

Change-Id: I8fe301dfd80fb4b70213cb7783b7c5426245278d
2014-10-14 10:46:52 -07:00
John Spurlock
bec0c53a40 Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev 2014-10-14 16:40:31 +00:00
Amith Yamasani
6d93491f50 Hide DISALLOW_OUTGOING_BEAM API
This is not fully functional in managed profiles, so it is being removed for L.

Bug: 17973040
Change-Id: If660e5e565076cdf61649e9f5ca12877425e9df3
2014-10-14 09:31:30 -07:00
Nicolas Prevot
d8a21bbedb Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 2014-10-14 09:07:43 +00:00
Wei Wang
3f0aa505f4 am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev
* commit '34020eb6ebc619c90b9107003331a91e4d5a350e':
  Add support of advertising through standard instance.(1/4)
2014-10-13 23:05:37 +00:00
Wei Wang
34020eb6eb Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 2014-10-13 23:02:30 +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
John Spurlock
0e588ea8e1 Make SeekBarVolumizer restartable.
Decouple start from constructor, making it possible to restart
once stopped.

Bug:17898190
Change-Id: I2f860864161f818d5a62a28331ef1c47051fb39f
2014-10-13 20:46:36 +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
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
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
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
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
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
Nicolas Prevot
1a81592169 Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.
Inside ResolverActivity: when getting the ResolveInfo for EXTRA_INITIAL_INTENTS:
The ResolveInfo is created directly inside ResolverActivity, not by PackageManagerService.
So, noResourceId had not been set to true for this ResolveInfo.
So setting it inside ResolverActivity.

This is needed since inside a managed profile, the icons are not associated with resource ids.

BUG:17577733
Change-Id: Ic4f0439128f95482167103b783344e2baa0aed52
2014-10-10 16:40:08 +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
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
Jorim Jaggi
51650235c1 Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 2014-10-09 22:01:56 +00:00
Adam Powell
7cb761fe8c Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 2014-10-09 20:08:41 +00:00
Adam Powell
19a9e6c23b Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev 2014-10-09 19:57:00 +00:00
Adam Powell
a7a735fb2a Document that MarginLayoutParams margins should be positive.
Negative margins can cause all sorts of other problematic assumptions,
subtle errors and unexpected behavior. While they technically work
developers should steer clear of them.

Change-Id: Ia1f7d9a33e25444ebdc3c32679ae1179210558e1
2014-10-09 12:54:52 -07:00
Dianne Hackborn
0e259ce2d7 am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev
* commit '6166a824b2ea7b7918f54769005ab691e15f77f7':
  Implement issue #17906468: Allow search request to fall back to global search
2014-10-09 19:30:26 +00:00
Tim Kilbourn
bb76d5cd88 am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev
* commit '5d7f58be2c034823d6e5cfab847ad50b2a463dfc':
  Don't start SearchDialog on television.
2014-10-09 19:17:10 +00:00
Tim Kilbourn
5d7f58be2c am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev
* commit '37bd07768a05aabb0905608606f354a488a2d5cf':
  Don't start SearchDialog on television.
2014-10-09 19:09:30 +00:00
Jorim Jaggi
ef72a198af Apply color to progress bar for notifications
Bug: 17128179
Change-Id: Ia642ff2a352bbabf2d1e468367d45dc188ee0e73
2014-10-09 11:37:00 -07:00
Tom O'Neill
7731a99807 Fix a race where NLP consent dialog can be shown unnecessarily
- Bug: 17908111

Change-Id: If94570861f38b922478d490599ab02cfb86adea6
2014-10-09 11:30:49 -07:00