1594 Commits

Author SHA1 Message Date
Sebastien Hertz
9a010d0a41 Merge "Allow debugging only for apps forked from zygote" into mnc-dev 2015-08-18 07:41:50 +00:00
Wale Ogunwale
fc0ac9bdcb Added am commands for testing task positioning/resizing
Change-Id: Id506ea740029fd6faee4fc311a97c034c883a3fc
2015-08-14 15:47:53 -07:00
Chris Tate
848dd4bfc9 am 14e12258: am 13845aea: am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '14e122582c45e236bf2e4c59d10438816f2eed09':
  Make "Ask every time" actually work that way
2015-08-14 17:44:39 +00:00
Chris Tate
14e122582c am 13845aea: am b2d4c550: am b47890c4: am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '13845aeae3fc3044f3fc279ca421df6d4f78ee35':
  Make "Ask every time" actually work that way
2015-08-14 17:35:28 +00:00
Chris Tate
d7a164bf3f am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
  Make "Ask every time" actually work that way
2015-08-14 17:15:18 +00:00
Christopher Tate
56f0ff3c48 Make "Ask every time" actually work that way
..in link-opening behavior.  If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.

Bug 23147746

Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
2015-08-13 18:56:05 -07:00
Sebastien Hertz
7a09b8322c Allow debugging only for apps forked from zygote
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463
Change-Id: If8ea719063a65db4cdeed69a838b52e87b078b08
2015-08-10 20:39:13 +02:00
Xiaohui Chen
b52c7330d9 Clean up USER_OWNER reference in cmds.
Again, the easy ones.

Bug: 19913735
Change-Id: Ib9519cb8309b332258b20dee54a38007eaba3b1d
2015-08-06 14:05:35 -07:00
Xiaohui Chen
2ccf49e7f4 Clean up USER_OWNER references in am/pm commands.
Bug: 19913735
Change-Id: I9cd27dc037048f4e5e312c769fc59669a4abf3e3
2015-08-04 15:28:29 -07:00
Yusuke Sato
22350a8c2c am 82e78074: am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit '82e780743046e620b724c28023b580e0e624bb15':
  Distinguish user-requested shutdown from power-related ones
2015-08-03 18:14:37 +00:00
Yusuke Sato
82e7807430 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
2015-08-03 17:56:37 +00:00
Wale Ogunwale
ddc1cb2c15 Added support for static vs. dynamic stacks
Now that stacks represent workspaces we can define static
stacks which help shape the characteristics of the tasks
they contain. For example, fullscreen tasks/activities will
normally be launched in the stack with id
FULLSCREEN_WORKSPACE_STACK_ID, while freeform tasks/activities
will normally be launched in the stack with id
FREEFORM_WORKSPACE_STACK_ID.

Also, added ability to position a task at any index in a stack.

Bug: 22068114
Change-Id: Ib6c62a84b5f204fbf072755264c5c5eda6184f97
2015-08-01 10:50:18 -07:00
Yusuke Sato
c2369c5301 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
2015-07-31 23:34:06 +00:00
Yusuke Sato
705ffd1efe Distinguish user-requested shutdown from power-related ones
With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.

When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.

This is a follow-up CL for http://r.android.com/158525.

Bug: 21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3
2015-07-30 23:47:13 -07:00
Roshan Pius
d1501fd046 am 231efff5: am bc25174b: am 51a193a3: am 5d573ed8: am 944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev
* commit '231efff579bac18bc8073558f97add44a2215842':
  Add a command to register SIM Phone account.
2015-07-29 22:04:07 +00:00
Roshan Pius
231efff579 am bc25174b: am 51a193a3: am 5d573ed8: am 944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev
* commit 'bc25174bd1ce3191ff05e29298e60d79a1a53518':
  Add a command to register SIM Phone account.
2015-07-29 20:04:36 +00:00
Roshan Pius
d26bc1c0b4 am 944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev
* commit '944b63624b40c96f4a31af750e1678c0b9c88ad1':
  Add a command to register SIM Phone account.
2015-07-29 19:16:16 +00:00
Roshan Pius
d3586e174f Add a command to register SIM Phone account.
Phone accounts with SIM_SUBSCRIPTION capabiltiy needs system permission.
Hence adding a command to add sunc phone accounts for CTS testing of
remote connections.

