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

120277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leon Scroggins III
48df72f7db am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit '74ca3fd34dac9674f61313594e2863ffecd79c7a':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:18:35 +00:00
Dianne Hackborn
045ed66519 am 8e904d56: (-s ours) am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '8e904d565e8a54f755814e9ae062743b8b012731':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:18:31 +00:00
Leon Scroggins III
74ca3fd34d am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit 'bc57651fb510d7b1a2811235f96e711b6be12a12':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:15:23 +00:00
Dianne Hackborn
8e904d565e am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:15:19 +00:00
Leon Scroggins III
bc57651fb5 Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 2014-03-07 18:13:29 +00:00
Dianne Hackborn
785d764bd5 Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 2014-03-07 18:12:30 +00:00
Andy McFadden
43cd1d8726 am ae6bd610: am 66069adb: am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit 'ae6bd6103f3d31387add53c6beac884ced82b706':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:53:16 +00:00
Andy McFadden
ae6bd6103f am 66069adb: am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit '66069adb9d22f28b48bd4689b592c887c008be52':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:50:09 +00:00
Andy McFadden
66069adb9d am cda61e95: am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit 'cda61e95f6b600378ab64f43beb42dbbfa2f6a1a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:46:42 +00:00
Andy McFadden
cda61e95f6 am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit 'faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:43:40 +00:00
Andy McFadden
faddd77a91 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2014-03-07 17:40:40 +00:00
Craig Mautner
2c82c08a54 Show the keyguard if unsecure window on top. DO NOT MERGE. 
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
 2014-03-07 09:09:27 -08:00
Leon Scroggins III
278250dafb DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

-------------------------------------------------------------------------

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
   The old behavior would have continued to modify the
   file descriptor's offset each time a new decode was
   required. The copy ensures that the file descriptor
   remains unchanged.
3. Buffer the file stream.
   Prior to this change, if the image was not a PNG,
   the stream would be rewound to the beginning of the
   file, even if the file descriptor was passed in with
   an offset. Thanks to the buffer, the stream is only
   rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
 2014-03-07 11:28:44 -05:00
Narayan Kamath
f7a6fe95b0 am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit '0425a51b0715e23de7c21feddf6cb055563c3a7a':
  Don't assume that size_t is 32-bit
 2014-03-07 16:18:21 +00:00
Narayan Kamath
f2c11c1429 am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit '214c3d9b064c35437cfbab1ea3b82a7fb343ca6b':
  Don't use size_t for variables that store uint32_t value
 2014-03-07 16:18:18 +00:00
Narayan Kamath
3c9c67ae66 am ca35c18a: am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit 'ca35c18a374c143831cc282987c762507c0ffc34':
  Inform libcore of time format pref. changes.
 2014-03-07 16:18:15 +00:00
Narayan Kamath
0425a51b07 am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit '51ec4ec51f88d854b182547405e37f3ae74c35bd':
  Don't assume that size_t is 32-bit
 2014-03-07 16:11:38 +00:00
Narayan Kamath
214c3d9b06 am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c':
  Don't use size_t for variables that store uint32_t value
 2014-03-07 16:11:35 +00:00
Narayan Kamath
ca35c18a37 am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit 'cd4874cfdc00d17454529b5dca85a487c7c2de77':
  Inform libcore of time format pref. changes.
 2014-03-07 16:11:29 +00:00
Narayan Kamath
51ec4ec51f am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit '5de03b18ea455c0250cbd01912282f28d8635910':
  Don't assume that size_t is 32-bit
 2014-03-07 08:08:21 -08:00
Narayan Kamath
6ac6263dcc am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit '28ccb4f7d9bbea65c8cb1807e332a46ef37bc619':
  Don't use size_t for variables that store uint32_t value
 2014-03-07 08:08:18 -08:00
Narayan Kamath
cd4874cfdc am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit 'd265bcc4b555ab75009f8ceb32cc90007a621b41':
  Inform libcore of time format pref. changes.
 2014-03-07 08:08:05 -08:00
Narayan Kamath
5de03b18ea Merge "Don't assume that size_t is 32-bit" 2014-03-07 16:04:50 +00:00
Narayan Kamath
28ccb4f7d9 Merge "Don't use size_t for variables that store uint32_t value" 2014-03-07 16:04:28 +00:00
Chris Wren
2f03cbe6f8 am 148a965c: am d1862dac: am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit '148a965c81dfe8ca7281001931bdc65a7c1d2ded':
  use relative positioning for notification actions
 2014-03-07 15:20:38 +00:00
Chris Wren
148a965c81 am d1862dac: am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit 'd1862dac05e4302761c8d741a3286fe5eb6f1174':
  use relative positioning for notification actions
 2014-03-07 15:17:49 +00:00
Chris Wren
d1862dac05 am 111e981d: am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit '111e981dc7f7d62647d6aa5e6c44cfd13af53608':
  use relative positioning for notification actions
 2014-03-07 15:15:08 +00:00
Chris Wren
111e981dc7 am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit '70d5ed269268c1da6169b49b555d7295ac5d6763':
  use relative positioning for notification actions
 2014-03-07 15:10:47 +00:00
