1276 Commits

Author SHA1 Message Date
Christopher Tate
bd20bf7b80 am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev
automerge: e5e43e9

* commit 'e5e43e9ab88bf6a9951a323ae5f804967dab4c96':
  Teach bmgr that "android" is a valid package name
2014-11-15 01:24:30 +00:00
Christopher Tate
fbec21ff43 Teach bmgr that "android" is a valid package name
Bug 18379037

Change-Id: I4d6da2893f83e672920bbda9447aa4cbd1ecec7b
2014-11-13 16:39:56 -08:00
Dianne Hackborn
95ef0ac777 am 525da301: am 85d558cd: Add Activity API to get referrer information.
* commit '525da301930e554dc331828adee35613f945c250':
  Add Activity API to get referrer information.
2014-11-11 00:55:10 +00:00
Dianne Hackborn
85d558cd48 Add Activity API to get referrer information.
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
2014-11-11 00:42:18 +00:00
Andreas Gampe
5bf0c65eef am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds"
* commit 'f89a2fdacb2ba907f180188dc79f9de81e3eb254':
  Frameworks/base: Fix two warnings in cmds
2014-11-08 02:04:43 +00:00
Andreas Gampe
ebee1379ea Frameworks/base: Fix two warnings in cmds
Change-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a
2014-11-08 01:04:45 +00:00
Andreas Gampe
9a0aa553ad am e80c01e8: Merge "Frameworks/base: Turn on -Wall -Werror in cmds"
* commit 'e80c01e8d124c69ca60fc8e7a0ca7001be3796e0':
  Frameworks/base: Turn on -Wall -Werror in cmds
2014-11-07 22:49:44 +00:00
Andreas Gampe
cfedceb8c1 Frameworks/base: Turn on -Wall -Werror in cmds
Fix small warnings, turn on -Wall -Werror.

Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
2014-11-07 14:33:51 -08:00
Daniel Sandler
8d37f7c1b2 am 9647bdd9: am 70bbbd32: Merge "More flexible intent extra parsing." into lmp-mr1-dev
* commit '9647bdd97ec7fda804244bde195ca10219726e89':
  More flexible intent extra parsing.
2014-11-05 19:06:25 +00:00
Daniel Sandler
70bbbd32be Merge "More flexible intent extra parsing." into lmp-mr1-dev 2014-11-05 18:53:44 +00:00
Evan Charlton
3869d75196 am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev
automerge: e8b451d

* commit 'e8b451dd123b96252026992be3c96c9c577b4245':
  Have Pm return the correct code
2014-10-31 20:22:15 +00:00
Evan Charlton
7c006199e5 Have Pm return the correct code
If the command fails, have Pm return a nonzero exit code.

Bug: 18085950
Change-Id: I3de1b8f69aa8f44b2e2109864c1aa093e3b82141
2014-10-31 12:45:25 -07:00
Daniel Sandler
795893eb6f More flexible intent extra parsing.
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
2014-10-29 00:05:56 -04:00
Bill Yi
5a71f83227 Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
2014-10-22 09:00:49 -07:00
Elliott Hughes
1bb42f06e2 am 09a7d324: am 388dbd28: Merge "Include <time.h> for clock_nanosleep."
* commit '09a7d324ef15dab7f7bea72aa16b1585285cadf1':
  Include <time.h> for clock_nanosleep.
2014-10-21 17:59:04 +00:00
Elliott Hughes
388dbd28ac Merge "Include <time.h> for clock_nanosleep." 2014-10-21 17:49:03 +00:00
Elliott Hughes
bb94f3107e Include <time.h> for clock_nanosleep.
Change-Id: If3098fa03003bce5d06d60e9129c10cce3c850bb
2014-10-21 10:41:33 -07:00
Dmitriy Ivanov
13078e15f3 am 9be7db6e: am 952dd924: Merge "Switch to libsigchain.a"
* commit '9be7db6e3bc374efd9dcff744deab92148e20dbd':
  Switch to libsigchain.a
2014-10-21 03:30:10 +00:00
Dmitriy Ivanov
a0d07d49b8 am 9be7db6e: am 952dd924: Merge "Switch to libsigchain.a"
* commit '9be7db6e3bc374efd9dcff744deab92148e20dbd':
  Switch to libsigchain.a
