47897 Commits

Author SHA1 Message Date
John Reck
ef129d8442 am 393fdbec: Merge "Remove overdraw counter"
* commit '393fdbec9f3f11d277e1631c2e36362e408cbbdc':
  Remove overdraw counter
2014-02-06 14:17:25 -08:00
Jeff Sharkey
be781e26aa am 2b1252dd: Merge "Update DrmOutputStream to use raw FileDescriptor."
* commit '2b1252ddd2650cb38918cb85d2a3711b2cfa8db5':
  Update DrmOutputStream to use raw FileDescriptor.
2014-02-06 14:17:18 -08:00
John Reck
593b19a49e Remove overdraw counter
Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd
2014-02-06 11:26:23 -08:00
Jeff Sharkey
ebf8ad5d91 Update DrmOutputStream to use raw FileDescriptor.
This allows DownloadManager to use FDs, paving the way for downloading
directly to content:// Uris.

Also return flag indicating if deleteOlderFiles() actually deleted
anything.  Update tests to verify.

Bug: 5287571
Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
2014-02-06 09:47:38 -08:00
Jessica Hummel
3c3e16e041 am e33e2ca3: Merge "Extend DeviceOwner concept to accommodate ProfileOwners"
* commit 'e33e2ca3460c0e5a898e5b0406d86b16b96f735a':
  Extend DeviceOwner concept to accommodate ProfileOwners
2014-02-06 02:25:23 -08:00
Jessica Hummel
e33e2ca346 Merge "Extend DeviceOwner concept to accommodate ProfileOwners" 2014-02-06 10:23:00 +00:00
Adam Connors
776c555d95 Extend DeviceOwner concept to accommodate ProfileOwners
ProfileOwners, like DeviceOwners, are Device Admins that have
additional priviledges. ProfileOwners however are scoped per
user.

Change-Id: I1e22c85878e0672121e6ebbe97fca38591f992b2
2014-02-06 10:07:19 +00:00
Alan Viverette
1f9a3a862a am d5154ec2: Add prototype for borderless touch feedback drawable
* commit 'd5154ec2bc7e7c0bdfd14fc784912d390afe43cc':
  Add prototype for borderless touch feedback drawable
2014-02-05 18:55:43 -08:00
Alan Viverette
d5154ec2bc Add prototype for borderless touch feedback drawable
Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
2014-02-05 17:53:33 -08:00
John Spurlock
8662cab1ee am 0e29ad02: Merge "Global system setting to override certain window policy."
* commit '0e29ad02f9ed46f2f2a9de59249969f9d1bdd7f6':
  Global system setting to override certain window policy.
2014-02-05 16:56:17 -08:00
John Spurlock
0e29ad02f9 Merge "Global system setting to override certain window policy." 2014-02-06 00:53:42 +00:00
Dianne Hackborn
6946115e62 am 6eb0fdb9: Merge "Improve logging of first wake lock, history size."
* commit '6eb0fdb99bc09210bea4df054a9c8a05daea3d1b':
  Improve logging of first wake lock, history size.
2014-02-05 16:44:07 -08:00
Dianne Hackborn
6eb0fdb99b Merge "Improve logging of first wake lock, history size." 2014-02-06 00:41:49 +00:00
Dianne Hackborn
3d658bf20e Improve logging of first wake lock, history size.
We now try to have a better label for the first wake lock
that is acquired in the log.  This is done in two ways:

- The alarm manager now sorts the alarms it is going to
  execute so that wakeup alarms are first, which are more
  important w.r.t. which one should be logged.
- There is a new power manager facility to make a wake lock
  as "unimportant for logging," which just means in battery
  stats that a wake lock acquired after that can be considered
  the actual one to log.  This is only used by the alarm manager
  to mark its TIME_TICK alarms as unimportant for logging.

Also reworked the battery history code to be cleaner and a bit
smaller.  There is no longer a separate EVENT command, instead
the event code and tag are just another thing that can be included
in an UPDATE command.

The bits used in the first history int are also re-arrange, so
that only the ones that really change a fair amount in the state
bits are up at the top and there is no longer space used for
the command code (since now it is always just UPDATE).  This
allows us to have more room for the time delta at the bottom,
to better avoid situations where we need to write an int delta.

