Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,954 Commits 3 Branches 0 Tags
882a7fd40ed5704a59f49b4d97d9600a4e30db46
Commit Graph

43953 Commits

Author SHA1 Message Date
Selim Gurun
4de38166c6 am aef98356: am 9fc8356b: Merge "Add potential future APIs for postmessage" 
* commit 'aef983562a74cfd573bd5a13dd5bf9123fd3b92f':
  Add potential future APIs for postmessage
 2015-03-02 23:14:36 +00:00
Selim Gurun
aef983562a am 9fc8356b: Merge "Add potential future APIs for postmessage" 
* commit '9fc8356baa7816a13e0c140788ccf67301cbd28d':
  Add potential future APIs for postmessage
 2015-03-02 23:07:36 +00:00
Selim Gurun
9fc8356baa Merge "Add potential future APIs for postmessage" 2015-03-02 23:02:11 +00:00
Selim Gurun
37bd8907cb Add potential future APIs for postmessage 
Bug: 10237116

The APIs are hidden while work is ongoing.

Change-Id: I3e2f06d6e41af276171b127f06bdd74924c2e74c
 2015-03-02 14:53:01 -08:00
Narayan Kamath
f1eaa12385 am 4d8caa55: am 8cba382f: Merge "Bad month value in DatePicker in Calendar Mode" 
* commit '4d8caa557670626768aabb55d213f9d091433d73':
  Bad month value in DatePicker in Calendar Mode
 2015-02-26 17:56:52 +00:00
Narayan Kamath
4d8caa5576 am 8cba382f: Merge "Bad month value in DatePicker in Calendar Mode" 
* commit '8cba382f04e4ead4a6b8c4a74216ddb383e8db91':
  Bad month value in DatePicker in Calendar Mode
 2015-02-26 17:49:19 +00:00
Narayan Kamath
8cba382f04 Merge "Bad month value in DatePicker in Calendar Mode" 2015-02-26 17:42:24 +00:00
You Kim
49e6c4adbf Bad month value in DatePicker in Calendar Mode 
Calendar MONTH field is zero based. Use predefined month.

Change-Id: I957bf385dc8e877e8698dacad68808f4d9d8a6d0
 2015-02-26 19:06:16 +09:00
Filip Gruszczynski
0fbcc7086f am 1e74b5d6: Merge "Burn in protection." into lmp-mr1-modular-dev 
* commit '1e74b5d6b0e964b7a9e58e64b45f50aec15b1178':
  Burn in protection.
 2015-02-25 21:40:38 +00:00
Filip Gruszczynski
d2e8640c2c Burn in protection. 
Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
 2015-02-25 12:22:49 -08:00
Jim Miller
b060f018ef am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 
* commit '91aa1bdb57a82b59401afd88aaeb429ea4c73bac':
  Remove TrustAgent whitelisting API
 2015-02-25 18:23:20 +00:00
Jim Miller
91aa1bdb57 am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
  Remove TrustAgent whitelisting API
 2015-02-25 18:17:13 +00:00
Jim Miller
19847b07e8 am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API
 2015-02-25 18:09:54 +00:00
Jim Miller
bc4f2ccf6c Remove TrustAgent whitelisting API 
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
 2015-02-24 20:15:02 -08:00
Narayan Kamath
fd335f8467 am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '948682d15f1a4a6676318213a49b50b967cfae27':
  Remove wrong javadoc comment
 2015-02-24 10:18:39 +00:00
Narayan Kamath
948682d15f am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment
 2015-02-24 10:11:52 +00:00
Narayan Kamath
6e208cddad Merge "Remove wrong javadoc comment" 2015-02-24 10:04:33 +00:00
Joe LaPenna
57bb5f5c8b am c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 
* commit 'c0c395162ff14b83694158663470ad60e065d9a9':
  Hold a wake lock while dozing when display updates are pending.
 2015-02-24 00:46:48 +00:00
Chad Brubaker
3576ca1f9b am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '1629f9543a48e93515395a10c50d0394f8be2774':
  Add Keymaster 0.4 binder API
 2015-02-23 22:53:01 +00:00
Chad Brubaker
1629f9543a am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
  Add Keymaster 0.4 binder API
 2015-02-23 22:45:01 +00:00
Chad Brubaker
598f9b2a19 Merge "Add Keymaster 0.4 binder API" 2015-02-23 22:20:39 +00:00
Chad Brubaker
45ff13ea28 Add Keymaster 0.4 binder API 
This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.

Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3
 2015-02-23 14:12:37 -08:00
Narayan Kamath
836e4413d0 am c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObserver" 
* commit 'c90df0768a9be3e40d7c1edfdfb28af7bd25d98e':
  Clean up Javadocs for UEventObserver
 2015-02-23 11:00:51 +00:00
Narayan Kamath
c90df0768a am 6b492e78: Merge "Clean up Javadocs for UEventObserver" 
* commit '6b492e78115833f0093d1517483728b574121c07':
  Clean up Javadocs for UEventObserver
 2015-02-23 10:54:40 +00:00
Valter Strods
7014b26c3e Clean up Javadocs for UEventObserver 
This commit removes a couple of apostrophes from the word "UEvents" as
the apostrophes would only be needed if something that belongs to the
UEvent was being talked about. Instead, the UEvents are being talked
about themselves - as a bunch.

