summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Revert "Expand install observer semantics""Glenn Kasten2014-03-261-25/+7
|\
| * Revert "Expand install observer semantics"Glenn Kasten2014-03-261-25/+7
| | | | | | | | | | | | This reverts commit ab8a501f255b272af887acb0e66eb71cdf24c755. Change-Id: I4ab4ae1a96efa2adf9d5a513793d8b84eef38b4e
* | Merge "Expand install observer semantics"Christopher Tate2014-03-261-7/+25
|\ \ | |/
| * Expand install observer semanticsChristopher Tate2014-03-251-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | ...and now fail conservatively when two apps both attempt to define the same permission. We also finally have a (hidden) interface class for observing package installation so that we can now rev the interface without breaking existing callers. Bug 13551375 Change-Id: I3a286d024a30e812ee4b098f345401df3c00e178
* | Shared library resource supportAdam Lesinski2014-03-251-1/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared libraries can now export resources for applications to use. Exporting resources works the same way the framework exports resources, by defining the public symbols in res/values/public.xml. Building a shared library requires aapt to be invoked with the --shared-lib option. Shared libraries will be assigned a package ID of 0x00 at build-time. At runtime, all loaded shared libraries will be assigned a new package ID. Currently, shared libraries should not import other shared libraries, as those dependencies will not be loaded at runtime. At runtime, reflection is used to update the package ID of resource symbols in the shared library's R class file. The package name of the R class file is assumed to be the same as the shared library's package name declared in its manifest. This will be customizable in a future commit. See /tests/SharedLibrary/ for examples of a shared library and its client. Bug:12724178 Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
* am a3633c25: am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: ↵Colin Cross2014-03-201-0/+3
|\ | | | | | | | | | | | | build 32-bit if 64-bit gl libraries are not available" * commit 'a3633c25033b576ae160ea86194e4f7f20d82fe2': bootanimation: build 32-bit if 64-bit gl libraries are not available
| * am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl ↵Colin Cross2014-03-201-0/+3
| |\ | | | | | | | | | | | | | | | | | | libraries are not available" * commit 'e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00': bootanimation: build 32-bit if 64-bit gl libraries are not available
| | * bootanimation: build 32-bit if 64-bit gl libraries are not availableColin Cross2014-03-191-0/+3
| | | | | | | | | | | | | | | | | | Set LOCAL_32_BIT_ONLY if TARGET_32_BIT_SURFACEFLINGER is set. Change-Id: I76396cc9fe3fe45d1e98a44bf911d6e70922555a
* | | App widget backup/restore infrastructureChristopher Tate2014-03-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backup/restore now supports app widgets. An application involved with app widgets, either hosting or publishing, now has associated data in its backup dataset related to the state of widget instantiation on the ancestral device. That data is processed by the OS during restore so that the matching widget instances can be "automatically" regenerated. To take advantage of this facility, widget-using apps need to do two things: first, implement a backup agent and store whatever widget state they need to properly deal with them post-restore (e.g. the widget instance size & location, for a host); and second, implement handlers for new AppWidgetManager broadcasts that describe how to translate ancestral-dataset widget id numbers to the post-restore world. Note that a host or provider doesn't technically need to store *any* data on its own via its agent; it just needs to opt in to the backup/restore process by publishing an agent. The OS will then store a small amount of data on behalf of each widget-savvy app within the backup dataset, and act on that data at restore time. The broadcasts are AppWidgetManager.ACTION_APPWIDGET_RESTORED and ACTION_APPWIDGET_HOST_RESTORED, and have three associated extras: EXTRA_APPWIDGET_OLD_IDS EXTRA_APPWIDGET_IDS EXTRA_HOST_ID [for the host-side broadcast] The first two are same-sized arrays of integer widget IDs. The _OLD_IDS values are the widget IDs as known to the ancestral device. The _IDS array holds the corresponding widget IDs in the new post- restore environment. The app should simply update the stored widget IDs in its bookkeeping to the new values, and things are off and running. The HOST_ID extra, as one might expect, is the app-defined host ID value of the particular host instance which has just been restored. The broadcasts are sent following the conclusion of the overall restore pass. This is because the restore might have occurred in a tightly restricted lifecycle environment without content providers or the package's custom Application class. The _RESTORED broadcast, however, is always delivered into a normal application environment, so that the app can use its content provider etc as expected. *All* widget instances that were processed over the course of the system restore are indicated in the _RESTORED broadcast, even if the backing provider or host is not yet installed. The widget participant is responsible for understanding that these are promises that might be fulfilled later rather than necessarily reflecting the immediate presentable widget state. (Remember that following a cloud restore, apps may be installed piecemeal over a lengthy period of time.) Telling the hosts up front about all intended widget instances allows them to show placeholder UI or similarly useful information rather than surprising the user with piecemeal unexpected appearances. The AppWidgetProvider helper class has been updated to add a new callback, onRestored(...), invoked when the _RESTORED broadcast is received. The call to onRestored() is immediately followed by an invocation of onUpdate() for the affected widgets because they will need to have their RemoteViews regenerated under the new ID values. Bug 10622506 Bug 10707117 Change-Id: Ie0007cdf809600b880d91989c00c3c3b8a4f988b
* | | am a78b389e: am 49fca697: am 0dccb02b: am 19fc55e1: Merge "build ↵Colin Cross2014-03-201-0/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | app_process64 on 64-bit targets" * commit 'a78b389e544894ccb9673e2e416c3a1b51260513': build app_process64 on 64-bit targets
| * | am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets"Colin Cross2014-03-201-0/+22
| |\ \ | | |/ | | | | | | | | | * commit '0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1': build app_process64 on 64-bit targets
| | * build app_process64 on 64-bit targetsColin Cross2014-03-191-0/+22
| | | | | | | | | | | | | | | | | | | | | On 64-bit platforms builds two copies of app_process, the 32-bit app_process and 64-bit app_process64. Change-Id: I59d739b5df398ad0bd040c954c57640ff7ab3e72
* | | Add Lock Task Mode.Craig Mautner2014-03-131-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | When in lock task mode only the specified task may run. All attempts to switch to another task are ignored until the task finishes or a call to stopLockTaskMode() is made. Change-Id: I6cfe92fe1bcf22cd47b5398c08e23c52a4092dda
* | | Merge "FramebufferNativeWindow.h is obsolete"Andy McFadden2014-03-061-1/+0
|\ \ \
| * | | FramebufferNativeWindow.h is obsoleteAndy McFadden2014-03-051-1/+0
| | | | | | | | | | | | | | | | Change-Id: I3c645af7247a520e28d337e567f326375558519a
* | | | Start related users on boot and user switch.Kenny Guy2014-03-051-1/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Collect related initialized users and start them on boot and user switch. Update list users command to show whether a user is running or not. Change-Id: Ib3d5debcb01ec55a07d93450b988b0180fc63263
* | | Merge "Fix includes so that they no longer rely on the global Skia includes ↵Derek Sollenberger2014-02-282-6/+3
|\ \ \ | | | | | | | | | | | | directories."
| * | | Fix includes so that they no longer rely on the global Skia includes ↵Derek Sollenberger2014-02-272-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | directories. bug:13225538 Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
* | | | Merge "Adds support for array string extra."Dale Hawkins2014-02-271-0/+11
|\ \ \ \
| * | | | Adds support for array string extra.Dale Hawkins2014-02-261-0/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for setting an array string extra on an intent when launching an activity/service. Allows inclusion of commas using an escape character. Change-Id: I8857f7d28d60b75ddc65dc47f345a77230d00467
* | | | Cleanup unnecessary includes for libskia.Derek Sollenberger2014-02-271-7/+0
|/ / / | | | | | | | | | | | | | | | | | | The libskia target exports all of its public includes directories so redefining them here is redundant. Also this cleans up and makes it obvious where the framework is making using of private Skia headers. Change-Id: Ie7ecc9ddd3df780bed6b9af54ba58ca58274e043
* | | 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