Chris Wren
70d5ed2692 Merge "use relative positioning for notification actions" into klp-dev 2014-03-07 15:08:29 +00:00
Narayan Kamath
d265bcc4b5 Merge "Inform libcore of time format pref. changes." 2014-03-07 13:50:04 +00:00
Narayan Kamath
27ad525c7e Inform libcore of time format pref. changes. 
- Introduce a boolean extra for intent TIME_CHANGED that
  specifies if the user wants a 24 hour format or not.
- Have the ActivityManagerService inform running processes
  of changes to this preference.
- Add plumbing in ActivityThread to inform j.t.DateFormat

Change-Id: I05fafb903ae54e39c03a048b7a219dc5a93fd472
 2014-03-07 13:48:04 +00:00
Jeff Brown
2b27ef979d am c969450a: am 840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev 
* commit 'c969450acd4924f0f5478274c345207bf2c57768':
  Add config_supportAutoRotation.
 2014-03-07 10:50:44 +00:00
Jeff Brown
0b93d86bf4 am 1dade011: am 7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 
* commit '1dade011d740c58510d3731be11491dbd028ebda':
  Reorder config.xml constants related to auto-rotation.
 2014-03-07 10:50:42 +00:00
Jeff Brown
c969450acd am 840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev 
* commit '840c84749a6066b436db4dc94c3e3929a8440575':
  Add config_supportAutoRotation.
 2014-03-07 10:43:52 +00:00
Jeff Brown
1dade011d7 am 7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 
* commit '7ddc3cec322f0a4968f00c6bdf8e396094e36f5b':
  Reorder config.xml constants related to auto-rotation.
 2014-03-07 10:43:47 +00:00
Jeff Brown
840c84749a Merge "Add config_supportAutoRotation." into klp-modular-dev 2014-03-07 04:40:10 +00:00
Jeff Brown
7ddc3cec32 Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev 2014-03-07 04:39:06 +00:00
Jeff Brown
bcdfc62ae3 Add config_supportAutoRotation. 
On some products, it may not make sense to use the accelerometer
to perform auto-rotation.  In that case, the product's config.xml
framework resource overlay should set config_supportAutoRotation
to false.

Setting this to false also disables auto-rotation settings.

Bug: 13211999
Change-Id: If9d7d72f2a2c576b14a4ff0afb61ea52c42c3357
 2014-03-06 19:57:59 -08:00
Jeff Brown
e7be7915a3 Reorder config.xml constants related to auto-rotation. 
Make it a little easier to find all of the relevant resources
in one place.  No functional changes.

Bug: 13211999
Change-Id: Ibfe48f48eae282fa09c95138983dab5e979a866c
 2014-03-06 18:16:34 -08:00
Adam Powell
c9e5f540a9 Fix a bug where OnTouchListeners in action views could be removed 
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
 2014-03-06 17:57:05 -08:00
Marco Nelissen
50b70746af am 6cc044b0: am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit '6cc044b0b0a095249f3929975bb7bd2f765c1327':
  ExifInterface: fix class load failure
 2014-03-07 01:40:25 +00:00
Dianne Hackborn
a6590837a9 am 8b776e86: am c71c901a: am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 
* commit '8b776e8616ebbf49ae0bfcc79d74d32c560016b1':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
 2014-03-07 01:40:22 +00:00
Dianne Hackborn
cb15c7a83b More on issue #12031685 (DO NOT MERGE) 
Integrate from master:

Fix issue #13065185: Frequent runtime restarts on launching...

..."Hill Climb Racing" app

A service is in use when it is in the restarting state.

Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
 2014-03-06 17:39:11 -08:00
Marco Nelissen
6cc044b0b0 am b2c45abc: am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit 'b2c45abc1d6f791f254c2cf6affcfc4f564d9cd2':
  ExifInterface: fix class load failure
 2014-03-07 01:35:35 +00:00
Dianne Hackborn
8b776e8616 am c71c901a: am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 
* commit 'c71c901ad4d33a373efdad4cf97d12f8ca77e089':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
 2014-03-07 01:35:32 +00:00
Craig Mautner
c29ab2dd1f am 7442acf2: am f453f3a1: Merge "Show the keyguard if unsecure window on top" into klp-modular-dev 
* commit '7442acf25baad47daea15569a2b85ffb22422bfc':
  Show the keyguard if unsecure window on top
 2014-03-07 01:32:34 +00:00
Marco Nelissen
b2c45abc1d am 233e7e9f: am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit '233e7e9f64be5e85196dd959824bce9a69b2fd99':
  ExifInterface: fix class load failure
 2014-03-07 01:31:22 +00:00
Dianne Hackborn
c71c901ad4 am 278fa87c: am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 
* commit '278fa87cc9a5e08d410c5b1e6c75afcffc22a988':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
 2014-03-07 01:31:17 +00:00
Craig Mautner
7442acf25b am f453f3a1: Merge "Show the keyguard if unsecure window on top" into klp-modular-dev 
* commit 'f453f3a1685b14047533429aff15fd2e2ba3d7c9':
  Show the keyguard if unsecure window on top
 2014-03-07 01:27:53 +00:00
Marco Nelissen
233e7e9f64 am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit '98a6bcf433fc23c343343b04c57c5a68d0177ac7':
  ExifInterface: fix class load failure
 2014-03-07 01:26:10 +00:00