Change-Id: I6a7908c6b73c0739102b632d2499e0f1e3c2d47f
 2015-02-23 10:48:32 +00:00
Jeff Brown
c2932a1be3 Hold a wake lock while dozing when display updates are pending. 
When the display state is DOZE or DOZE_SUSPEND, assume this means
that the AP may go to sleep at any time so hold a wake lock for
a little while starting when traversals are scheduled to ensure
that the AP remains awake long enough to draw and post the frame
to the display hardware.

This patch is somewhat approximate but should be good enough for
most devices today.

Note that the implementation uses the window manager to ensure that
the window which wants to draw is actually visible before acquiring
the wake lock.  There is a cost to this test (a round-trip) which
should not be significant today since we do not expect apps to draw
more than one frame or two while dozing.  However, if we wanted to
support animations in general, we might want to optimize it or
eliminate the check altogether (since we can already account for
the app's use of the wake lock).

Another way to implement this functionality might be for the view
hierarchy to listen for the power manager to report that it has entered
a non-interactive power state before deciding to poke draw locks.
This would be somewhat more accurate than watching the display state.
Also, the draw lock timeout logic could be implemented more directly
instead of using an ordinary timed wake lock.

Bug: 18284212
Change-Id: I84b341c678303e8b7481bd1620e634fe82cc4350
 2015-02-20 10:54:09 -08:00
Marco Nelissen
2fddfea3e5 am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit 'a3404263c08c711fa5f2d73a92ec7c6f366b9338':
  Fix NPE
 2015-02-18 00:15:00 +00:00
Marco Nelissen
a3404263c0 am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit '2f71ee24c5d982ccaa490c7a3e1390473909fbf0':
  Fix NPE
 2015-02-18 00:07:58 +00:00
Marco Nelissen
2f71ee24c5 am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev 
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE
 2015-02-18 00:01:02 +00:00
Marco Nelissen
ffaee8bda9 Merge "Fix NPE" into lmp-mr1-dev 2015-02-17 23:54:30 +00:00
Craig Mautner
2007a630d4 am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 
* commit '28de8edb7d72f938f47d7fdd8ce058c5c8933b8e':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-02-17 23:53:11 +00:00
Craig Mautner
28de8edb7d am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ab8f60e425a90045eca06c09f0274f402b062d8f':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-02-17 23:43:33 +00:00
Craig Mautner
ab8f60e425 am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 
* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
  Do not make ActivityContainer available to apps. DO NOT MERGE
 2015-02-17 23:36:51 +00:00
Craig Mautner
a94e42970d Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 2015-02-17 23:30:34 +00:00
Alan Viverette
7286d1ff37 am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit '157c75e4b55d34d0426d08044130d74c2369be07':
  Fix year picker initial range
 2015-02-17 22:51:53 +00:00
Alan Viverette
157c75e4b5 am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit '504c77e1ae2fdd3608cd7878a4b0ba4c9eac91de':
  Fix year picker initial range
 2015-02-17 22:41:15 +00:00
Alan Viverette
504c77e1ae am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev 
* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
  Fix year picker initial range
 2015-02-17 22:36:06 +00:00
Marco Nelissen
0e24cb7fb5 Fix NPE 
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.

Bug: 19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
 2015-02-17 14:35:37 -08:00
Alan Viverette
2a90fa6d94 Fix year picker initial range 
BUG: 19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
 2015-02-17 21:11:36 +00:00
Craig Mautner
ca0653a424 Do not make ActivityContainer available to apps. DO NOT MERGE 
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
 2015-02-17 20:41:39 +00:00
Yohei Yukawa
32acf753e8 am 83c804be: Merge "Prevent duplicated registration of OnComputeInternalInsetsListener" automerge: efd9abb 
* commit '83c804be9c1f33ff4bafbfd60218751a00c7d2b9':
  Prevent duplicated registration of OnComputeInternalInsetsListener
 2015-02-14 15:17:17 +00:00
Yohei Yukawa
efd9abb7df Merge "Prevent duplicated registration of OnComputeInternalInsetsListener" 2015-02-14 15:08:07 +00:00
Svetoslav
04057e5d14 am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9 
* commit '5136791b3429d1964b9202fb7caad52719408a61':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.
 2015-02-13 03:49:40 +00:00
Svetoslav
5136791b34 am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9 
* commit '599c1042896564906935bc688bbb85515a6dfa45':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.
 2015-02-13 03:43:29 +00:00
Svetoslav
599c104289 Accessibility: Ensure fresh accessilbity focused and input focused nodes. 
automerge: 27ad2e9

* commit '27ad2e95b40fd0ca76de384695498ea114d627ca':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.
 2015-02-13 03:37:00 +00:00
Jeff Brown
f80fa0b5d9 am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode" 
* commit '6c477a29bfc604f6dbf90e0d4ac5c99bc0ed2ff7':
  Call startInput on return from sleep mode
 2015-02-13 02:11:43 +00:00
Jeff Brown
ec403e8f47 Merge "Call startInput on return from sleep mode" 2015-02-13 02:00:02 +00:00
Svetoslav
27ad2e95b4 Accessibility: Ensure fresh accessilbity focused and input focused nodes. 
Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
 2015-02-13 01:59:11 +00:00
Ruben Brunk
ff475c0ea7 Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 
automerge: 41af9d5

* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:36:13 +00:00
Ruben Brunk
fb7c14c5f9 am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 
* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:33:42 +00:00