Change-Id: I1bb860ae5b558a248800b090b03a84fbf7acd68a
2014-02-05 16:40:51 -08:00
Alan Viverette
8ba71d1091 am dc912588: Merge "Temporary fix for background invalidation"
* commit 'dc9125880c372b3d3a2af09d48225c9c50b962f7':
  Temporary fix for background invalidation
2014-02-05 14:19:27 -08:00
Alan Viverette
dc9125880c Merge "Temporary fix for background invalidation" 2014-02-05 22:16:10 +00:00
Christopher Tate
eaa27e8cbf am f0af5757: Merge "Improve idle-service bind permission description"
* commit 'f0af57578eeb38da86610789271cd970ff44b11f':
  Improve idle-service bind permission description
2014-02-05 14:05:59 -08:00
Alan Viverette
e6875f1575 Temporary fix for background invalidation
Not a complete solution, since we could be more efficient, but enough
to have both background display lists and proper invalidation.

Change-Id: I0216a104948c0930760275bb2b98318b0a4487e7
2014-02-05 14:05:17 -08:00
Christopher Tate
f0af57578e Merge "Improve idle-service bind permission description" 2014-02-05 22:03:33 +00:00
Zhijun He
cb49cb32ae am b77690ce: Merge "Camera2: update aeLock and transform matrix tag specs"
* commit 'b77690cea0f146c6823c922a4f8d8ca7336dde21':
  Camera2: update aeLock and transform matrix tag specs
2014-02-05 13:52:25 -08:00
Zhijun He
b77690cea0 Merge "Camera2: update aeLock and transform matrix tag specs" 2014-02-05 21:49:56 +00:00
Zhijun He
49a3ca9330 Camera2: update aeLock and transform matrix tag specs
Change-Id: I436f41ff2bf811a654de15b51739c07def354648
2014-02-05 13:48:09 -08:00
John Spurlock
c6d1c60fb1 Global system setting to override certain window policy.
Specifically, the ability to force immersive-mode-like behavior
on the status bar, the navigation bar (or both) on a
package-by-package basis - and to disable immersive mode
confirmations for specific packages.

Change-Id: I2df7092a91eceeb815367ef917dd7289f4f2b27e
2014-02-05 16:45:23 -05:00
Hui Shu
a09c820552 am e6415f50: Merge "Fix postUrl to call loadUrl when url is not a network url."
* commit 'e6415f50b10fe455df2cbe568a90bc762cce3cf7':
  Fix postUrl to call loadUrl when url is not a network url.
2014-02-05 13:38:01 -08:00
Hui Shu
e6415f50b1 Merge "Fix postUrl to call loadUrl when url is not a network url." 2014-02-05 21:35:12 +00:00
Hui Shu
c60ad9c3fb Fix postUrl to call loadUrl when url is not a network url.
Change-Id: I4be00611c220572b4e8ecea1a00409a6f5d2bb18
2014-02-05 13:32:37 -08:00
Maxim Siniavine
b69e703a23 am 12ae9b14: Merge "Using large file for download manager test."
* commit '12ae9b1459980060c8780b910d23e835590ab0fb':
  Using large file for download manager test.
2014-02-05 12:29:23 -08:00
Maxim Siniavine
12ae9b1459 Merge "Using large file for download manager test." 2014-02-05 20:04:07 +00:00
Zhijun He
6f4e1e51b4 am c44b51bd: Merge "Camera2: Update stream num tag specs"
* commit 'c44b51bdebd901def3015591814a57964f0adeef':
  Camera2: Update stream num tag specs
2014-02-05 11:30:59 -08:00
Zhijun He
c44b51bdeb Merge "Camera2: Update stream num tag specs" 2014-02-05 19:28:43 +00:00
Geoff Mendal
b204e82e6e Import translations. DO NOT MERGE
Change-Id: Id2cedaf11af37d24aa50dbcf27da1b470de6f43a
Auto-generated-cl: translation import
2014-02-05 10:48:38 -08:00
Narayan Kamath
25b66062ad am 33e77b61: Merge "Revert "Camera2: Update stream num tag specs""
* commit '33e77b61b8c170166206fbdacb157e56955bebc8':
  Revert "Camera2: Update stream num tag specs"
