Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
162,762 Commits 3 Branches 0 Tags
d060a29e52fc73be53d643f74a9335652bd818ca
Commit Graph

45497 Commits

Author SHA1 Message Date
Amith Yamasani
d060a29e52 am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '6c0659e0eba77972f1ba8a2ad2a51ea7b2c76b9a':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-15 02:04:06 +00:00
Dianne Hackborn
133c747e10 am 3c5a70e0: am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit '3c5a70e0314cd21d42eda406ed2239303b07e6e1':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-15 02:03:59 +00:00
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
John Spurlock
9766d5b236 am 23e47ce6: am bec0c53a: Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev 
* commit '23e47ce65273607d36474422ab02e1ae6fbd41c9':
  Make SeekBarVolumizer restartable.
 2014-10-14 17:51:17 +00:00
Nicolas Prevot
e5a75d1333 am 20ec9b79: am d8a21bbe: Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev 
* commit '20ec9b79f1d98ccbe5b8d4486feaf37a4f80a945':
  Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.
 2014-10-14 17:51:02 +00:00
Wei Wang
ce285c8afb am 1602b0f8: am 3f0aa505: am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev 
* commit '1602b0f8d0ccbdedb5406a5d427c777c5d8b39b5':
  Add support of advertising through standard instance.(1/4)
 2014-10-14 17:49:24 +00:00
Aravind Akella
2a8be3c9b5 am b78c1679: am 1f9b32f0: Sensor documentation fixes. 
* commit 'b78c16793b1542ff786bc6ae58cafa876b4bce45':
  Sensor documentation fixes.
 2014-10-14 17:48:29 +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
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
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
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