drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,124 Commits 1 Branch 0 Tags
Commit Graph

126124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
717e0f5db7 Merge "Don't prompt at boot if we already did that when decrypting" 2014-03-21 20:40:46 +00:00
Jinsuk Kim
a7efb93c1b am a10958f1: am cfba284a: am d73e66cc: Fix broken build 
* commit 'a10958f1c386851dc69a5dae2c32b899b9f29277':
  Fix broken build
 2014-03-21 20:23:45 +00:00
Colin Cross
8a60ded026 Merge "resolved conflicts for merge of a67e34c8 to master" 2014-03-21 20:19:54 +00:00
Colin Cross
a42cb8b0e2 resolved conflicts for merge of a67e34c8 to master 
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
 2014-03-21 13:11:02 -07:00
Bo Liu
caf947737d Merge "Convert a attach/detach functor in ViewRootImpl to x64" 2014-03-21 20:00:35 +00:00
Adam Cohen
fb40d78c57 Merge "Catch exceptions if Exif is malformed" 2014-03-21 19:55:54 +00:00
Adam Cohen
146af201d3 Merge "Catching security exception when activity destroyed" 2014-03-21 19:54:55 +00:00
John Spurlock
3daafcd7ba Merge "Annotate framework vibrate calls with stream hints." 2014-03-21 19:51:44 +00:00
Selim Cinek
a4c1ccf3e0 Merge "Disable Set Wallpaper button while loading image" 2014-03-21 19:39:38 +00:00
Selim Cinek
5ab7d37d90 Catch exceptions if Exif is malformed 
Bug: 11650650
Change-Id: Ie1680220fdb235a166a0eaa0a2309729f861865c
 2014-03-21 20:32:34 +01:00
Selim Cinek
d6901a95d8 Catching security exception when activity destroyed 
Fixed a bug where an asynctask tried to load an image
even after the activity was destroyed leading to a
security exception since the permission could not be granted anymore.

Bug: 12760267
Change-Id: Ieffb10b1007f349371647512ffe4fe72433344e7
 2014-03-21 20:24:55 +01:00
Craig Mautner
f7ad855718 Apply FLAG_SHOW_WHEN_LOCKED within tasks. 
If the bottommost fullscreen window of a task has FLAG_SHOW_WHEN_LOCKED
set then show all windows of the task that are above that window.

Fixes bug 13558398.

Change-Id: Ied8ada54efbb079eaf375470b2eae749e5551c24
 2014-03-21 12:24:07 -07:00
Chris Wren
386fff993a Merge "lower the heads up threshold to exactly PRIORITY_HIGH" 2014-03-21 19:10:50 +00:00
Chris Wren
5d9b153db3 lower the heads up threshold to exactly PRIORITY_HIGH 
Bug: 13452562
Change-Id: I945ce22fa7253ff84fcc3d72f4cb732921ba3489
 2014-03-21 15:08:42 -04:00
Bo Liu
845535a76d Convert a attach/detach functor in ViewRootImpl to x64 
Change-Id: I93c1df8abd0ecd1686e392cada099f9864926d33
 2014-03-21 12:06:23 -07:00
Fabrice Di Meglio
7434fcec69 Merge "Add support for enabled state for SearchIndexableData" 2014-03-21 18:38:58 +00:00
Fabrice Di Meglio
16f81e7542 Add support for enabled state for SearchIndexableData 
- add "enabled" member which tells if the data will be
included into the search results.

Change-Id: I17f8c4b289b21061f7fc47f4902343fecb5ddc2c
 2014-03-21 11:37:57 -07:00
Selim Cinek
0fa6c1b146 Disable Set Wallpaper button while loading image 
Bug: 13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
 2014-03-21 19:19:08 +01:00
Adam Lesinski
ac6e97a5a6 Merge "Reduce warning verbosity in aapt" 2014-03-21 16:51:12 +00:00
Jean-Michel Trivi
e10dd634e1 Merge "AudioTrack write from ByteBuffer updates position" 2014-03-21 16:49:55 +00:00
Jean-Michel Trivi
5d21f679c5 AudioTrack write from ByteBuffer updates position 
Remove offset parameter.
Update buffer position when data is successfully written.

Bug 7919023

Change-Id: I1701532ef0a91e2ccecfc38b24de29bc4f64d035
 2014-03-21 09:24:26 -07:00
John Spurlock
824ad0e6f9 Merge "Unhide notification category." 2014-03-21 14:26:55 +00:00
John Spurlock
fd7f1e0039 Unhide notification category. 
Rename @hidden Notification.kind -> category, and flesh out
shared values.  Now a single value.

Update framework references, remove unused SystemUpdateService
magic value unused since 2012.

Change-Id: If06d19ff3a8c3125fca1457f5d3c665e2939c66c
 2014-03-21 09:25:00 -04:00
John Spurlock
f9e1a0b369 Annotate framework vibrate calls with stream hints. 
Migrate existing framework usages of Vibrator.vibrate to use
the new overload with an explicit stream hint.  This prevents
them from being blocked by rules targeting the unspecified stream.

