summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
* Rename the binder call createActivityContainerTodd Kennedy2015-01-151-1/+2
| | | | | | | Change the call to createVirtualActivityContainer to better describe what's actually being created with the call. Change-Id: Id3a32df19a5bb6740cbabcd65897349e9f2f2946
* am e5cb6a25: am bb845152: Merge "pm path needs to return 0 when it ↵Hui Shu2015-01-051-1/+1
|\ | | | | | | | | | | | | | | | | succeeds." into lmp-mr1-dev automerge: 9bd1382 * commit '9bd1382f210732f406e497883dc8f4039f8d33d9': pm path needs to return 0 when it succeeds.
| * am e5cb6a25: am bb845152: Merge "pm path needs to return 0 when it ↵Hui Shu2015-01-051-1/+1
| |\ | | | | | | | | | | | | | | | | | | succeeds." into lmp-mr1-dev * commit 'e5cb6a253afa8faffb85c73779a78c74aead23ae': pm path needs to return 0 when it succeeds.
| | * Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-devHui Shu2015-01-051-1/+1
| | |\
| | | * pm path needs to return 0 when it succeeds.Hui Shu2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | BUG: 18721587 Change-Id: I2136d1933e62a20645517d17c1365d214509de16
* | | | Merge "Support quatation mark for text command"Jaewan Kim2015-01-051-1/+1
|\ \ \ \
| * | | | Support quatation mark for text commandJaewan Kim2014-12-081-1/+1
| | |_|/ | |/| | | | | | | | | | Change-Id: If32daa593f5feb3b80b143faabd7e83511df2365
* | | | am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource ↵Narayan Kamath2014-12-291-1/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | string missing" automerge: 1cc57ab * commit '1cc57aba8128134f55b6d5e4f4800c51e3472828': Fix "pm list permissions" crash if resource string missing
| * | | am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource ↵Narayan Kamath2014-12-291-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string missing" * commit '1bafd01a3fc5f94e77d1c18e5a7dcdecddcaa47f': Fix "pm list permissions" crash if resource string missing
| | * \ \ Merge "Fix "pm list permissions" crash if resource string missing"Narayan Kamath2014-12-291-1/+4
| | |\ \ \
| | | * | | Fix "pm list permissions" crash if resource string missingDenver Coneybeare2014-06-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "pm list permissions" command lists detailed information about each permission on the system, including its label and description, both of which can be stored as translatable resource strings in APK files. However, it is possible that the resource identifiers for these strings point to non-existent resources. When this happens, the loadText() method throws Resources.NotFoundException, causing the "pm" command to abort prematurely, simply printing "Killed" to stdout and a stack trace to logcat. This commit fixes the crash by explicitly catching the Resources.NotFoundException exception in loadText() and returning null if it is thrown. The loadText() method already has the potential to return null so none of its callers need be modified. This fixes the crash and simply shows "label:null" and/or "description:null" in the output if the string resource is missing. Change-Id: I92273399e1dac6029163750d004940ee1da67428
* | | | | | am e06184e4: Merge "Add mips64 support to app_process." automerge: 51bdc62Jeff Hao2014-12-181-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 093dad2 * commit '093dad2a47aed9f16fd4190af4b3070b49b982f1': Add mips64 support to app_process.
| * | | | | am e06184e4: Merge "Add mips64 support to app_process."Jeff Hao2014-12-181-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 51bdc62 * commit '51bdc629f59b45fa64331e3c41ac35147ed4c7f6': Add mips64 support to app_process.
| | * | | | Add mips64 support to app_process.Douglas Leung2014-12-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieb05a212606f02ebad119a0aea0ed92773ace214
* | | | | | Reapply: Add generated source dependency for Jack compilation.Guang Zhu2014-12-131-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: frameworks/testing 04af616aeba3a4e57b32092afe763981d1776dc8 Change reapplied due to source location move Bug: 18708851 Change-Id: I2c220194aa94af528767c123f6fa34b623ce73d4
* | | | | am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into ↵Guang Zhu2014-12-1443-0/+9054
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'd8ca1208b3ee76e45e45e47d5806c398442a55a3': shell based UI Automator source move
| * | | | shell based UI Automator source moveGuang Zhu2014-12-1243-0/+9054
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator (samples, utils sub folders exlcuded) frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils no source files changed, only one line makefile update (for UI Automator API check) Bug: 18708851 Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
| * | | | Switch to libsigchain.aDmitriy Ivanov2014-12-102-27/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker to export symbols from the static library. (cherry picked from commit 5ba317cee071b718a163ab9acf2b6b4f6a337b39) Bug: 18701723 Change-Id: Id9b567a1529574eab2225777f1f2a5ea10e540ad
* | | | | am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both ↵Chih-hung Hsieh2014-12-111-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 32-bit and 64-bit builds" * commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e': Adjust format strings to work on both 32-bit and 64-bit builds
| * | | | Adjust format strings to work on both 32-bit and 64-bit buildsBernhard Rosenkränzer2014-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust format strings to not produce Clang warnings in both 32-bit and 64-bit builds Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory ↵Dianne Hackborn2014-12-031-10/+197
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | state is invalid after..." into lmp-mr1-dev * commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf': Work on issue #18572506: AppOps in-memory state is invalid after...
| * | | | Work on issue #18572506: AppOps in-memory state is invalid after...Dianne Hackborn2014-12-031-10/+197
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...uninstalling updates to a system app Things seem to be working fine, however we were not as aggressive at writing out the current state in this case as we probably should be. Also introduce more features to the appops command, which are useful for testing this. Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
* | | | am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"Chih-hung Hsieh2014-11-252-3/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '43ea037b4c61e332d7419ac069a62e314166fdd7': Fix class vs. struct mismatch
| * | | Fix class vs. struct mismatchBernhard Rosenkränzer2014-11-242-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't refer to classes as structs and view versa -- causes warnings in clang (in code built with -Werror) Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am f07a99f9: am 07aca15b: Merge "Better am error when SELinux blocking ↵Jeff Sharkey2014-11-251-3/+21
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | access." into lmp-mr1-dev * commit 'f07a99f9b92878e3570fe1715c701bc4c32d2ad9': Better am error when SELinux blocking access.
| * | | Better am error when SELinux blocking access.Jeff Sharkey2014-11-241-3/+21
| | | | | | | | | | | | | | | | | | | | Bug: 18479882 Change-Id: I0732e54838c4e04d9d727e7c5fd9d7e7bacbaa1f
* | | | am 8e55c4bf: am 604aec95: Merge "Add new subcommand \'set-active-admin\' to ↵Zoltan Szatmary-Ban2014-11-251-0/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | the dpm command." into lmp-mr1-dev * commit '8e55c4bff83af7eea3212bc9ff6a254ac70139fd': Add new subcommand 'set-active-admin' to the dpm command.
| * | | Merge "Add new subcommand 'set-active-admin' to the dpm command." into ↵Zoltan Szatmary-Ban2014-11-241-0/+27
| |\ \ \ | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | Add new subcommand 'set-active-admin' to the dpm command.Zoltan Szatmary-Ban2014-11-191-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18002490 Change-Id: I91746032df08ef0fdef05711114691da18796a0a
* | | | | am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to ↵Dianne Hackborn2014-11-211-4/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev automerge: c43613b * commit 'c43613becf0146a0d54ff15f5ca024d759c43290': Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
| * | | | Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSIONDianne Hackborn2014-11-201-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You now need to set a flag if you want this unsafe behavior. Change-Id: I185e9a04e005e42a887c3d58a2818616790b060a
* | | | | am 42fec57f: am d9968438: Merge "Fix issue with call backs from media ↵Dianne Hackborn2014-11-211-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | process." into lmp-mr1-dev * commit '42fec57f3addfb1958f814b5d6772ff81341ba20': Fix issue with call backs from media process.
| * | | | Fix issue with call backs from media process.Dianne Hackborn2014-11-191-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All but a few lines of this is for issue #16013164, which allowed apps to do some operations as the media uid by having it call back to them to open a file. The problem here is with the tempory identity stuff in the activity manager, allowing us to make the open call as the original caller... ideally we should figure out a way to just get rid of all of that, but the solution here is actually easier (even though it doesn't look it) -- we now hand a token over to the openFile() call that it can use when doing permission checks to say "yes I would like the check to be against whoever is responsible for the open". This allows us to do the uid remapping for only this one specific set of permission checks, and nothing else. Also fix issue #17487348: Isolated services can access system services they shouldn't be able to. Don't send any system service IBinder objects down for the first initialization of an isolated process. Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
* | | | am 43b8643e: am f926d71b: Merge "Fix format strings mismatching the ↵Chih-hung Hsieh2014-11-201-3/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | parameters passed to them" * commit '43b8643e86d7c5d0d5cf536336126232454f361a': Fix format strings mismatching the parameters passed to them
| * | | Fix format strings mismatching the parameters passed to themBernhard Rosenkränzer2014-11-201-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."Dan Albert2014-11-201-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd8c169fedf883491e46b354484909694fd52cfaf': Add appropriate casts for char16_t.
| * | | Add appropriate casts for char16_t.Dan Albert2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++11 defines a real char16_t, which is not implicitly convertible to uint16_t (and by extension jchar). Add casts as needed. Bug: 18300613 Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
* | | | am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into ↵Christopher Tate2014-11-151-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: e5e43e9 * commit 'e5e43e9ab88bf6a9951a323ae5f804967dab4c96': Teach bmgr that "android" is a valid package name
| * | | Teach bmgr that "android" is a valid package nameChristopher Tate2014-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug 18379037 Change-Id: I4d6da2893f83e672920bbda9447aa4cbd1ecec7b
* | | | am 525da301: am 85d558cd: Add Activity API to get referrer information.Dianne Hackborn2014-11-111-6/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '525da301930e554dc331828adee35613f945c250': Add Activity API to get referrer information.
| * | | Add Activity API to get referrer information.Dianne Hackborn2014-11-111-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This expands the use of EXTRA_REFERRER to be relevant anywhere, allowing apps to supply referrer information if they want. However, if they don't explicitly supply it, then the platform now keeps track of package names that go with Intents when delivering them to apps, which it can be returned as the default value. The new method Activity.getReferrer() is used to retrieve this referrer information. It knows about EXTRA_REFERRER, it can return the default package name tracked internally, and it also can return a new EXTRA_REFERRER_NAME if that exists. The latter is needed because we can't use EXTRA_REFERRER in some cases since it is a Uri, and things like #Intent; URI extras can only generate primitive type extras. We really need to support this syntax for referrers, so we need to have this additional extra field as an option. When a referrer is to a native app, we are adopting the android-app scheme. Since we are doing this, Intent's URI creation and parsing now supports this scheme, and we improve its syntax to be able to build intents with custom actions and stuff, instead of being all hung up on custom schemes. While doing this, fixed a problem when parsing both intent: and new android-app: schemes with a selector portion, where we were not respecting any scheme that was specified. Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
* | | | am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds"Andreas Gampe2014-11-082-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'f89a2fdacb2ba907f180188dc79f9de81e3eb254': Frameworks/base: Fix two warnings in cmds
| * | | Frameworks/base: Fix two warnings in cmdsAndreas Gampe2014-11-082-2/+2
| | | | | | | | | | | | Change-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a
* | | | am e80c01e8: Merge "Frameworks/base: Turn on -Wall -Werror in cmds"Andreas Gampe2014-11-0715-85/+80
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e80c01e8d124c69ca60fc8e7a0ca7001be3796e0': Frameworks/base: Turn on -Wall -Werror in cmds
| * | | Frameworks/base: Turn on -Wall -Werror in cmdsAndreas Gampe2014-11-0715-85/+80
| | | | | | | | | | | | | | | | | | | | | | | | Fix small warnings, turn on -Wall -Werror. Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
| * | | Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-masterBill Yi2014-10-2236-584/+2741
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
| | * \ \ am 9be7db6e: am 952dd924: Merge "Switch to libsigchain.a"Dmitriy Ivanov2014-10-212-27/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '9be7db6e3bc374efd9dcff744deab92148e20dbd': Switch to libsigchain.a
| | * \ \ \ am d1e735ef: am ed583f5e: Merge "Link sigchain to main executable"Dmitriy Ivanov2014-10-142-2/+32
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1e735ef547c1720aa5bb56a446afbb7a8652599': Link sigchain to main executable
| | * \ \ \ \ am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-devDianne Hackborn2014-10-101-5/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ea69880bdbf2c51140460dcfd063dc015c3ce26': Improve some docs, fix some debugging.
| | * \ \ \ \ \ am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing ↵Mike Lockwood2014-10-081-0/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot sounds." into lmp-dev * commit '3910f53c5ebccbe64ab768591dc7c377f1eb0153': bootanimation: Tweak parameters for pcm_open for playing boot sounds.