2014-10-21 03:29:46 +00:00
Dmitriy Ivanov
5ba317cee0 Switch to libsigchain.a
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
 to export symbols from the static library.

Change-Id: I465806dcffc777a682523f74ae6f7ab61aaa6962
2014-10-20 14:14:39 -07:00
Dmitriy Ivanov
07268ce3d9 Link sigchain to main executable
Also export necessary symbols to preempt calls from
 libart.so

Bug: 15345057
Bug: 15426766

(cherry picked from commit 96e0cfa721925550b1cc39cdfd6084a878e6ffe2)

Change-Id: I0930d96edde7dc0636e8d50d7c778f099237f748
2014-10-16 11:43:49 -07:00
Dmitriy Ivanov
7f05e9118b am d1e735ef: am ed583f5e: Merge "Link sigchain to main executable"
* commit 'd1e735ef547c1720aa5bb56a446afbb7a8652599':
  Link sigchain to main executable
2014-10-14 18:21:49 +00:00
Dmitriy Ivanov
26d75a9e00 am d1e735ef: am ed583f5e: Merge "Link sigchain to main executable"
* commit 'd1e735ef547c1720aa5bb56a446afbb7a8652599':
  Link sigchain to main executable
2014-10-14 18:21:31 +00:00
Dianne Hackborn
5457d5ccb6 am 8f6928f1: am e61e68d0: am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev
* commit '8f6928f1399620ce432b82d046912e2030d6511c':
  Improve some docs, fix some debugging.
2014-10-10 21:06:48 +00:00
Dianne Hackborn
4ee6658e19 am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev
* commit '7ea69880bdbf2c51140460dcfd063dc015c3ce26':
  Improve some docs, fix some debugging.
2014-10-10 14:34:41 +00:00
Mike Lockwood
253ad526c1 am 500913ee: am cf1e5c39: am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev
* commit '500913ee002eb8a6a418732f3a6d7549ac046eaf':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
2014-10-10 04:26:55 +00:00
Dianne Hackborn
ab4a81b3c6 Improve some docs, fix some debugging.
- 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
2014-10-09 18:21:59 -07:00
Dmitriy Ivanov
96e0cfa721 Link sigchain to main executable
Also export necessary symbols to preempt calls from
 libart.so

Bug: 15345057
Bug: 15426766
Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
2014-10-09 15:03:07 -07:00
Mike Lockwood
22466960ee am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev
* commit '3910f53c5ebccbe64ab768591dc7c377f1eb0153':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
2014-10-08 22:49:14 +00:00
Mike Lockwood
28138587ef bootanimation: Tweak parameters for pcm_open for playing boot sounds.
Set start_threshold and avail_min to 1/4th period size and stop_threshold to INT_MAX

Change-Id: I0a3aac18533709daa86a024cdd6a32086410723a
2014-10-07 14:47:26 -07:00
Mike Lockwood
73c35e27d3 am 66c009eb: am bb68c263: am 3df6b76c: am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '66c009ebfe5b31aa1f176d4856d95f5daad6079d':
  Add support for playing audio during bootanimation
2014-10-07 00:13:18 +00:00
Mike Lockwood
e4e5780420 am 56b7d562: Merge "Add support for playing audio during bootanimation" into lmp-dev
* commit '56b7d562af4dd0e7bd04163fe9a86a801fcff1fe':
  Add support for playing audio during bootanimation
2014-10-06 22:34:27 +00:00
Mike Lockwood
ebf9a0d8a8 Add support for playing audio during bootanimation
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
2014-10-03 15:38:15 -07:00
Alexandra Gherghina
58499d61f8 am 8292b033: am a266670a: am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev
* commit '8292b0331e21af8786791067e92009e949448f3f':
  Adds the ability to start a user in background
2014-10-01 17:09:34 +00:00
Alexandra Gherghina
671d26e909 am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev
* commit '75c33d9d04d8c0a9884a70077681261b57c7833c':
  Adds the ability to start a user in background