For calls that pass the existing appops check in VibrateService,
pass streamHint down to the input device vibrator so we don't lose
the signal, but leave it up to InputManager to decide what to do
with it - currently unused.

Change-Id: I65c944e4010edea29a412bf57d8d7d3b8098b746
 2014-03-21 08:57:53 -04:00
Jinsuk Kim
a10958f1c3 am cfba284a: am d73e66cc: Fix broken build 
* commit 'cfba284ad72b6ac3d7189f7c87cddb7299da7617':
  Fix broken build
 2014-03-21 03:44:11 +00:00
Jinsuk Kim
cfba284ad7 am d73e66cc: Fix broken build 
* commit 'd73e66cce12f13faec44b12d9e6f33c2f28a2d5a':
  Fix broken build
 2014-03-21 03:40:08 +00:00
Jinsuk Kim
d73e66cce1 Fix broken build 
Change-Id: Ia7d207f7937e29cf48dce30d8c5a91f50c9e7d4c
 2014-03-21 12:30:59 +09:00
Mike Lockwood
0416faa2b2 am 7a07f4d4: am a5853b17: am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit '7a07f4d4ad1f2f4893223693aece62f095ce004e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 03:10:34 +00:00
Mike Lockwood
c84b4d7ff2 am e920322f: am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit 'e920322ff0c67cdd9e9682fd7c7df5221a6fb13e':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 03:10:30 +00:00
Wei Wang
6890727c0d am 3b6689c0: (-s ours) am e781efd6: am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit '3b6689c010edd2deaf112f4d4239deeb2a244ea5':
  Fix stopBatchedScan not working for wifi
 2014-03-21 03:10:24 +00:00
Jinsuk Kim
a67e34c80f am f2fecf48: am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev 
* commit 'f2fecf48f740a079cf9015ea8c2695039ca11d81':
  Add HDMI-CEC service
 2014-03-21 02:41:43 +00:00
Jinsuk Kim
f2fecf48f7 am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev 
* commit 'c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
  Add HDMI-CEC service
 2014-03-21 02:37:00 +00:00
Jinsuk Kim
c61f4dd744 Merge "Add HDMI-CEC service" into klp-modular-dev 2014-03-21 02:32:38 +00:00
Mike Lockwood
7a07f4d4ad am a5853b17: am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit 'a5853b177c80052246c361e0bc2b0e5809cfeef2':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:25:57 +00:00
Mike Lockwood
e920322ff0 am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit '861196030145ac2a5c9c2abd2c22272cc94fe884':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:25:54 +00:00
Mike Lockwood
a5853b177c am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit '1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:20:43 +00:00
Mike Lockwood
8611960301 am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit 'aa7e396f44f9b3b12a6abc9d8d62cf3a6f17527b':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:20:40 +00:00
Adam Lesinski
a01a9374fd Reduce warning verbosity in aapt 
- Attributed source of problems to the correct file.
- Only verify string localizations against valid
  locales.
Bug:13140015
Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
 2014-03-20 18:14:48 -07:00
Mike Lockwood
1fe28b20f1 am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit '71060db65e0e1c903b429c932cd6e27beec10a3e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:14:15 +00:00
Mike Lockwood
aa7e396f44 am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit '935d417b5615a62bc521a8eb58c35de1b4fdf841':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:14:12 +00:00
Winson Chung
dd1b145158 Merge "Catching case where the activity we are launching from Recents no longer exists." 2014-03-21 01:14:07 +00:00
Winson Chung
c620bafde8 Catching case where the activity we are launching from Recents no longer exists. 
- Also bounding the launch task rect to prevent transitions from far far away when launching a task
 2014-03-20 18:12:37 -07:00
Winson Chung
0bfae1063a Merge "Adding workaround for the status bar not reporting the correct system decor rect." 2014-03-21 01:11:33 +00:00
Mike Lockwood
71060db65e am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 
* commit 'dffdf1079da76f532cd6e72bf537c1a69b099c7e':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
 2014-03-21 01:09:33 +00:00
Mike Lockwood
935d417b56 am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 
* commit 'afc3a5d386459667f87d764038dd30e3490c64c2':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-21 01:09:31 +00:00
Mike Lockwood
dffdf1079d Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 2014-03-21 01:06:16 +00:00
Mike Lockwood
afc3a5d386 Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 2014-03-21 01:05:57 +00:00
Winson Chung
96d970c93e Adding workaround for the status bar not reporting the correct system decor rect. 
Change-Id: I2ea089e9d41deb2ac2a266694ac65d58830856f5
 2014-03-20 18:04:46 -07:00
Winson Chung
7bcdb33d85 Merge "Adding support for clipping window transition for alternate recents." 2014-03-21 01:02:44 +00:00
Wei Wang
3b6689c010 am e781efd6: am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit 'e781efd651cea0fecf3a155a61cca3eed8e9766c':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:55:52 +00:00