summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Collapse)AuthorAgeFilesLines
* am c0c39516: Merge "Hold a wake lock while dozing when display updates are ↵Joe LaPenna2015-02-243-0/+46
|\ | | | | | | | | | | | | pending." into lmp-mr1-modular-dev * commit 'c0c395162ff14b83694158663470ad60e065d9a9': Hold a wake lock while dozing when display updates are pending.
| * Hold a wake lock while dozing when display updates are pending.Jeff Brown2015-02-203-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API"Chad Brubaker2015-02-2316-0/+990
|\ \ | | | | | | | | | | | | * commit '1629f9543a48e93515395a10c50d0394f8be2774': Add Keymaster 0.4 binder API
| * \ am 598f9b2a: Merge "Add Keymaster 0.4 binder API"Chad Brubaker2015-02-2316-0/+990
| |\ \ | | | | | | | | | | | | | | | | * commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d': Add Keymaster 0.4 binder API
| | * \ Merge "Add Keymaster 0.4 binder API"Chad Brubaker2015-02-2316-0/+990
| | |\ \
| | | * | Add Keymaster 0.4 binder APIChad Brubaker2015-02-2316-0/+990
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObserver"Narayan Kamath2015-02-231-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c90df0768a9be3e40d7c1edfdfb28af7bd25d98e': Clean up Javadocs for UEventObserver
| * | | | am 6b492e78: Merge "Clean up Javadocs for UEventObserver"Narayan Kamath2015-02-231-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '6b492e78115833f0093d1517483728b574121c07': Clean up Javadocs for UEventObserver
| | * | | Clean up Javadocs for UEventObserverValter Strods2015-02-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEADBill Yi2015-02-19377-8094/+17128
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 644ebc88: am 0a7936b7: Merge "Fix a couple of issues with system_server ↵Narayan Kamath2015-02-192-9/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | forking." * commit '644ebc8800ad5e2fa1c239bd65a2cf6a88e6556b': Fix a couple of issues with system_server forking.
| * | | | Merge "Fix a couple of issues with system_server forking."Narayan Kamath2015-02-192-9/+13
| |\ \ \ \
| | * | | | Fix a couple of issues with system_server forking.Narayan Kamath2015-02-132-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * commit 'a3404263c08c711fa5f2d73a92ec7c6f366b9338': Fix NPE
| * | | | | am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f71ee24c5d982ccaa490c7a3e1390473909fbf0': Fix NPE
| | * \ \ \ \ am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ffaee8bda9c8d22af17098fec0e6626301d91844': Fix NPE
| | | * \ \ \ \ Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-171-12/+11
| | | |\ \ \ \ \
| | | | * | | | | Fix NPEMarco Nelissen2015-02-171-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Path can be null if sd card was ejected, and we shouldn't make a thumbnail in that case. Bug: 19380821 Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
* | | | | | | | | am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer ↵Craig Mautner2015-02-173-27/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available to apps. DO NOT MERGE" into lmp-mr1-dev * commit '28de8edb7d72f938f47d7fdd8ce058c5c8933b8e': Do not make ActivityContainer available to apps. DO NOT MERGE
| * | | | | | | | am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to ↵Craig Mautner2015-02-173-27/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apps. DO NOT MERGE" into lmp-mr1-dev * commit 'ab8f60e425a90045eca06c09f0274f402b062d8f': Do not make ActivityContainer available to apps. DO NOT MERGE
| | * | | | | | | am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT ↵Craig Mautner2015-02-173-27/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into lmp-mr1-dev * commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9': Do not make ActivityContainer available to apps. DO NOT MERGE
| | | * | | | | | Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into ↵Craig Mautner2015-02-173-27/+12
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | * | | | | | Do not make ActivityContainer available to apps. DO NOT MERGECraig Mautner2015-02-173-27/+12
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" ↵Alan Viverette2015-02-171-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '157c75e4b55d34d0426d08044130d74c2369be07': Fix year picker initial range
| * | | | | | | | am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-devAlan Viverette2015-02-171-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '504c77e1ae2fdd3608cd7878a4b0ba4c9eac91de': Fix year picker initial range
| | * | | | | | | am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-devAlan Viverette2015-02-171-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c': Fix year picker initial range
| | | * | | | | | Fix year picker initial rangeAlan Viverette2015-02-171-0/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 19410328 Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
* | | | | | | | am 58524b2a: am e7e92381: Merge "Register DDM handlers at the beginning of ↵Piotr Jastrzebski2015-02-162-2/+4
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | main method." * commit '58524b2aa620ae1ea709ae48b8b8598548cc7202': Register DDM handlers at the beginning of main method.
| * | | | | | Merge "Register DDM handlers at the beginning of main method."Piotr Jastrzebski2015-02-162-2/+4
| |\ \ \ \ \ \
| | * | | | | | Register DDM handlers at the beginning of main method.Piotr Jastrzebski2015-02-132-2/+4
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 83c804be: Merge "Prevent duplicated registration of ↵Yohei Yukawa2015-02-141-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnComputeInternalInsetsListener" automerge: efd9abb * commit '83c804be9c1f33ff4bafbfd60218751a00c7d2b9': Prevent duplicated registration of OnComputeInternalInsetsListener
| * | | | | | Merge "Prevent duplicated registration of OnComputeInternalInsetsListener"Yohei Yukawa2015-02-141-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Prevent duplicated registration of OnComputeInternalInsetsListenerSeonggoo Kang2014-12-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnComputeInternalInsetsListener is added when initViews is called, and initViews is called by onCreate and onConfigurationChanged. But it is removed only by onDestroy. Therefore listeners are accumulated and it results performance issue. So before adding, remove mInsetListener that was previously added. Change-Id: I494d3f1875613d73d3f9b8e2af286b5800f03196
* | | | | | | am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused ↵Svetoslav2015-02-131-3/+29
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and input focused nodes. automerge: 27ad2e9 * commit '5136791b3429d1964b9202fb7caad52719408a61': Accessibility: Ensure fresh accessilbity focused and input focused nodes.
| * | | | | | am 599c1042: Accessibility: Ensure fresh accessilbity focused and input ↵Svetoslav2015-02-131-3/+29
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | focused nodes. automerge: 27ad2e9 * commit '599c1042896564906935bc688bbb85515a6dfa45': Accessibility: Ensure fresh accessilbity focused and input focused nodes.
| | * | | | | Accessibility: Ensure fresh accessilbity focused and input focused nodes.Svetoslav2015-02-131-3/+29
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 27ad2e9 * commit '27ad2e95b40fd0ca76de384695498ea114d627ca': Accessibility: Ensure fresh accessilbity focused and input focused nodes.
| | | * | | | Accessibility: Ensure fresh accessilbity focused and input focused nodes.Svetoslav2015-02-131-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
| * | | | | | am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into ↵Ruben Brunk2015-02-131-5/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: d2ccbd4 * commit '41af9d592efbae88ed95ab77a856dd4e8fbab998': camera2: Fix legacy scaling factor application.
* | | | | | | am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode"Jeff Brown2015-02-131-13/+11
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '6c477a29bfc604f6dbf90e0d4ac5c99bc0ed2ff7': Call startInput on return from sleep mode
| * | | | | | Merge "Call startInput on return from sleep mode"Jeff Brown2015-02-131-13/+11
| |\ \ \ \ \ \
| | * | | | | | Call startInput on return from sleep modeMikael Gullstrand2015-01-261-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One manifestation of the problem was that input string disappeared when returning from sleep mode. When editing a TextView with an IME in landscape orientation, the text would disappear when returning from sleep mode. The InputMethodManager would be deactivated when the screen was put into sleep mode as well as the input connection. However when returning from sleep mode the InputMethodManager was activated, but the input connection would not be activated again. The solution is to check focus of the InputMethodManager which will create a new active input connection to use. The change is however not specific to this one problem but fundamentally addresses the issue of lack of startInput on return from sleep mode. Change-Id: I95d05110bc1cf310fad23ea1bcbc5890f642d1fc
* | | | | | | | Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev ↵Ruben Brunk2015-02-131-5/+7
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d2ccbd4 automerge: 41af9d5 * commit '41af9d592efbae88ed95ab77a856dd4e8fbab998': camera2: Fix legacy scaling factor application.
| * | | | | | | Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-devRuben Brunk2015-02-131-5/+7
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d2ccbd4 * commit 'd2ccbd43d24a79122e404206c528995600a6507d': camera2: Fix legacy scaling factor application.
| | * | | | | | Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-devRuben Brunk2015-02-131-5/+7
| | |\ \ \ \ \ \
| | | * | | | | | camera2: Fix legacy scaling factor application.Ruben Brunk2015-02-121-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19359916 Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
* | | | | | | | | am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for ↵Jeremy Joslin2015-02-121-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EXTRA_NETWORK." into lmp-mr1-dev * commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e': Update Javadoc for EXTRA_NETWORK.
| * | | | | | | | am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into ↵Jeremy Joslin2015-02-121-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'f456d4dcc042581cb2a3ba540538898f2cc925b7': Update Javadoc for EXTRA_NETWORK.
| | * | | | | | | am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-devJeremy Joslin2015-02-121-0/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '20be0e25ba660a7555577988cefcfa36d84e7e2f': Update Javadoc for EXTRA_NETWORK.
| | | * | | | | | Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-devJeremy Joslin2015-02-121-0/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | Update Javadoc for EXTRA_NETWORK.Jeremy Joslin2015-02-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19352840 Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
generated by cgit v1.1 at 2025-02-04 06:47:51 +0000