Selim Gurun
545093df16
am 75666e90: Merge "Revert "Add potential future APIs for postmessage""
...
* commit '75666e9054d97a9daecd5648f71414406413c6d9':
Revert "Add potential future APIs for postmessage"
2015-03-03 02:20:57 +00:00
Selim Gurun
75666e9054
Merge "Revert "Add potential future APIs for postmessage""
2015-03-03 02:14:19 +00:00
Selim Gurun
49f9ad8e2a
Revert "Add potential future APIs for postmessage"
...
This reverts commit 37bd8907cb .
Change-Id: Iaa9356b95859846ce9c3209d3d1bcfc800d2ff93
2015-03-03 01:54:25 +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
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
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
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
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
Bill Yi
4fecab570d
Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEAD
2015-02-19 14:31:36 -08:00
Narayan Kamath
0a7936b7c5
Merge "Fix a couple of issues with system_server forking."
2015-02-19 10:17:32 +00:00
Piotr Jastrzebski
e7e9238180
Merge "Register DDM handlers at the beginning of main method."
2015-02-16 12:47:08 +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
Narayan Kamath
b6b044ae82
Fix a couple of issues with system_server forking.
...
- Remove the obsolete --runtime-init arg. its prescence
was preventing other arguments from being parsed.
- Be stricter about unparsed args - throw if we see arguments
we don't expect. This was already implemented but broken
(probably implemented by a crap programmer).
bug: 19378905
Change-Id: Id8b6158db7ef6368dd13ae61f591cdf2b278dfd1
2015-02-13 17:45:06 +00:00
Piotr Jastrzebski
da74a628f5
Register DDM handlers at the beginning of main method.
...
Compiler initializes RuntimeInit during compilation and stores an
initialized version of the class in oat file. Same thing happens to
DdmServer which handles DDM packets in JDWP thread started during JVM
creation. This means that after the creation of JVM all
DDM packets are handled by DdmServer.dispatch and since it's already
initialized during compilation it has all framework related handlers
already registered. If a packet arrives before AndroidRuntime.startReg
is called then framework native methods are not yet registered and the
processing of the packet fails with UnsatisfiedLinkError.
To fix this problem the registration of framework related DDM handlers
is moved to the beginning of ZygoteInit.main and RuntimeInit.main. This
means that the handlers won't be registered until main method is called
and that's guaranteed to be after AndroidRuntime.startReg is called. It
also guarantees that DDM packets will be properly handled as soon as
Java code is executed.
Bug: 18081539.
Change-Id: I9c674f53f3f62d58c46886e0b60698182e08f0c3
2015-02-13 13:32:25 +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
Ruben Brunk
41af9d592e
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
...
automerge: d2ccbd4
* commit 'd2ccbd43d24a79122e404206c528995600a6507d':
camera2: Fix legacy scaling factor application.
2015-02-13 01:28:23 +00:00
Ruben Brunk
d2ccbd43d2
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
2015-02-13 01:22:26 +00:00
Ruben Brunk
259f3d90b8
camera2: Fix legacy scaling factor application.
...
Bug: 19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
2015-02-12 13:27:26 -08:00
Jeremy Joslin
f69f3737ba
am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
...
* commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
Update Javadoc for EXTRA_NETWORK.
2015-02-12 18:56:35 +00:00
Jeremy Joslin
1267462c0b
am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
...
* commit 'f456d4dcc042581cb2a3ba540538898f2cc925b7':
Update Javadoc for EXTRA_NETWORK.
2015-02-12 18:47:14 +00:00
Jeremy Joslin
f456d4dcc0
am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
...
* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
Update Javadoc for EXTRA_NETWORK.
2015-02-12 18:41:17 +00:00
Jeremy Joslin
20be0e25ba
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
2015-02-12 18:34:03 +00:00
Benjamin Franz
6076ef9355
am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
...
* commit 'dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f':
Fix the javadocs for lock task mode intents.
2015-02-12 17:02:09 +00:00
Benjamin Franz
dd0027cfda
am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
...
* commit '40ab8bb22979b9e7c76e016b861319f6103eb800':
Fix the javadocs for lock task mode intents.
2015-02-12 16:52:34 +00:00
Benjamin Franz
40ab8bb229
am c70d0e71: Fix the javadocs for lock task mode intents.
...
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
Fix the javadocs for lock task mode intents.
2015-02-12 16:45:06 +00:00
Benjamin Franz
c70d0e71c0
Fix the javadocs for lock task mode intents.
...
Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
2015-02-12 16:12:58 +00:00
Neil Fuller
c1a5e82c25
Merge "Remove usages of FloatMath" automerge: a8e8cdb
...
automerge: 27316a9
* commit '27316a93e5979859ae98f506eca365784353007a':
Remove usages of FloatMath
2015-02-12 10:00:41 +00:00
Neil Fuller
a8e8cdbb17
Merge "Remove usages of FloatMath"
2015-02-12 09:26:47 +00:00
Neil Fuller
e573aa9371
Remove usages of FloatMath
...
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iec8fb663ed54eb967050f6ff25a36ba534204c4d
2015-02-12 09:20:31 +00:00
Tao Bao
6d8886ac46
resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp
...
Change-Id: If01cb9c91c4f980d422896aa5ebe713f540d4fd1
2015-02-11 22:32:05 -08:00
Adam Powell
bee1def31b
am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
...
* commit '97e0ba691222d037c1820ca8338ad13d07221daf':
Add DENSITY_280
2015-02-12 02:34:42 +00:00
Jeremy Joslin
fcde58f155
Update Javadoc for EXTRA_NETWORK.
...
Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
2015-02-11 18:28:57 -08:00
Adam Powell
97e0ba6912
am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
...
* commit 'b73e029fea53fd5aeaf01ad7ba15560329d8de1c':
Add DENSITY_280
2015-02-12 02:25:29 +00:00
Adam Powell
b73e029fea
am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
...
* commit '0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
Add DENSITY_280
2015-02-12 02:13:03 +00:00