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
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
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
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
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
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
d4fd8c766d
Added sendBroadcastMultiplePermissions method
...
Added Context.sendBroadcastMultiplePermissions(Intent intent, String[]
receiverPermissions) method, which allows an array of required permissions
to be enforced.
Bug: 21852542
Change-Id: I27c9130e8f004b428452501ebc8a36aabde1f343
2015-07-14 17:25:42 -07:00
Jarkko Pöyry
19b4ef6622
Merge "Don't NPE on command line parse failure."
2015-07-10 17:40:32 +00:00
Jeff Sharkey
d9233a0fb3
am 159efe23: am 480f0e73: am 381cf235: am cda18204: am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev
...
* commit '159efe23e652952ada23d81aa2f2e308129dffa3':
Add grant flag support to "install-create" verb.
2015-07-09 18:38:57 +00:00
Jeff Sharkey
159efe23e6
am 480f0e73: am 381cf235: am cda18204: am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev
...
* commit '480f0e734e5b8770b7700e139b6847bfd76b56cf':
Add grant flag support to "install-create" verb.
2015-07-09 17:59:43 +00:00
Jeff Sharkey
396080dd02
Add grant flag support to "install-create" verb.
...
This matches the "install" behavior.
Bug: 22331569
Change-Id: I07bfe067bd4be01fc92126750b0ff25a5c5ba5c9
2015-07-09 09:16:07 -07:00
Seigo Nonaka
d4806ae6fa
am 97db8395: am ec99c3e1: am 3340da0e: am ee83bc75: am 9d3cd848: Merge "Add libhidcommand_jni.so to required module." into mnc-dev
...
* commit '97db8395cd352b6ac89c5091027602eeaba100c0':
Add libhidcommand_jni.so to required module.
2015-07-08 13:07:43 +00:00
Seigo Nonaka
97db8395cd
am ec99c3e1: am 3340da0e: am ee83bc75: am 9d3cd848: Merge "Add libhidcommand_jni.so to required module." into mnc-dev
...
* commit 'ec99c3e11ec26cb08b6ce0bbd5338bbf8320d1f9':
Add libhidcommand_jni.so to required module.
2015-07-08 12:52:58 +00:00
Seigo Nonaka
9d3cd8484e
Merge "Add libhidcommand_jni.so to required module." into mnc-dev
2015-07-08 03:25:33 +00:00
Svetoslav
4e5dac3d6e
am 3fd5ebfd: am 7cc8de60: am 0ce19f8e: am 240f8e5f: am 3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev
...
* commit '3fd5ebfd778e540276fb5205a8ba3185e620647d':
Grant installer and verifier install permissions robustly
2015-07-08 02:05:26 +00:00
Svetoslav
3fd5ebfd77
am 7cc8de60: am 0ce19f8e: am 240f8e5f: am 3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev
...
* commit '7cc8de60682b1ed22be1b452809b36a5ceaae02a':
Grant installer and verifier install permissions robustly
2015-07-08 01:39:40 +00:00
Svetoslav
3e7d977ff7
Grant installer and verifier install permissions robustly
...
bug:22248271
Change-Id: I3a47ae9a112ba7d88b421fcb5f9651d1168ba7a5
2015-07-07 14:02:51 -07:00
Svet Ganov
e8ce8368fc
am 55cd6f44: am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev
...
* commit '55cd6f44fd1e49164a999e948bb91a03a3b9daf6':
Teach receivers, activities, providers, and services app ops.
2015-07-04 07:28:18 +00:00
Jarkko Pöyry
b582c67039
Don't NPE on command line parse failure.
...
Bug: 21202826
Change-Id: I3cbc12eaef920905c8abc6532376827ccff132f4
2015-07-03 19:54:30 -07:00
Seigo Nonaka
edbeacc562
Add libhidcommand_jni.so to required module.
...
To install libhidcommand_jni.so and hid command at the same time,
set libhidcommand_jni as a required module of hid command.
Bug: 22131060
Change-Id: I73ad1954eb73896425362a63fab0e63a61b9c0a0
2015-07-02 17:58:29 +09:00
Svet Ganov
55cd6f44fd
am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev
...
* commit '6fe87a565be345c9455f610bbf26d5eaee593683':
Teach receivers, activities, providers, and services app ops.
2015-07-02 01:02:04 +00:00
Svet Ganov
99b6043dad
Teach receivers, activities, providers, and services app ops.
...
Perform app op check in addition to the permisison check for all four
paltform components - activities, content providers, broadcast receivers,
services - if they are guarded by a permssion that has an associated app
op. This ensures that legacy apps will behave correctly if the permission
of the caller has been revoked, i.e. the app op for that permission was
disabled.
bug:22199666
Change-Id: Ia22d1c38d58b3cd6aabdc655cb7c7bddd85da7a2
2015-07-01 16:20:00 -07:00
Dianne Hackborn
1b96b13026
am fb46261c: am a5de0eb5: am 7c5b5f71: Merge "Fix issue #22023824 : Download folder is not created in internal storage" into mnc-dev
...
* commit 'fb46261c1eb015896d201a0275b41c3ebae11d02':
Fix issue #22023824 : Download folder is not created in internal storage
2015-06-26 21:04:55 +00:00
Dianne Hackborn
fb46261c1e
am a5de0eb5: am 7c5b5f71: Merge "Fix issue #22023824 : Download folder is not created in internal storage" into mnc-dev
...
* commit 'a5de0eb5e5d1ab9f6d2fe9661e5d6dcf60718e73':
Fix issue #22023824 : Download folder is not created in internal storage
2015-06-26 20:50:34 +00:00
Dianne Hackborn
ca8e6da41c
Fix issue #22023824 : Download folder is not created in internal storage
...
The media provider and some other things need to be given storage access.
Also, seems like we should give storage access to the camera app as well.
And add a dump dump command that will dump data about a particular
permission name.
Change-Id: Idaaa9bba2ff4dc95290cf6d17e5df933df91e909
2015-06-26 13:28:29 -07:00
Man Cao
80bea9cde1
resolved conflicts for merge of 8fb82074 to master
...
Change-Id: I27c7ddeead5a589ae8824f87bf6b42998dc081eb
2015-06-24 17:28:01 -07:00
Mathieu Chartier
8fb8207412
resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp
...
Change-Id: I2f79840f82150eddebfbd549afd1eca28075eb43
2015-06-24 15:59:18 -07:00
Adam Lesinski
87344583e1
am 0ebba0e1: am 53d0d065: am b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev
...
* commit '0ebba0e1a66ddf912b9fb7c43727054cb2d63556':
Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
2015-06-24 22:22:02 +00:00
Adam Lesinski
0ebba0e1a6
am 53d0d065: am b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev
...
* commit '53d0d0655ca33fbf6a1475a6b97f1a956e5c25f5':
Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
2015-06-24 22:11:45 +00:00
Adam Lesinski
c30454c104
Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
...
Bug:22055550
Change-Id: I1e732e95698daf44bcb223cafde3d3c22746d232
2015-06-24 13:35:46 -07:00
Man Cao
cfa78b2080
Add an AM option to start with allocation tracking
...
The new option "--track-allocation" is to work with the new
allocation tracker in ART.
Bug:20037135
Change-Id: Ic5f8945ab4c1f167c27b05ad0d11d04bac680c1f
2015-06-24 13:29:29 -07:00