126143 Commits

Author SHA1 Message Date
Baligh Uddin
456696ac98 Import translations. DO NOT MERGE
Change-Id: I9d33cc058a79b8ea1b265104afbaa0dba76762a8
Auto-generated-cl: translation import
2014-03-24 09:40:09 -07:00
Przemyslaw Szczepaniak
7638b1f3b5 Merge "Do not reset language in case of the TTS service reconnect." 2014-03-24 10:08:37 +00:00
Mathew Inwood
a73b0c54b3 Merge "Fix log spam from View.toString()." 2014-03-24 09:46:24 +00:00
Craig Mautner
296f1a9130 Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."" 2014-03-23 01:20:42 +00:00
Craig Mautner
9cf34e2ee4 Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
This reverts commit f7ad855718dc576a1618a54035b82e92356aa0d8.

After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.

Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d
2014-03-23 00:10:33 +00:00
Craig Mautner
61ada5d330 Merge "Add Activity methods for icons and labels." 2014-03-22 23:44:37 +00:00
Craig Mautner
2fbd754180 Add Activity methods for icons and labels.
New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.

Fixes bug 13562992.

Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5
2014-03-22 16:39:33 -07:00
John Spurlock
9ae0c8ffba Merge "Add notification category for recommendations." 2014-03-22 01:35:46 +00:00
John Spurlock
0a69c8c4bd Add notification category for recommendations.
Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad
2014-03-21 21:33:37 -04:00
Dianne Hackborn
e9c9c44134 Merge "Battery stats: track actually running time" 2014-03-22 00:26:19 +00:00
Christopher Tate
18a65ad09d Merge "Cap the size of app-defined permission trees" 2014-03-21 23:32:59 +00:00
Dianne Hackborn
a1bd79268b Battery stats: track actually running time
Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.

Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.

Finally use new radio down timestamp to adjust the times we
compute for radio use.  Note that this information is not (yet)
being used to adjust how these are recorded in the history.

Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
2014-03-21 16:14:59 -07:00
Winson Chung
e9c77aee60 Merge "Fixing crash with multiple touch pointers" 2014-03-21 23:03:16 +00:00
Winson Chung
4c71aefcbd Fixing crash with multiple touch pointers
- Adding support for force-reloading certain thumbnails (in prep for fix to Bug. 13587139)
- Use withLayer and withEndAction on ViewPropertyAnimator animations
- Ensuring that we close the notifications panel when we toggle recents

Change-Id: Ied2d841de42046fcb09fffb615156b07b4a67136
2014-03-21 16:00:18 -07:00
Christopher Tate
c55f9c0442 Cap the size of app-defined permission trees
Bug 13529742

Change-Id: I46c2ebc39caf4a9eacbffbb35fc386c2a1cedc12
2014-03-21 15:16:14 -07:00
Matthew Williams
cde7086b90 Merge "Downgrade expedited to normal on reschedule." 2014-03-21 21:59:07 +00:00
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
Mathew Inwood
d15990aa50 Fix log spam from View.toString().
If a view has a non-zero ID that is not defined in resources (i.e. has been
set pragmatically), the calls to Resources.getResourcePackageName() and
Resources.getResourceEntryName() result in a log warning:
No package identifier when getting name for resource number 0x00000001

Fix this by not attempting to resolve the package & name when there is
none.

Change-Id: Id88a61539fffb36187da7911f8e8a42d5a1bb951
2014-03-21 18:37:53 +00: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
Przemyslaw Szczepaniak
952c0fd7bc Do not reset language in case of the TTS service reconnect.
Bug:12428804
Change-Id: I0b1b1274c47edd28eae1701808d50aeb6c36324c
2014-03-21 11:21:07 +00: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