summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Allow disabling layer rotation during screenshots"Dan Stoza2014-02-201-1/+1
|\
| * Allow disabling layer rotation during screenshotsDan Stoza2014-02-141-1/+1
| | | | | | | | | | | | | | | | Add the ability to ignore layers' transformation matrices during screenshot capture, which will allow the window manager to capture unrotated images for recents during the device rotation animation. Bug: 11805195 Change-Id: I96e65506b198d34724eb3aa84815aae6f6de4935
* | Extend pm create-user to handle related and managed users.Kenny Guy2014-02-141-2/+33
| | | | | | | | Change-Id: I0a290b9debdc8ddf23b72a84bf98908ab7fa7c0d
* | am 6231c948: am dc3561df: am 01de2432: am 24d8fa73: Merge "frameworks/base: ↵Dianne Hackborn2014-02-146-0/+1056
|\ \ | | | | | | | | | | | | | | | | | | move idmap from frameworks/native" * commit '6231c948b0dc8dc97a5054f26c398a9a2884921f': frameworks/base: move idmap from frameworks/native
| * \ am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from ↵Dianne Hackborn2014-02-146-0/+1056
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | frameworks/native" * commit '01de243263d347f2ac13a239d67d41817e34df33': frameworks/base: move idmap from frameworks/native
| | * | frameworks/base: move idmap from frameworks/nativeColin Cross2014-02-116-0/+1056
| | | | | | | | | | | | | | | | | | | | | | | | idmap depends on libandroidfw, so it should go in frameworks/base. Change-Id: I3c1db3baa355f53d6b523d60f4377e63eff00c30
* | | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7825334929b098b36e1144872200e75ba6d24b13. Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
* | | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-121-2/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv() thus minimizing build dependencies. Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
* | | Merge "sqlite integer fields are long"Marco Nelissen2014-01-081-1/+1
|\ \ \
| * | | sqlite integer fields are longMarco Nelissen2014-01-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: I350ccfe91af707cfc234bead9341d68b55623d7b
* | | | resolved conflicts for merge of 88bfc6dd to masterCraig Mautner2014-01-081-10/+7
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: Ib656ac0591b21ad14f2df51021729552e9373515
| * | Extend stack management to other displays.Craig Mautner2014-01-061-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Abandon ActivityContainer.startActivity() in favor of IActivityManager.startActivityAsUserInContainer(). - Modify Am to test starting an activity on a container. - Create a DisplayContext as the base context if the activity token is on a different display. - Test for home display in more cases when manipulating home stack. - Rename mDisplayInfos => mActivityDisplays. - Create new method for moving task to front of stack regardless of which display it is on. Change-Id: I4fcb83ae844c5839ee3e2722229623d1a80ed921
* | | resolved conflicts for merge of b7bba718 to masterCraig Mautner2013-12-191-3/+11
|\ \ \ | |/ / | | | | | | Change-Id: Ibbac3f6e3eda0149ae9446d6baed1d1bee5138ac
| * | Pair ActivityStacks with DisplaysCraig Mautner2013-12-181-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce concept of ActivityStacks residing on Displays and able to be decoupled and moved around. - Add a new interface, IActivityContainer for clients to handle ActivityStacks. - Abandon ordering of stacks based on mStackState and instead use ActivityDisplayInfo.stacks<ActivityStack> ordering. Progress towards closing bug 12078972. Change-Id: I7785b61c26dc17f432a4803eebee07c7415fcc1f
* | | DO NOT MERGE: Eliminate StackBox.Craig Mautner2013-12-191-43/+36
| | | | | | | | | | | | | | | | | | | | | | | | StackBox is too constraining. Adding size and position to TaskStacks directly makes stack positioning and management more flexible and prepares for ActivityView. Change-Id: I33c6b4e1c23a5a8069fd507c160bcb34e4d287b2
* | | am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] ↵Nick Kralevich2013-12-161-4/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Drop user loadable bootanimation.zip abiltiy." * commit 'fc800d407d695926ba07299c4e27d1e06284098f': [bootanimation] Drop user loadable bootanimation.zip abiltiy.
| * | am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user ↵Nick Kralevich2013-12-161-4/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | loadable bootanimation.zip abiltiy." * commit 'fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226': [bootanimation] Drop user loadable bootanimation.zip abiltiy.
| | * \ am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip ↵Nick Kralevich2013-12-161-4/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | abiltiy." * commit '3ddee4dec9b7ae2265c356f5809eae73e1ef8796': [bootanimation] Drop user loadable bootanimation.zip abiltiy.
| | | * [bootanimation] Drop user loadable bootanimation.zip abiltiy.Robert Craig2013-12-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A prior change removed the ability of the shell to push to /data/local. Because of this, the bootanimation code no longer supports users loading custom bootanimation.zip files. This patch drops the access attempt from the code. Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | am 411954ae: am a6416309: am 1e137549: am efa5c88f: Merge "Don\'t try to set ↵Nick Kralevich2013-12-111-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | service.bootanim.exit" * commit '411954aef072574676462f579847a01af0aed728': Don't try to set service.bootanim.exit
| * | | am a6416309: am 1e137549: am efa5c88f: Merge "Don\'t try to set ↵Nick Kralevich2013-12-111-3/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | service.bootanim.exit" * commit 'a64163093e6e55f8bbb0153e783fb0ab635e9e60': Don't try to set service.bootanim.exit
| | * | am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"Nick Kralevich2013-12-111-3/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'efa5c88f37165d02e3e11882026c7660c879ff61': Don't try to set service.bootanim.exit
| | | * Don't try to set service.bootanim.exitNick Kralevich2013-12-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | init has never allowed the bootanimation code to set service.bootanim.exit, and has always generated the dmesg error message <3>[ 17.644615] init: sys_prop: permission denied uid:1003 name:service.bootanim.exit Since setting this property has no effect and never worked, delete the code which tries to do it. Change-Id: Idacc5467d85479a8cf974702af8895011be585ea
| * | | am 9f09408e: am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms ↵Narayan Kamath2013-12-112-41/+60
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | of libziparchive." * commit '9f09408e3939c5afdb3f9dafc41afd249303ed7f': Reimplement ZipFileRO in terms of libziparchive.
| | * | am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-112-41/+60
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'd21752dff45c7d8856e63026cfddc303a302df14': Reimplement ZipFileRO in terms of libziparchive.
| | | * Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-112-41/+60
| | | |\
| | | | * Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-092-41/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us share zip archive processing code with both the runtime (Art, dalvik) and critical java code (StrictJarFile). This change also moves several utility methods to ZipUtils and dedups code across several zip inflation methods. One of the side effects of this change is that several processing loops are now O(n) instead of O(n^2). bug: 10193060 Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
| | | | * Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2214-494/+364
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
| * | | | | DO NOT MERGE: Eliminate StackBox.Craig Mautner2013-12-091-43/+36
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StackBox is too constraining. Adding size and position to TaskStacks directly makes stack positioning and management more flexible and prepares for ActivityView. Change-Id: I33c6b4e1c23a5a8069fd507c160bcb34e4d287b2
* | | | | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-112-41/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us share zip archive processing code with both the runtime (Art, dalvik) and critical java code (StrictJarFile). This change also moves several utility methods to ZipUtils and dedups code across several zip inflation methods. One of the side effects of this change is that several processing loops are now O(n) instead of O(n^2). bug: 10193060 (cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df) Change-Id: I86a2c528575d4a3ca86b94be068dcdc3c17c2ed6
* | | | | Call SkBitmap::config() instead of ::getConfig()Leon Scroggins III2013-12-031-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | getConfig() has been deprecated. Change-Id: I32066256ab82ac4760c752c80856d1b56d291fae
* | | | am e3705342: am b0183f0a: Harden against transiently unavailable backup ↵Christopher Tate2013-11-191-6/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transports * commit 'e3705342671d08b5cd94a0d69ef8099a2c3211f8': Harden against transiently unavailable backup transports
| * | | | Harden against transiently unavailable backup transportsChristopher Tate2013-11-191-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Now with 100% less build break. Bug 11716868 Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
* | | | | am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-devSascha Prueter2013-11-181-13/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4': Trying to unbreak build...
| * | | | Trying to unbreak build...Sascha Prueter2013-11-191-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Harden against transiently unavailable backup transports" This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69. Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
* | | | | am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable ↵Christopher Tate2013-11-181-6/+13
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | backup transports" into klp-dev * commit '1e964ed808798a56664853e2aeffdc47c676ac5a': Harden against transiently unavailable backup transports
| * | | Harden against transiently unavailable backup transportsChristopher Tate2013-11-181-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 601fbc7a: am 24fe066e: Merge "Fix am argument ordering documentation." ↵Jeff Sharkey2013-11-141-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '601fbc7a82f325971905b6083e1c54776aa87a6d': Fix am argument ordering documentation.
| * | | Fix am argument ordering documentation.Jeff Sharkey2013-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 11690520 Change-Id: I84b10a6eb6e6404212ab9737e7cee1f1ad4d5309
* | | | am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-291-2/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | * commit '8f592378a1ea7f31d57253dc202f42707ef4da36': Fix a variety of small publicly-reported bugs.
| * | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp. https://code.google.com/p/android/issues/detail?id=61556 Missing fclose in core/jni/android_os_Debug.cpp. https://code.google.com/p/android/issues/detail?id=61546 Bad loop guards in core/jni/android_util_Process.cpp. https://code.google.com/p/android/issues/detail?id=61557 Assignment to wrong variable in libs/androidfw/AssetManager.cpp. https://code.google.com/p/android/issues/detail?id=61560 Missing delete[]s in libs/androidfw/ObbFile.cpp. https://code.google.com/p/android/issues/detail?id=61549 Leaks on error in tools/aapt/Images.cpp. https://code.google.com/p/android/issues/detail?id=61552 Two missing fclose calls in tools/aapt/Resource.cpp. https://code.google.com/p/android/issues/detail?id=61553 Missing fclose in tools/aidl/aidl.cpp. https://code.google.com/p/android/issues/detail?id=61554 Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
* | | am 65d57713: am bacb5422: Merge "Also rely on enabled notification listeners ↵Jean-Michel Trivi2013-10-071-0/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | for RemoteController registration" into klp-dev * commit '65d577139c8093f2a601069bbe05d2e622e0d340': Also rely on enabled notification listeners for RemoteController registration
| * | Also rely on enabled notification listeners for RemoteController registrationJean-Michel Trivi2013-10-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Registration of a RemoteController may succeed only if: - the caller has the MEDIA_CONTENT_CONTROL permission, - or if the RemoteController.OnClientUpdateListener it registers if one of the enabled notification listeners. For using the "enabled notification listener" functionality, the CL involved: - making OnClientUpdateListener an interface so a 3rd-party application may have its implementation extend NotificationListenerService, which is required for a listener to be enabled by the user. - add the concept of "enabled" status in an IRemoteControlDisplay, so a RemoteController (which encapsulates the IRemoteControlDisplay implementation) may be registered, but later temporarily disabled by the user, as a result of a user action in the security settings, or a user switch. - making MediaFocusControl, the component tied to AudioService, monitor changes in enabled notification listeners, and act upon enable/disable changes. Bug 8209392 Change-Id: Ia8dfa2156c65668b2b0d4ae92048005912652d84
* | | am 78466f3e: am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround."Nick Kralevich2013-09-181-29/+0
|\ \ \ | |/ / |/| / | |/ | | * commit '78466f3eb59e804f9a6e770dbc8d764faa91ccb8': revert ADDR_COMPAT_LAYOUT workaround.
| * revert ADDR_COMPAT_LAYOUT workaround.Nick Kralevich2013-09-181-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Stop working around bad applications by setting ADDR_COMPAT_LAYOUT. ADDR_COMPAT_LAYOUT is undesirable because it reduces the amount of address space available to an application. The Android emulator, in both 4.3 and 4.4, does not set ADDR_COMPAT_LAYOUT. Anyone needing to test their application on a version of Android without ADDR_COMPAT_LAYOUT can use the emulator and reproduce the failures. Change-Id: I8f753acc205798bd7f031026c7ece12d26de562c
* | Implement issue #10691359: Kill long-running processesDianne Hackborn2013-09-161-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have the activity manager kill long-running processes during idle maintanence. This involved adding some more information to the activity manager about the current memory state, so that it could know if it really should bother killing anything. While doing this, I also improved how we determine when memory is getting low by better ignoring cases where processes are going away for other reasons (such as now idle maintenance). We now won't raise our memory state if either a process is going away because we wanted it gone for another reason or the total number of processes is not decreasing. The idle maintanence killing also uses new per-process information about whether the process has ever gone into the cached state since the last idle maintenance, and the initial pss and current pss size over its run time. Change-Id: Iceaa7ffb2ad2015c33a64133a72a272b56dbad53
* | Add #! to 'am' shell scriptAndy McFadden2013-09-041-0/+2
| | | | | | | | | | | | | | | | Shell script needs to start with #! for exec(). Bug 10606037 Change-Id: I594da6f0433e838dcf5b45b991188ceaa52d9bd1
* | Fix check for default source in input commandMichael Wright2013-08-221-1/+1
| | | | | | | | Change-Id: I30b062e78c7d4de59a5530999e6332ba3053f7c9
* | Changes needed to support Skia at r10377.Derek Sollenberger2013-08-011-1/+1
| | | | | | | | Change-Id: Id1e1c8c5938ee1a33c6fa3caabd2c28e89243eb4
* | get rid of HAL pixelformats 5551 and 4444Mathias Agopian2013-07-261-2/+0
| | | | | | | | Change-Id: I6a6c4c656d80280eb85f90f99f35721ffca285df
generated by cgit v1.1 at 2025-01-08 17:07:48 +0000