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

120294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Langemak
d487eb3c03 am 741c9c74: am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 
* commit '741c9c74ffead322c349242e3f72e8fd2957bd3d':
  Fix incorrent page range parsing when custom print options used.
 2013-11-19 08:43:18 -08:00
Craig Mautner
a857baf96c am 8ef1c531: am be462aff: am 096de3c3: Merge "Notify apps when insets change." into klp-dev 
* commit '8ef1c53177fa43cf78eb8911af77bde87c9c1536':
  Notify apps when insets change.
 2013-11-19 08:43:13 -08:00
Dave Langemak
741c9c74ff am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 
* commit 'd220d8202e67a82075ee20351657509ca0885b67':
  Fix incorrent page range parsing when custom print options used.
 2013-11-19 08:38:55 -08:00
Craig Mautner
8ef1c53177 am be462aff: am 096de3c3: Merge "Notify apps when insets change." into klp-dev 
* commit 'be462affdbe9f962c495d6eeabdad645aa9baf03':
  Notify apps when insets change.
 2013-11-19 08:38:51 -08:00
Dave Langemak
d220d8202e am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 
* commit 'c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1':
  Fix incorrent page range parsing when custom print options used.
 2013-11-19 08:34:57 -08:00
Craig Mautner
be462affdb am 096de3c3: Merge "Notify apps when insets change." into klp-dev 
* commit '096de3c3017bb9b9e5e1ed9ad790b7fedab95433':
  Notify apps when insets change.
 2013-11-19 08:34:53 -08:00
Dave Langemak
c04aa87e4a Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 2013-11-19 16:33:22 +00:00
Craig Mautner
096de3c301 Merge "Notify apps when insets change." into klp-dev 2013-11-19 16:32:00 +00:00
Jeff Sharkey
2322205340 am 37ba54ac: am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev 
* commit '37ba54ac13e6f8cff70d3138a029cfdd4733aba7':
  Mask OOBE when filtering recent documents.
 2013-11-19 00:17:23 -08:00
Jeff Sharkey
37ba54ac13 am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev 
* commit 'eb4dc749de7f6ee45cae070db960890643e94aff':
  Mask OOBE when filtering recent documents.
 2013-11-19 00:13:26 -08:00
Jeff Sharkey
eb4dc749de am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev 
* commit '6d0d4b5b5a66ea348c2cdd89a89d4ab7f0483829':
  Mask OOBE when filtering recent documents.
 2013-11-19 00:11:15 -08:00
Jeff Sharkey
6d0d4b5b5a Merge "Mask OOBE when filtering recent documents." into klp-dev 2013-11-19 08:08:13 +00:00
Sascha Prueter
2e8e33bfd7 am a9249322: am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev 
* commit 'a9249322d554fa13eb9c2662d39be256f833404f':
  Trying to unbreak build...
 2013-11-18 23:35:15 -08:00
Sascha Prueter
a9249322d5 am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev 
* commit 'c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4':
  Trying to unbreak build...
 2013-11-18 23:31:11 -08:00
Sascha Prueter
c7f7d1bf18 am f7044fec: Merge "Trying to unbreak build..." into klp-dev 
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
  Trying to unbreak build...
 2013-11-18 23:27:07 -08:00
Sascha Prueter
f7044fecee Merge "Trying to unbreak build..." into klp-dev 2013-11-19 07:23:34 +00:00
Sascha Prueter
d5965cb506 Trying to unbreak build... 
Revert "Harden against transiently unavailable backup transports"

This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.

Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
 2013-11-19 06:51:21 +00:00
Christopher Tate
f3f31142c6 am fa331b1d: am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev 
* commit 'fa331b1dfbf3e071e2ff48dbe21727452bfb8042':
  Harden against transiently unavailable backup transports
 2013-11-18 18:51:51 -08:00
Christopher Tate
fa331b1dfb am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev 
* commit '1e964ed808798a56664853e2aeffdc47c676ac5a':
  Harden against transiently unavailable backup transports
 2013-11-18 18:48:29 -08:00
Christopher Tate
1e964ed808 am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev 
* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
  Harden against transiently unavailable backup transports
 2013-11-18 18:44:47 -08:00
Christopher Tate
d6bbc54423 Merge "Harden against transiently unavailable backup transports" into klp-dev 2013-11-19 02:41:54 +00:00
Jeff Sharkey
e2515ac296 Mask OOBE when filtering recent documents. 
There is a data ownership issue related to recent documents Cursors,
and the loader and UI threads can end up traversing the same Cursor
at runtime.  This change masks OOBE crashes caused by this race until
we have time to fix cleanly.

Bug: 11736668
Change-Id: I2039a5edcf341fcaedacc2f08bde96fc5a271782
 2013-11-18 17:41:56 -08:00
Dirk Dougherty
c178141afa am 27927d5d: am 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs 
* commit '27927d5d55eb4bd9087bdeba7df1e98f280177bd':
  Add link to HCE dev guide.
 2013-11-18 17:41:34 -08:00
Dirk Dougherty
27927d5d55 am 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs 
* commit '08ee31a22421ed9dc144d89edc695322044d699c':
  Add link to HCE dev guide.
 2013-11-18 17:38:00 -08:00
Dirk Dougherty
08ee31a224 am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs 
* commit 'ce3f3a8d35a4fb23c907937cb8283532e321c8ad':
  Add link to HCE dev guide.
 2013-11-19 01:33:25 +00:00
