Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,034 Commits 3 Branches 0 Tags
2e7aa67585778cc4ef518ee259103c7dfd384ee9
Commit Graph

44493 Commits

Author SHA1 Message Date
Patrick Tjin
cae740173f am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'f7c59190f7f0ece82b98ed61ca16d5f7ab20dc0d':
  Skip over directories when iterating tombstones
 2014-10-01 22:18:04 +00:00
John Reck
d644facfcd am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit 'f408656a731328694b3ffee2f588263d60349dc3':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 22:16:43 +00:00
Hui Shu
7ce8d27fcd am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '9cd616e067b9049c87ad5064d3cf4b8cc380ddfa':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 22:15:52 +00:00
Patrick Tjin
f7c59190f7 am dea847c2: Skip over directories when iterating tombstones 
* commit 'dea847c2ace8894a595cf9bd87764ce2ca9698ab':
  Skip over directories when iterating tombstones
 2014-10-01 21:29:52 +00:00
Patrick Tjin
dea847c2ac Skip over directories when iterating tombstones 
Bug: 17380601
Change-Id: Idb6e559a89c7438751bd7a52375b9789454e0334
 2014-10-01 21:17:52 +00:00
John Reck
f408656a73 am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '8786a962f0aa9991e0bc668eb7d9eae45645409e':
  Re-allow suppressing onDetachedFromWindow
 2014-10-01 19:16:07 +00:00
John Reck
8786a962f0 Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 2014-10-01 19:11:04 +00:00
Hui Shu
9cd616e067 am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
  Remove WebView DRP Setting from Developer Settings
 2014-10-01 18:35:49 +00:00
Hui Shu
aee5c9e7c1 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:57 +00:00
Craig Mautner
3867e4d0c0 am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '9ab8fbbc60588b204d362bdab45d892e8274382b':
  Don't clear visible-behind activity if it is top
 2014-10-01 17:58:34 +00:00
Craig Mautner
9ab8fbbc60 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
 2014-10-01 17:52:57 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
John Reck
77e4a5250f Re-allow suppressing onDetachedFromWindow 
Bug: 17578553

Games seem to be doing this to prevent destruction of their
GL contexts, and they assume it works even if it doesn't. However,
GLSurfaceView is clunky here, so while the app is doing something
questionable we don't really offer a better way. For now revert
back to kitkat behavior.

Change-Id: Icfa9e496279b9cfa47f9bc7f6848d9313caed0d5
 2014-10-01 10:38:07 -07:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top 
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
 2014-10-01 10:14:53 -07:00
Narayan Kamath
13705ca940 am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit 'd480147f1853e452e7e8fc4820db0e7821488289':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 15:16:34 +00:00
Jerome Poichet
0d71155d42 am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit 'a5fa02dfa8ae6e2a8cfab6489ada400f8c33f455':
  Make sure cancel is called on tear down.
 2014-10-01 15:16:12 +00:00
Eino-Ville Talvala
bf1184e8bb am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit '4ddacc465d52d118dedc087f68d6a00f8b419342':
  Camera2 Legacy: Set a default thumbnail size
 2014-10-01 15:15:43 +00:00
Adam Powell
ced21e4e65 am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 
* commit 'c754382ba042ee0c70892b5ec33cd32c11e98d16':
  Inset the non-overlay contextual action bar without a status guard
 2014-10-01 15:15:25 +00:00
Alan Viverette
601fa2498d am 8c14ff5c: am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 
* commit '8c14ff5cb1e742e7e57cc213f91cb76b9600479c':
  Implement missing visibility management for FrameLayout foreground
 2014-10-01 15:15:21 +00:00
Ruben Brunk
4d9face69e am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit '7432b88447dea2a9a5b8adcfeb150da7a18d22f6':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 15:15:14 +00:00
Dianne Hackborn
16b6a8f702 am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '962e3e831516688824fec334c5ddcfd4f3d13f44':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 15:15:07 +00:00
Svetoslav
344ffbc647 am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '567c97881b1d1719d32daaf647979e47e01be438':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:15:03 +00:00
Winson Chung
d1c1201dfc am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit 'b61dea2047b1b27f169728104f8279528fbd9eac':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 15:14:56 +00:00
Chris Wren
82ef988c92 am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'b742c9a01261075d6a85f23d72e7842dec932cda':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 15:14:52 +00:00
Chris Wren
1d88c087e6 am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit '4afe428f49533342966545a14b51acaee9052c71':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 15:14:49 +00:00
Dianne Hackborn
30854356ef am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit '29a115235832fd4ea6f6cac1ad962a3bfe6e99be':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 15:14:38 +00:00
George Mount
6d7a0cd57f am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '3dc0a918748fade0ad7c683c6bc769f032759fcd':
  Clear preordered list after use.
 2014-10-01 15:14:22 +00:00