BUG: 20303674
Change-Id: Ieb7349f906ec8209776ffbe39ed3633f01ba1e7c
2015-07-28 15:49:42 -07:00
John Reck
66a3675013 am 0e5a5161: am d79117c4: am 9ba771bb: am c2db381e: am 6b66a4a8: use findProcess instead of getProcess
* commit '0e5a5161e6999a58a86acd404ee1a229e180647d':
  use findProcess instead of getProcess
2015-07-24 05:16:55 +00:00
Tim Kilbourn
f9327433a5 am 4d2c2583: am a714a4a7: am 2f778da1: am 46638832: am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit '4d2c2583df96a85ab409b223686d9b77c64eb2a8':
  Add a wm command to dismiss the keyguard.
2015-07-24 05:15:44 +00:00
Jeff Sharkey
5b98249e67 am 5080e90a: am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit '5080e90a62445f3ddf2dcff4adabe2d251d25932':
  More info to support CTS, fix reconcile bug.
2015-07-24 05:10:15 +00:00
John Reck
0e5a5161e6 am d79117c4: am 9ba771bb: am c2db381e: am 6b66a4a8: use findProcess instead of getProcess
* commit 'd79117c405fab2c7a64d7307a941df05a713814d':
  use findProcess instead of getProcess
2015-07-24 04:07:12 +00:00
Tim Kilbourn
4d2c2583df am a714a4a7: am 2f778da1: am 46638832: am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit 'a714a4a77020303c5ab9464781464bd050110525':
  Add a wm command to dismiss the keyguard.
2015-07-24 04:06:09 +00:00
Jeff Sharkey
5080e90a62 am aebcf3b7: am 23fdb635: am e87dc6db: am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit 'aebcf3b7efadca1fb5eedbf2cf9f0895d93ba8e8':
  More info to support CTS, fix reconcile bug.
2015-07-24 04:01:46 +00:00
John Reck
549dfccc35 am 6b66a4a8: use findProcess instead of getProcess
* commit '6b66a4a8a342b8156f73d83771caa1db2f866529':
  use findProcess instead of getProcess
2015-07-24 01:02:41 +00:00
John Reck
6b66a4a8a3 use findProcess instead of getProcess
Bug: 22701182
Change-Id: I2ec56c55c49401f2f213bbd318e867fd73b37672
2015-07-24 00:37:23 +00:00
David Stevens
6323fff7df Merge "Add cmd to reset default component enabled setting" 2015-07-23 23:50:52 +00:00
David Stevens
f6ec60dd1e Add cmd to reset default component enabled setting
Change-Id: Ice5e366643bb5c536b579089dcc98e06c9bb5645
2015-07-23 16:42:29 -07:00
Tim Kilbourn
43250dd37f am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev
* commit 'a2bf7616044051769df86cf5f0bb4b21dedd5269':
  Add a wm command to dismiss the keyguard.
2015-07-23 22:42:49 +00:00
Kenny Guy
273639f7ad am e6b1e0e1: am 72be5067: am af52ae07: am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
* commit 'e6b1e0e1c22d57b8c3f70e780fdc672175780086':
  Support waiting for adb shell am stop-user to complete.
2015-07-23 22:07:18 +00:00
Tim Kilbourn
f40c66d1a1 Add a wm command to dismiss the keyguard.
If the user has a screen lock, the user is prompted to authenticate.
Otherwise the keyguard is dismissed.

Bug: 22694837
Change-Id: I783fc6f08fb21977aa4f1e884b0a4354a3154805
2015-07-23 14:51:41 -07:00
Kenny Guy
e6b1e0e1c2 am 72be5067: am af52ae07: am 2adcb40d: am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
* commit '72be506795c4b7260612458c183282b9c59717ef':
  Support waiting for adb shell am stop-user to complete.
2015-07-23 21:49:30 +00:00
Jeff Sharkey
e5a0e17667 am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit 'f6e9a3ede53ae487838c19714ad62f25a4a6ca4c':
  More info to support CTS, fix reconcile bug.
2015-07-23 18:57:02 +00:00
Kenny Guy
8ea8c98a1f am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
* commit '2ba3fec6e0222754d93ed7a491354164d113ad6e':
  Support waiting for adb shell am stop-user to complete.
2015-07-22 20:18:35 +00:00
Jeff Sharkey
f6e9a3ede5 Merge "More info to support CTS, fix reconcile bug." into mnc-dev 2015-07-22 19:40:44 +00:00
Jeff Sharkey
85ced63268 More info to support CTS, fix reconcile bug.
Surface more details and commands for storage volumes to support
CTS testing.  Fix user reconciliation bug that skipped user setup on
empty volumes.

