1308 Commits

Author SHA1 Message Date
Yabin Cui
3a10a672f0 am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS."
* commit 'f70492898b3efa3c5f480f195062fa6f293bc764':
  kill HAVE_PTHREADS.
2015-01-27 07:04:55 +00:00
Yabin Cui
1610486d37 kill HAVE_PTHREADS.
Bug: 19083585
Change-Id: Ib466949bb6cd6d1bbc4680e989f0f9fae62ca564
2015-01-26 22:32:38 -08:00
Hui Shu
9bd1382f21 am e5cb6a25: am bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev
* commit 'e5cb6a253afa8faffb85c73779a78c74aead23ae':
  pm path needs to return 0 when it succeeds.
2015-01-05 22:20:28 +00:00
Hui Shu
bb84515211 Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 2015-01-05 22:07:16 +00:00
Narayan Kamath
1cc57aba81 am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"
* commit '1bafd01a3fc5f94e77d1c18e5a7dcdecddcaa47f':
  Fix "pm list permissions" crash if resource string missing
2014-12-29 11:13:22 +00:00
Narayan Kamath
44a5a30a61 Merge "Fix "pm list permissions" crash if resource string missing" 2014-12-29 11:01:28 +00:00
Jeff Hao
093dad2a47 am e06184e4: Merge "Add mips64 support to app_process."
automerge: 51bdc62

* commit '51bdc629f59b45fa64331e3c41ac35147ed4c7f6':
  Add mips64 support to app_process.
2014-12-18 20:58:17 +00:00
Douglas Leung
7e7c603182 Add mips64 support to app_process.
Change-Id: Ieb05a212606f02ebad119a0aea0ed92773ace214
2014-12-17 20:27:25 -08:00
Guang Zhu
9954a44896 am d8ca1208: am 07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev
* commit 'd8ca1208b3ee76e45e45e47d5806c398442a55a3':
  shell based UI Automator source move
2014-12-14 04:04:26 +00:00
Guang Zhu
18b892c723 shell based UI Automator source move
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
2014-12-12 17:31:38 -08:00
Hui Shu
ac3151063e pm path needs to return 0 when it succeeds.
BUG: 18721587
Change-Id: I2136d1933e62a20645517d17c1365d214509de16
2014-12-12 14:06:01 -08:00
Chih-hung Hsieh
d1aa67b8e1 am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
  Adjust format strings to work on both 32-bit and 64-bit builds
2014-12-11 21:02:08 +00:00
Dmitriy Ivanov
cc0c8f23f3 Switch to libsigchain.a
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
2014-12-10 10:27:50 -08:00
Bernhard Rosenkränzer
46c82b4cd2 Adjust format strings to work on both 32-bit and 64-bit builds
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>
2014-12-05 16:14:07 -08:00
Dianne Hackborn
b46e9da64c am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev
* commit 'bedd1744b2afa0ede3ab7ac38a0e4a2111ed53bf':
  Work on issue #18572506: AppOps in-memory state is invalid after...
2014-12-03 20:42:17 +00:00
Dianne Hackborn
7b7c58b384 Work on issue #18572506: AppOps in-memory state is invalid after...
...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
2014-12-03 10:01:14 -08:00
Chih-hung Hsieh
243a42a799 am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"
* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
  Fix class vs. struct mismatch
2014-11-25 19:03:57 +00:00
Jeff Sharkey
bcf57d9d3a am f07a99f9: am 07aca15b: Merge "Better am error when SELinux blocking access." into lmp-mr1-dev
* commit 'f07a99f9b92878e3570fe1715c701bc4c32d2ad9':
  Better am error when SELinux blocking access.
2014-11-25 18:43:43 +00:00
Zoltan Szatmary-Ban
3939d6abf2 am 8e55c4bf: am 604aec95: Merge "Add new subcommand \'set-active-admin\' to the dpm command." into lmp-mr1-dev
* commit '8e55c4bff83af7eea3212bc9ff6a254ac70139fd':
  Add new subcommand 'set-active-admin' to the dpm command.
2014-11-25 15:08:08 +00:00
Bernhard Rosenkränzer
99d61edfda Fix class vs. struct mismatch
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>
2014-11-24 16:18:15 -08:00
Jeff Sharkey
dbea3cd118 Better am error when SELinux blocking access.
Bug: 18479882
Change-Id: I0732e54838c4e04d9d727e7c5fd9d7e7bacbaa1f
2014-11-24 14:51:34 -08:00
Zoltan Szatmary-Ban
604aec9574 Merge "Add new subcommand 'set-active-admin' to the dpm command." into lmp-mr1-dev 2014-11-24 12:08:20 +00:00
Dianne Hackborn
676b1d886c am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev
automerge: c43613b

* commit 'c43613becf0146a0d54ff15f5ca024d759c43290':
  Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
2014-11-21 03:01:09 +00:00
Dianne Hackborn
24b1c23c62 Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
You now need to set a flag if you want this unsafe behavior.

Change-Id: I185e9a04e005e42a887c3d58a2818616790b060a
2014-11-20 17:17:39 -08:00
Dianne Hackborn
377d6f00dc am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev
* commit '42fec57f3addfb1958f814b5d6772ff81341ba20':
  Fix issue with call backs from media process.
2014-11-21 00:43:51 +00:00
Chih-hung Hsieh
cd24a6d70b am 43b8643e: am f926d71b: Merge "Fix format strings mismatching the parameters passed to them"
* commit '43b8643e86d7c5d0d5cf536336126232454f361a':
  Fix format strings mismatching the parameters passed to them
2014-11-20 23:57:35 +00:00
Bernhard Rosenkränzer
09993f768b Fix format strings mismatching the parameters passed to them
Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-20 15:24:46 -08:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
2014-11-20 23:00:56 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t.
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
2014-11-20 11:47:40 -08:00
Dianne Hackborn
ff17024e58 Fix issue with call backs from media process.
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
2014-11-19 14:29:10 -08:00
Zoltan Szatmary-Ban
e9119876a2 Add new subcommand 'set-active-admin' to the dpm command.
Bug: 18002490
Change-Id: I91746032df08ef0fdef05711114691da18796a0a
2014-11-19 13:47:11 +00:00
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