Narayan Kamath
d480147f18 am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '7dc7f676d699c739128dcc7855cbc0dacddaaa57':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 15:04:02 +00:00
Jerome Poichet
a5fa02dfa8 am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '72079f7f9b644e57169e26597ec7c727786071a1':
  Make sure cancel is called on tear down.
 2014-10-01 15:03:07 +00:00
Eino-Ville Talvala
4ddacc465d am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 
* commit '0a62ab707977d4d6666d1c452ba702442655b6e6':
  Camera2 Legacy: Set a default thumbnail size
 2014-10-01 15:02:29 +00:00
Adam Powell
c754382ba0 am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 
* commit 'fe426d061ad5feb65200c2970bf826b10e356247':
  Inset the non-overlay contextual action bar without a status guard
 2014-10-01 15:01:37 +00:00
Alan Viverette
8c14ff5cb1 am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 
* commit 'c44c77d305c02d9c8280df5ce3a816ee586c9d52':
  Implement missing visibility management for FrameLayout foreground
 2014-10-01 15:01:31 +00:00
Ruben Brunk
7432b88447 am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 
* commit 'b3c802f2381c3411fe753206ab89027f60164b77':
  camera2: Use valid dimensions for RGBA8888 gralloc buffers.
 2014-10-01 15:01:24 +00:00
Dianne Hackborn
962e3e8315 am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 15:00:49 +00:00
Svetoslav
567c97881b am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '44d4eeaa48721296663a05d01071f196a509dc34':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:00:44 +00:00
Winson Chung
b61dea2047 am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit 'da649073bd927fa69d02982745cc1d61e9a4f8b3':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 15:00:17 +00:00
Chris Wren
b742c9a012 am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'c3328cacdad67623f94b13fceb734d958461a475':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 14:59:59 +00:00
Chris Wren
4afe428f49 am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit 'af098c5657942d645ec7362cc439718457abec64':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 14:59:55 +00:00
Dianne Hackborn
29a1152358 am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 14:59:18 +00:00
George Mount
3dc0a91874 am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
  Clear preordered list after use.
 2014-10-01 14:58:53 +00:00
Narayan Kamath
7dc7f676d6 Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 2014-10-01 09:53:34 +00:00
Dianne Hackborn
e26ba8f74f am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '069de2045ef1b65f8952e2a452afbfa6bdc3f850':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 00:58:52 +00:00
Jerome Poichet
c1fb6dc1a4 Make sure cancel is called on tear down. 
- Make sure cancel is called when consumer of SpeechRecognizer calls
  destroy.
- If consumer goes away, make sure to call cancel as well.

b/17584947 Pressing mic button in Music hoses audio

Change-Id: Ibe1198b37fe6167493a8694f9089d970f1eb07de
 2014-09-30 17:56:27 -07:00
Dianne Hackborn
069de2045e am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 00:51:10 +00:00
Hui Shu
eb487c6301 Remove WebView DRP Setting from Developer Settings 
BUG: 17730990
Change-Id: Ic4fde9affb2f887329d6b3d2dbe8945959c016d8
 2014-09-30 16:52:41 -07:00
Eino-Ville Talvala
0a62ab7079 Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev 2014-09-30 23:44:58 +00:00
Adam Powell
fe426d061a Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev 2014-09-30 22:17:01 +00:00
Alan Viverette
c44c77d305 Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev 2014-09-30 22:06:05 +00:00
Ruben Brunk
b3c802f238 Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev 2014-09-30 22:05:48 +00:00
Alan Viverette
3be5e0e625 Implement missing visibility management for FrameLayout foreground 
BUG: 15350931
Change-Id: I16900d0d95051489852385d682e7b5aa4adad327
 2014-09-30 14:27:58 -07:00