2014-02-05 10:43:56 -08:00
Jake Hamby
c130ffacdb am dbe576eb: Merge "Add new RIL commands to read/write NV items and reset NV config."
* commit 'dbe576ebd1c6bc05d17657aedb3f2feec162f2b1':
  Add new RIL commands to read/write NV items and reset NV config.
2014-02-05 10:43:53 -08:00
Zhijun He
a5a0cace7d Camera2: Update stream num tag specs
Change-Id: Iba6f1f8c779e5c3a622a7f07029f4373a887bffe
2014-02-05 07:55:44 -08:00
Narayan Kamath
33e77b61b8 Merge "Revert "Camera2: Update stream num tag specs"" 2014-02-05 12:19:15 +00:00
Narayan Kamath
8b1c5704cb Revert "Camera2: Update stream num tag specs"
This reverts commit 67c23833f81cb27671ee9f62a87ba810d0d49989.

Change-Id: I3aa2d0b245c998c57f3312e2d6f68aa72d80c338
2014-02-05 12:16:46 +00:00
Jake Hamby
dbe576ebd1 Merge "Add new RIL commands to read/write NV items and reset NV config." 2014-02-05 03:56:03 +00:00
Adam Powell
e57ba3d142 am 11579e55: Merge "Import updated SearchView assets from UX"
* commit '11579e559593b8c271247fe548f6446af7f6e1ca':
  Import updated SearchView assets from UX
2014-02-04 18:30:18 -08:00
Adam Powell
11579e5595 Merge "Import updated SearchView assets from UX" 2014-02-05 02:28:14 +00:00
Adam Powell
03d165b1da Import updated SearchView assets from UX
Bug 12233992

Change-Id: I6624d0d7625121a8905efa697c6a183b4463a289
2014-02-04 18:20:56 -08:00
Maxim Siniavine
b15c0e512c Using large file for download manager test.
This should decrease the chance of the file being downloaded too quickly and
confusing the test.

Change-Id: I8f4debbb51798162493d6a8005e1aa142738dbd4
2014-02-04 18:19:08 -08:00
Zhijun He
b2eb575ee8 am 67c23833: Camera2: Update stream num tag specs
* commit '67c23833f81cb27671ee9f62a87ba810d0d49989':
  Camera2: Update stream num tag specs
2014-02-04 18:06:50 -08:00
Zhijun He
67c23833f8 Camera2: Update stream num tag specs
Change-Id: I69ae1a34828230408a27bf7c016eb514485097b1
2014-02-04 18:02:07 -08:00
Christopher Tate
679935df6f Improve idle-service bind permission description
Bug 12889390

Change-Id: I34dc22870f21a92895b8e214077885a80936d0d5
2014-02-04 17:16:30 -08:00
Andy McFadden
c1f28c7a5a am 7b24aee7: Merge "Pass a thread name to AttachCurrentThread"
* commit '7b24aee7071f085c2407313a609ba18e9c42ce5b':
  Pass a thread name to AttachCurrentThread
2014-02-04 16:39:44 -08:00
Andy McFadden
7b24aee707 Merge "Pass a thread name to AttachCurrentThread" 2014-02-05 00:37:32 +00:00
George Mount
7799eea7bf am 8adb491e: Merge "Cross-Activity Scene transition API."
* commit '8adb491e08b79657deedc13c427f785c889ee448':
  Cross-Activity Scene transition API.
2014-02-04 16:24:47 -08:00
George Mount
8adb491e08 Merge "Cross-Activity Scene transition API." 2014-02-05 00:23:03 +00:00
George Mount
0a778eda69 Cross-Activity Scene transition API.
First pass at API for cross-Activity Scene transitions.
Remaining work:
  Transition back
  Automatically capture hero element info
  Transfer of surface texture to synchronize between Activities
  Possibly use scene names to indicate preferred transition

Change-Id: I59d07de1fae694a46b92b1c82525daa301ec1377
2014-02-04 16:18:43 -08:00
Andy McFadden
9b311c900d Pass a thread name to AttachCurrentThread
Reduces logspam from ART.

Bug 12896873

Change-Id: I82ae8e2dbba3918071d9c28f5ae5c882f8dcab3a
2014-02-04 15:59:39 -08:00