summaryrefslogtreecommitdiffstats
path: root/cmds
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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.
| | * \ \ \ \ \ \ am 56b7d562: Merge "Add support for playing audio during bootanimation" into ↵Mike Lockwood2014-10-065-18/+421
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '56b7d562af4dd0e7bd04163fe9a86a801fcff1fe': Add support for playing audio during bootanimation
| | * \ \ \ \ \ \ \ am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-devAlexandra Gherghina2014-09-301-1/+17
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '75c33d9d04d8c0a9884a70077681261b57c7833c': Adds the ability to start a user in background
| | * \ \ \ \ \ \ \ \ am 7fa90f6a: Merge "bootanimation: allow animation to specify background ↵Jesse Hall2014-09-262-3/+43
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color" into lmp-dev * commit '7fa90f6ae5c04d96b3210a45898d1e7a8f5ef8e6': bootanimation: allow animation to specify background color
| | * \ \ \ \ \ \ \ \ \ am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-devRoboErik2014-09-251-1/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '23df1c46b768bb2a1363b6f671b0d0c4879538b7': Allow null queues to be set in MediaSession
| | * \ \ \ \ \ \ \ \ \ \ am c840e31d: am fa436298: Merge "Broadcast an intent to mediascanner after ↵Marco Nelissen2014-09-221-1/+20
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | executing screencap" * commit 'c840e31d0ee772373b1be7469b7bfbe28715d52e': Broadcast an intent to mediascanner after executing screencap
* | | \ \ \ \ \ \ \ \ \ \ \ am 9647bdd9: am 70bbbd32: Merge "More flexible intent extra parsing." into ↵Daniel Sandler2014-11-051-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '9647bdd97ec7fda804244bde195ca10219726e89': More flexible intent extra parsing.
| * | | | | | | | | | | | | Merge "More flexible intent extra parsing." into lmp-mr1-devDaniel Sandler2014-11-051-4/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | More flexible intent extra parsing.Daniel Sandler2014-10-291-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, --ei (int extras) and --eia (int[] extras) now use Integer.decode(), which means they accept negative integers, base-16 integers formatted as #NNN and 0xNNN, and base-8 integers formatted as 0NNN. Additionally, --ez (boolean extras) can now be specified as "true", "false", "t", "f", or an integer (any nonzero treated as true). The previous behavior, based on Boolean.valueOf(), would silently assign false if you managed to get the spelling of "true" wrong. Change-Id: I058254e907308006d403b5b7866c86bcaa03d8d3
* | | | | | | | | | | | | | | am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-devEvan Charlton2014-10-311-147/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: e8b451d * commit 'e8b451dd123b96252026992be3c96c9c577b4245': Have Pm return the correct code
| * | | | | | | | | | | | | | Have Pm return the correct codeEvan Charlton2014-10-311-147/+185
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the command fails, have Pm return a nonzero exit code. Bug: 18085950 Change-Id: I3de1b8f69aa8f44b2e2109864c1aa093e3b82141
| * | | | | | | | | | | | | Link sigchain to main executableDmitriy Ivanov2014-10-162-2/+32
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also export necessary symbols to preempt calls from libart.so Bug: 15345057 Bug: 15426766 (cherry picked from commit 96e0cfa721925550b1cc39cdfd6084a878e6ffe2) Change-Id: I0930d96edde7dc0636e8d50d7c778f099237f748
* | | | | | | | | | | | | am 09a7d324: am 388dbd28: Merge "Include <time.h> for clock_nanosleep."Elliott Hughes2014-10-211-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09a7d324ef15dab7f7bea72aa16b1585285cadf1': Include <time.h> for clock_nanosleep.
| * | | | | | | | | | | | Merge "Include <time.h> for clock_nanosleep."Elliott Hughes2014-10-211-4/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Include <time.h> for clock_nanosleep.Elliott Hughes2014-10-211-4/+1
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3098fa03003bce5d06d60e9129c10cce3c850bb
* | | | | | | | | | | | am 9be7db6e: am 952dd924: Merge "Switch to libsigchain.a"Dmitriy Ivanov2014-10-212-27/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9be7db6e3bc374efd9dcff744deab92148e20dbd': Switch to libsigchain.a
| * | | | | | | | | | | Switch to libsigchain.aDmitriy Ivanov2014-10-202-27/+7
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker to export symbols from the static library. Change-Id: I465806dcffc777a682523f74ae6f7ab61aaa6962
* | | | | | | | | | | am d1e735ef: am ed583f5e: Merge "Link sigchain to main executable"Dmitriy Ivanov2014-10-142-2/+32
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1e735ef547c1720aa5bb56a446afbb7a8652599': Link sigchain to main executable
| * | | | | | | | | | Link sigchain to main executableDmitriy Ivanov2014-10-092-2/+32
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also export necessary symbols to preempt calls from libart.so Bug: 15345057 Bug: 15426766 Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
* | | | | | | | | | am 8f6928f1: am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some ↵Dianne Hackborn2014-10-101-5/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs, fix some debugging." into lmp-dev * commit '8f6928f1399620ce432b82d046912e2030d6511c': Improve some docs, fix some debugging.
| * | | | | | | | | Improve some docs, fix some debugging.Dianne Hackborn2014-10-091-5/+3
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add docs to Binder, Messenger, ResultReceier to explain their relation (or lack there-of) to process lifecycle. - Clarify some aspects of process lifecycle for services. - Fix help text of am command. - Fix per-package dumping of battery stats to not include history. - Fix per-package dumping of proc stats to only include aggregated and current stats and fix some formatting. - Fix per-process dumping of meminfo to have an option to interpret the input as a package, so including all processes that are running code of that package. - Fix top-level per-package debug output to correctly include all of these improvements and give them a little more time (10s) to complete for timing out. Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
* | | | | | | | | am 500913ee: am cf1e5c39: am cf61b3f6: am 3910f53c: Merge "bootanimation: ↵Mike Lockwood2014-10-101-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweak parameters for pcm_open for playing boot sounds." into lmp-dev * commit '500913ee002eb8a6a418732f3a6d7549ac046eaf': bootanimation: Tweak parameters for pcm_open for playing boot sounds.
| * | | | | | | | bootanimation: Tweak parameters for pcm_open for playing boot sounds.Mike Lockwood2014-10-071-0/+3
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set start_threshold and avail_min to 1/4th period size and stop_threshold to INT_MAX Change-Id: I0a3aac18533709daa86a024cdd6a32086410723a
* | | | | | | | am 66c009eb: am bb68c263: am 3df6b76c: am 56b7d562: Merge "Add support for ↵Mike Lockwood2014-10-075-18/+421
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playing audio during bootanimation" into lmp-dev * commit '66c009ebfe5b31aa1f176d4856d95f5daad6079d': Add support for playing audio during bootanimation
| * | | | | | | Add support for playing audio during bootanimationMike Lockwood2014-10-035-18/+421
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bootanimation daemon will play 16 bit WAV files contained in bootanimation.zip For this to work, the bootanimation.zip must contain an audio_conf.txt file, which contains parameters to be used for the tinyalsa pcm_open call as well as mixer parameters to set before attempting to play the sound. If the bootanimation finds an audio_conf.txt file, then it will look for a file named "audio.wav" in each of the part subdirectories. If audio.wav is found, it will play that WAV file starting at the beginning of that part. The code for this is based on the tinyplay utility in tinyalsa. The audio_conf.txt and must begin with the following header: card=<ALSA card number> device=<ALSA device number> period_size=<period size> period_count=<period count> This header is followed by zero or more mixer settings, each with the format: mixer "<name>" = <value list> Since mixer names can contain spaces, the name must be enclosed in double quotes. The values in the value list can be integers, booleans (represented by 0 or 1) or strings for enum values. Finally I should mention that this change is not the right approach. Instead of going straight to ALSA we should be using the mediaserver instead. But mediaserver isn't ready in time due to interactions with the system server, and there isn't time to fix this for the current release. We need to fix that for the next one. Bug: 17674304 Change-Id: Ic391ade61c941d0a24f4d64fe005ac9375a23fa9
* | | | | | | am 8292b033: am a266670a: am d7275ae2: am 75c33d9d: Merge "Adds the ability ↵Alexandra Gherghina2014-10-011-1/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to start a user in background" into lmp-dev * commit '8292b0331e21af8786791067e92009e949448f3f': Adds the ability to start a user in background
| * | | | | | Adds the ability to start a user in backgroundAlexandra Gherghina2014-09-291-1/+17
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 15900074 Change-Id: I03b278f8e7a4618ea56a5f1935cfba34beb45981
* | | | | | am f295b675: am 9a2eafc1: am 12297705: am 7fa90f6a: Merge "bootanimation: ↵Jesse Hall2014-09-262-3/+43
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow animation to specify background color" into lmp-dev * commit 'f295b675239892c8637d3ad48777226314be2de1': bootanimation: allow animation to specify background color
| * | | | | bootanimation: allow animation to specify background colorJesse Hall2014-09-252-3/+43
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some OEMs want to have a bootanimation (or parts of it) displayed on a color other than black. They currently just use full-screen frames for that, which wastes lots of memory and bandwidth. This change allows each part of the animation to specify a background color that will be applied outside of the frame images; if unspecified the background will be black as it is now. Bug: 16635599 Change-Id: Ibf008fc75c5aad891c86ba9e4ec0879b7a61b8bd
* | | | | am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues ↵RoboErik2014-09-261-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | to be set in MediaSession" into lmp-dev * commit '5e8f023dc17788a18bc5640a42baaf2bec609745': Allow null queues to be set in MediaSession
| * | | | Allow null queues to be set in MediaSessionRoboErik2014-09-241-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Also add some test code for it to OneMedia. bug:17593962 Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
* | | | am c840e31d: am fa436298: Merge "Broadcast an intent to mediascanner after ↵Marco Nelissen2014-09-221-1/+20
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | executing screencap" * commit 'c840e31d0ee772373b1be7469b7bfbe28715d52e': Broadcast an intent to mediascanner after executing screencap
| * | Merge "Broadcast an intent to mediascanner after executing screencap"Marco Nelissen2014-09-221-1/+20
| |\ \