Bug: 22658804, 22633097
Change-Id: I4221312d1cce24d1f5a2c108095cf3cf471598ed
2015-07-22 11:11:50 -07:00
Kenny Guy
2ba3fec6e0 Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 2015-07-22 13:49:20 +00:00
Christopher Tate
d795d4ffcb am 75fc69ad: am 8f9a223e: am 22fac49a: am 6391a8d4: am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '75fc69addd791738ba6162ecefbba93c5329f502':
  Add 'pm' operation to set a package's app-linking state
2015-07-21 21:43:21 +00:00
Christopher Tate
75fc69addd am 8f9a223e: am 22fac49a: am 6391a8d4: am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '8f9a223e2f9601d579a47c93efcd92772ee0c405':
  Add 'pm' operation to set a package's app-linking state
2015-07-21 20:08:52 +00:00
Christopher Tate
9b76ff8783 am d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit 'd9c2ff99bf9469f155eabf341880d055741e9db5':
  Add 'pm' operation to set a package's app-linking state
2015-07-21 19:28:44 +00:00
Kenny Guy
2c7836befc Support waiting for adb shell am stop-user to complete.
Use stop user callback to wait for AM.stopUser to complete
if -w flag is passed to adb shell am stop-user

bug: 22599411
Change-Id: I8adbfdbb1ba69a88a67431da65f0a85035587c2d
2015-07-21 18:22:28 +01:00
Christopher Tate
387225ff01 Add 'pm' operation to set a package's app-linking state
Set an app's state:

  pm set-app-link [--user USER_ID] PACKAGE {always|ask|never|undefined}

Read an app's current state:

  pm get-app-link [--user USER_ID] PACKAGE

The latter prints to stdout one of the strings usable as an argument to
set-app-link.  If an error is encountered, the string printed to
stderr begins with "Error: ".

Bug 19628527

Change-Id: I68b6dc24445917807345a8cf5baa2078490740af
2015-07-20 17:45:17 -07:00
Ying Wang
0f92a2e72f Using LOCAL_DROIDDOC_STUB_OUT_DIR to specify "-stubs" option.
So that the build system can clean up the stub out dir before
calling doclava.

Bug: 22534021
Change-Id: Iba33cf0a295e4ae32fdcad8bd326c2f52de5f875
2015-07-16 14:20:22 -07:00
Jim Miller
aa1a35ba27 am 2e56339a: am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
* commit '2e56339a4a1133e9aface1c851f1ab67cff72109':
  Improve tracking of screen on reasons.
2015-07-15 22:40:32 +00:00
Jim Miller
2e56339a4a am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
* commit 'bcedcde8093b48c3d013cc57dde42bdd17d6dcb9':
  Improve tracking of screen on reasons.
2015-07-15 22:26:05 +00:00
Dianne Hackborn
e632586957 am 1d4247c4: Merge "Improve tracking of screen on reasons." into mnc-dev
* commit '1d4247c4cc89c6d62e44ed3115f26579979b44b5':
  Improve tracking of screen on reasons.
2015-07-15 17:25:01 +00:00
Dianne Hackborn
280a64e793 Improve tracking of screen on reasons.
- New screen on app op to record the last time each app has
  caused the screen to be turned on.
- New battery stats event that tells us the reason the screen
  has been asked to turn on.
- Propagate out power manager API to specify the reason a caller
  is asking to have the screen turned on.

Note that currently the window flag to turn the screen on bypasses
much of this because it is being handled in the window manager by
just directly telling the power manager to turn the screen on.  To
make this better we need a new API where it can specify who it is
calling the API for.

Change-Id: I667e56cb1f80508d054da004db667efbcc22e971
2015-07-15 09:59:07 -07:00
Fyodor Kupolov
b5143ecfee am 1fa2a088: am 1281575c: am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '1fa2a0888284ae00c905dce7a3003b995815467a':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:58:48 +00:00
Fyodor Kupolov
1fa2a08882 am 1281575c: am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '1281575c257d52f256f4a08559611e6ec0b6190e':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:42:58 +00:00
Fyodor Kupolov
29e8318cb4 am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '987241265b77542f45ce95838c25beeaf3ae6849':
  Added sendBroadcastMultiplePermissions method
2015-07-15 00:59:47 +00:00