Dirk Dougherty
ce3f3a8d35 Merge "Add link to HCE dev guide." into klp-docs 2013-11-19 01:30:53 +00:00
William Luh
6f1459a573 Merge "Revert "Expose new API for querying whether a certificate was user added."" 2013-11-19 01:28:08 +00:00
William Luh
635011173e Revert "Expose new API for querying whether a certificate was user added." 
This reverts commit 60b96502b39d221afb43ff7e8a49a19a2fb3c2e0.

Change-Id: Ie1c2ee4c983c4d6b0c086f252a191b3c60e50b9c
 2013-11-19 01:20:45 +00:00
Craig Mautner
4c5eb224de Notify apps when insets change. 
Activities that handle their own configuration get layout when hidden
and the configuration changes but not when the content insets change
if they are hidden. They need to get a fresh layout for both
situations.

Fixes bug 11544694.

Change-Id: Iff3a9adb72ea7dfc3e5cd38e1b9cd7cf2006f8f5
 2013-11-18 16:49:42 -08:00
Deepanshu Gupta
e6a408ed31 am bdfa8a1a: (-s ours) am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev 
* commit 'bdfa8a1ae0a4d10abd14cffb93f629803e469464':
  Update ICU_Delegate methods. DO NOT MERGE
 2013-11-18 16:29:24 -08:00
Deepanshu Gupta
bdfa8a1ae0 am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev 
* commit '5a0fd1fd0fb5d734bf65d26e56e413dba2821b07':
  Update ICU_Delegate methods. DO NOT MERGE
 2013-11-18 16:25:04 -08:00
Deepanshu Gupta
5a0fd1fd0f am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev 
* commit '9d5a9434d3fe65d32aae0a400502dde8357f0ec7':
  Update ICU_Delegate methods. DO NOT MERGE
 2013-11-18 16:22:41 -08:00
Deepanshu Gupta
9d5a9434d3 Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev 2013-11-19 00:19:01 +00:00
William Luh
1680392e1e Merge "Expose new API for querying whether a certificate was user added." 2013-11-19 00:14:20 +00:00
Christopher Tate
8f98252afe Harden against transiently unavailable backup transports 
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Bug 11716868

Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9
 2013-11-18 16:12:38 -08:00
Dirk Dougherty
856f474132 am 49b1dc33: am 63bb9185: am abb4d2da: Doc change: edit line length above button. 
* commit '49b1dc335dee85eb72892f722164feaabe910bd0':
  Doc change: edit line length above button.
 2013-11-18 15:57:59 -08:00
Dirk Dougherty
49b1dc335d am 63bb9185: am abb4d2da: Doc change: edit line length above button. 
* commit '63bb9185d4bd4bce3361135e4fcfdba5a6157340':
  Doc change: edit line length above button.
 2013-11-18 15:54:01 -08:00
Dirk Dougherty
63bb9185d4 am abb4d2da: Doc change: edit line length above button. 
* commit 'abb4d2da4374eb5e5e7a750e4b60a9145b1b1058':
  Doc change: edit line length above button.
 2013-11-18 23:49:48 +00:00
Dirk Dougherty
abb4d2da43 Doc change: edit line length above button. 
Change-Id: I7fd5c192b93846e91e0069c287776996c3f01ab8
 2013-11-18 15:45:30 -08:00
Chris Craik
ec0cdd1e2a Merge "Clean up modelView matrix logic" 2013-11-18 22:50:03 +00:00
Adam Lesinski
7ae9ea572d am bac61807: am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev 
* commit 'bac61807d3bcfff957b358cb9ad77850bd373689':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc
 2013-11-18 13:36:06 -08:00
Adam Lesinski
bac61807d3 am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev 
* commit '1abead425c0e862e316e17521833a33d22e7a850':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc
 2013-11-18 13:32:42 -08:00
Adam Lesinski
1abead425c am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev 
* commit '245408d29018fee4b1231e52f5da1edcc3283c4a':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc
 2013-11-18 13:29:25 -08:00
Adam Lesinski
245408d290 Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev 2013-11-18 21:26:32 +00:00
John Spurlock
9f99332299 am 32962b3e: am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev 
* commit '32962b3e2c1968fbd83ebbf4cc94ab3dd8de3485':
  Use scaled display size in wallpaper constraint.
 2013-11-18 13:00:21 -08:00
John Spurlock
32962b3e2c am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev 
* commit 'c65dfef3f5ee07883446be0e6907f15fe457da9d':
  Use scaled display size in wallpaper constraint.
 2013-11-18 12:56:25 -08:00
John Spurlock
c65dfef3f5 am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev 
* commit 'afc76f28b93f931069bb58c4f9b524d5a99b1604':
  Use scaled display size in wallpaper constraint.
 2013-11-18 12:52:58 -08:00
Chris Craik
4063a0e03b Clean up modelView matrix logic 
bug:11359533

Also changes shader matrix to correctly account for modelView and
currentTransform()

Change-Id: I6ce18857dc6d08ea08ca7535385c2ad351ec3caa
 2013-11-18 12:51:08 -08:00
John Spurlock
afc76f28b9 Merge "Use scaled display size in wallpaper constraint." into klp-dev 2013-11-18 20:49:16 +00:00
Adam Lesinski
2cd3fb5aa7 Do not hold direct ref BatteryStatsImpl$Uid$Proc 
BatteryStatsImpl can reset its collected data, including
removing a BatteryStatsImpl$Uid$Proc object. If a ProcessRecord
has a direct reference, then the battery stats for a process
will be recorded in an old Proc object and prevent GC, causing
a memory leak.

bug:11087238
Change-Id: I19a9cd9d8361c10446a8ebdd5c0860b56c442209
 2013-11-18 12:29:34 -08:00