2014-09-30 17:04:00 +00:00
Alexandra Gherghina
979e40e9ba Adds the ability to start a user in background
Bug: 15900074
Change-Id: I03b278f8e7a4618ea56a5f1935cfba34beb45981
2014-09-29 12:35:03 +00:00
Jesse Hall
66474027c2 am f295b675: am 9a2eafc1: am 12297705: am 7fa90f6a: Merge "bootanimation: allow animation to specify background color" into lmp-dev
* commit 'f295b675239892c8637d3ad48777226314be2de1':
  bootanimation: allow animation to specify background color
2014-09-26 05:04:11 +00:00
Jesse Hall
9b80323a7a am 7fa90f6a: Merge "bootanimation: allow animation to specify background color" into lmp-dev
* commit '7fa90f6ae5c04d96b3210a45898d1e7a8f5ef8e6':
  bootanimation: allow animation to specify background color
2014-09-26 01:51:01 +00:00
RoboErik
00bbe915de am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '5e8f023dc17788a18bc5640a42baaf2bec609745':
  Allow null queues to be set in MediaSession
2014-09-26 00:23:43 +00:00
Jesse Hall
083b84cf88 bootanimation: allow animation to specify background color
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
2014-09-25 23:37:12 +00:00
RoboErik
96900279f5 am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '23df1c46b768bb2a1363b6f671b0d0c4879538b7':
  Allow null queues to be set in MediaSession
2014-09-25 18:46:09 +00:00
RoboErik
03fce072ca Allow null queues to be set in MediaSession
Also add some test code for it to OneMedia.

bug:17593962
Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
2014-09-24 14:35:32 -07:00
Marco Nelissen
dfc44eab3e am c840e31d: am fa436298: Merge "Broadcast an intent to mediascanner after executing screencap"
* commit 'c840e31d0ee772373b1be7469b7bfbe28715d52e':
  Broadcast an intent to mediascanner after executing screencap
2014-09-22 14:57:14 +00:00
Marco Nelissen
f8820f3f53 am c840e31d: am fa436298: Merge "Broadcast an intent to mediascanner after executing screencap"
* commit 'c840e31d0ee772373b1be7469b7bfbe28715d52e':
  Broadcast an intent to mediascanner after executing screencap
2014-09-22 14:56:30 +00:00
Marco Nelissen
fa4362982c Merge "Broadcast an intent to mediascanner after executing screencap" 2014-09-22 14:34:03 +00:00
Esteban Talavera
c5bf65aa96 Merge "Make dpm command output more test friendly" into lmp-dev 2014-09-18 18:15:49 +00:00
Esteban Talavera
c48bca50fa Make dpm command output more test friendly
Added 'Success' at the beginning of the command output every time
it didn't fail, so that we can easily check the output in tests.
The command is brand new, only used by us on CTS tests, so this
shouldn't break anybody.

Bug: 17312478
Change-Id: Ie67bf5b2f44e658e7009e5bd87f8cb81be515584
2014-09-18 18:32:45 +01:00
Dianne Hackborn
88924b62fc Merge "Fix issue #17536024: The am start's wait option doesn't..." into lmp-dev 2014-09-17 23:07:17 +00:00
Dianne Hackborn
6cfbb71890 Fix issue #17536024: The am start's wait option doesn't...
...give time in some cases

This switch to multiple stacks broke the check to determine if it
should actually wait for a new activity to be shown.  The new check
now also requires that the top activity be resumed, which means
we may get some false positives where we decide to wait and shouldn't,
but that is better than consistently not deciding to wait in some
cases when we should.  (And we will always finish waiting then next
time something becomes visible).

Also add another time, which is how long it took from the startActivity
call to return with the result.  And fix when we decide to report that
we are done so that, in the case where we are bringing an existing
activity to the foreground, we don't wait until its animation is complete.

Change-Id: Id38ca0070f04e7bf8c73e131fb055808553a0e2f
2014-09-17 12:47:35 -07:00
Esteban Talavera
41de9bb6fd Add 'adb dpm' subcommand to set profile owner
Required for GTS tests. Needed to relax the restriction that
only root user can run 'pm create-user' as GTS tests can't
get root permissions.

Bug: 17312478
Change-Id: I1841286ddf51756c73018c087a5f29afeb5b9f15
2014-09-16 10:24:58 +01:00