3208 Commits

Author SHA1 Message Date
Chad Brubaker
8c35820720 Merge "Add initial network security config implementation" 2015-11-05 18:46:24 +00:00
Chad Brubaker
6bc1e3966c Add initial network security config implementation
Initial implementation of a unified application wide static
network security configuration.

This currently encompases:
* Trust decisions such as what trust anchors to use as well as static
  certificate pinning.
* Policy on what to do with cleartext traffic.

In order to prevent issues due to interplay of various components in an
application and their potentially different security requirements
configuration can be specified at a per-domain granularity in addition
to application wide defaults.

This change contains the internal data structures and trust management
code, hooking these up in application startup will come in a future
commit.

Change-Id: I53ce5ba510a4221d58839e61713262a8f4c6699c
2015-11-04 14:31:18 -08:00
Jorim Jaggi
c594e9354a am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
  Deliver camera launch source for analytics
2015-09-25 18:07:52 +00:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
2015-09-24 16:32:09 -07:00
Dianne Hackborn
564e87a36f am 1058bf0f: am e2fd2850: am 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev
* commit '1058bf0f998ad07c94ac0ba6ee22c3c484cc7821':
  Fix issue #22940169: "pm grant" can no longer grant permissions...
2015-08-14 17:35:22 +00:00
Dianne Hackborn
3ffc0f1e81 am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev
* commit '81f3a85aa29d83ed1a5de4de1006587d375a1c77':
  Fix issue #22940169: "pm grant" can no longer grant permissions...
2015-08-14 17:15:10 +00:00
Dianne Hackborn
9f5b0a2735 Fix issue #22940169: "pm grant" can no longer grant permissions...
...with protection flag PROTECTION_FLAG_DEVELOPMENT

Bring back the old grant/revoke code for development permissions.

Also some more dumpsys output to help debugging.

And new dumpsys command for checking a permission.

Change-Id: I6e27e62a9ca5ec1ecc0f102714a448ea02f0f41c
2015-08-13 18:25:20 -07:00
Dianne Hackborn
b44cdfdd10 am afacdbe1: am 09e77852: am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
* commit 'afacdbe1e824845917d038a5848ae515d44393bb':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
2015-08-11 00:42:58 +00:00
Dianne Hackborn
919e7cad27 am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
* commit 'b2b020922fb51b88d34a6478209fc232702de318':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
2015-08-11 00:22:58 +00:00
Dianne Hackborn
c7b57b1e65 Fix issue #23037899: Support for Battery Optimization permission + Dialog
New permission, new Intent action.

Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
2015-08-10 14:52:52 -07:00
Dianne Hackborn
6835ef095a am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit 'd9b0f8435ba9b099512288729af24858a95fd013':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
2015-08-04 03:10:41 +00:00
Dianne Hackborn
d4b8064e42 am 14bafef5: am 24922798: am b20a8ed9: am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '14bafef5b050f14c0fed3bfed8b137862139e627':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
2015-08-04 01:37:57 +00:00
Dianne Hackborn
fb81d09d35 Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
Add new Activity.isVoiceInteractionRoot() API that an activity can use
to determine whether it is the root activity of a voice interaction
session started by the user's designated voice interaction service.

This is a special new API that apps must explicitly check, because as
with visual activities the model behind an activity should usually be
that it accomplishes its task by interacting with the user (implicitly
getting their approval) rather than trusting that whoever invoked it
is telling it to do what the user once.  In the voice world, however,
there are some cases where quick interactions want to allow for immediate
execution without further user involvement, so this API allows for that
without opening up security holes from other applications.

Change-Id: Ie02d2458f16cb0b12af825641bcf8beaf086931b
2015-08-03 17:33:38 -07:00
Dianne Hackborn
2b38a45bf3 am 44ffe9cb: am cba2c596: am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
* commit '44ffe9cb33b0ec51d411b7413d222ab251777529':
  Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
2015-08-01 17:05:39 +00:00
Dianne Hackborn
e3047ddcce am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev
* commit 'fb68b0ad344edbba15b961dc444cb24dcfc29995':
  Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
2015-07-31 22:36:46 +00:00
Dianne Hackborn
afb308d651 Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
Change-Id: I928882d42d0546cc6a12e803d96131beaba76d4e
2015-07-31 13:10:55 -07:00
Dianne Hackborn
0091e2c03d am 639fd0e9: am 025a5dc6: am 108f5493: am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '639fd0e9d8ecb59f8d15b3f1e5ec7a6ae6cc3161':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
2015-07-28 21:03:15 +00:00
Dianne Hackborn
8b679bfa36 am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev
* commit '3551a59b277fd4dc924f48116c153a50fb0913eb':
  Work on issue #21516866: Implement voice interaction in ResolverActivity
2015-07-28 19:58:52 +00:00
Dianne Hackborn
57dd737443 Work on issue #21516866: Implement voice interaction in ResolverActivity
The main change here is to not allow the dialog to go in to its "focus
on the last app the user selected" when running in voice interaction mode,
instead just always giving a simple list.

This also fixes some problems with cleaning up active commands when
an activity finishes and not forcing the current session to go away
when the screen is turned off.

Also added some debug help, having activity print the state of the
voice interactor.

Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5
2015-07-28 12:52:11 -07:00
Jorim Jaggi
f30c5f5618 am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
  Add callback to voice interaction session for lockscreen shown
2015-07-23 21:48:48 +00:00
Jorim Jaggi
3bda57a05f am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '20df62345910ad390a3bb321990987757db0831d':
  Add callback to voice interaction session for lockscreen shown
2015-07-22 20:17:14 +00:00
Jorim Jaggi
20df623459 Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 2015-07-21 22:46:30 +00:00
Jorim Jaggi
19695d9711 Add callback to voice interaction session for lockscreen shown
Bug: 22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
2015-07-21 12:35:16 -07:00
Jorim Jaggi
b3d17db144 am 997ebda4: am 4cb9ccc7: am c0469f99: am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
* commit '997ebda43513dbb6da7ddeb54d3eb2a972ed2e1f':
  Test app to emit all AccessibilityEvents to logcat.
2015-07-21 00:37:38 +00:00
Jorim Jaggi
1bc4330209 am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
* commit '55786e1164d522d878d1f493c30330669b1fd868':
  Test app to emit all AccessibilityEvents to logcat.
2015-07-20 23:57:15 +00:00
Jorim Jaggi
55786e1164 Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev 2015-07-20 23:43:51 +00:00
Dianne Hackborn
01fda52778 am ed3b4253: am 5cdc7f04: am 3aefa438: am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev
* commit 'ed3b42539a4d883533177d008c7ffb2a58e50af6':
  Fix issue #22531747: Assist info should declare if user has disabled...
2015-07-20 20:42:32 +00:00
Dianne Hackborn
86e56bb371 am 78ead58d: Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev
* commit '78ead58df03e476d656c7e875fff9ade13b727c1':
  Fix issue #22531747: Assist info should declare if user has disabled...
2015-07-20 20:04:26 +00:00
Dianne Hackborn
78ead58df0 Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev 2015-07-20 19:50:50 +00:00
Dianne Hackborn
17f693520d Fix issue #22531747: Assist info should declare if user has disabled...
...context and/or screenshot

Added new API to find out what contextual data has been globally disabled.

Also updated various documentation to make it clear what kind of contextual
data you will get (and when it will be null).

Also added a new Activity.showAssist() API because...  well, I was already
in there, it was easy to do, it is safe, and maybe people will build cool
things with it.

Change-Id: Ia553d6bcdd098dc0fce4b9237fbfaca9652fc74b
2015-07-20 12:49:10 -07:00
ztenghui
8054c55bc6 am b00f3e4f: am fcec0638: am 8b455841: am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
* commit 'b00f3e4ff96fd31d46a1aa78bc20fefda4d5e305':
  Scaling (Animated)VectorDrawable inside ImageView
2015-07-17 21:15:57 +00:00
ztenghui
268eb72c93 am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
* commit '094c82ada3799045588790252a64806b9930f8c2':
  Scaling (Animated)VectorDrawable inside ImageView
2015-07-17 20:32:26 +00:00
ztenghui
35289f12d6 Scaling (Animated)VectorDrawable inside ImageView
Before, the VectorDrawable is behaving like BitmapDrawable inside a ImageView,
and it can be blurry due to scaling.
Now apply the scaling information to the cached bitmap, then the size of bitmap
will match the ImageView's screen size. Therefore, no blurry any more.

b/18185626

Change-Id: I979cef3b5178a9bd37ee6cc776df3361ca47c803
2015-07-17 11:16:41 -07:00
Dianne Hackborn
b876fb5aef am d649b575: am f9aa4b4d: am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev
* commit 'd649b5751c9b7f592efb3653cfee39aeda45677b':
  Implement issue #22403908: Enable assistant to refuse context sharing
2015-07-16 00:24:41 +00:00
Dianne Hackborn
335d1f7273 am 6af63384: am e12c549b: am 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev
* commit '6af6338419a3c5717400df2a133d0436d2aa4ea5':
  Fix issue #22124996: VI: Command Request not Active
2015-07-16 00:24:15 +00:00
Dianne Hackborn
e13f9e41fe am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev
* commit 'f6586cbde7d4612963eb2e8a2413235630676b83':
  Implement issue #22403908: Enable assistant to refuse context sharing
2015-07-15 23:39:05 +00:00
Dianne Hackborn
190b8470fc am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev
* commit '1cf8b0b6bfbbf867512fcd7bbb4763692821ed36':
  Fix issue #22124996: VI: Command Request not Active
2015-07-15 23:38:39 +00:00
Dianne Hackborn
f6586cbde7 Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 2015-07-15 23:31:25 +00:00
Dianne Hackborn
1de1186d28 Implement issue #22403908: Enable assistant to refuse context sharing
New APIs allow the voice interaction service to set/retrieve a filter
for which of the show flags are allowed.

Change-Id: I588cbe55afee0548ad3afa22d3a7d3bc43cb54a6
2015-07-15 14:20:51 -07:00
Dianne Hackborn
d0a159025a Fix issue #22124996: VI: Command Request not Active
This stupid thing wasn't even completely implemented
in HandlerCaller!  D'oh!

Change-Id: I0dac42c208fa0f08a6e20a6cb17b072f51efcaa7
2015-07-15 11:18:09 -07:00
Dianne Hackborn
88936b7f82 am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit 'a719be69b1e0c8c6723457a51673f5dab8f9f819':
  Implement better handling of text in assist.
2015-07-08 01:39:53 +00:00
Dianne Hackborn
15f858aada am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit 'f2474d336a7df696f3897e2cd255d138eb3fac02':
  Implement better handling of text in assist.
2015-07-07 23:57:53 +00:00
Dianne Hackborn
6f0fdc4167 Implement better handling of text in assist.
TextView is now much smarter about the text it reports, limiting it
to what is visible (plus a bit more).  Also add a facility for it to
report where the lines of text are, both as offsets in the text string
and their baselines on screen.

Part of fixing issue #22328792: Fix scalability issues in AssistStructure

Change-Id: Idddb8c3a3331355f381e2d4af06d520fe7c7ce8e
2015-07-07 16:47:37 -07:00
Dan Sandler
998e32db1f Test app to emit all AccessibilityEvents to logcat.
Additionally allows you to pop toasts for ones you're
particularly interested in.

Bug: 18778078
Change-Id: I2dc81109554cc13853a04e486b029ae4b8e085c9
2015-07-07 15:52:58 +00:00
Narayan Kamath
bef809c4ba am 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework."
* commit '4da086ee7f4eba64265b28cdc5df9f690d97a7ac':
  Delete unused testing scripts and WithFramework.
2015-07-04 02:57:58 +00:00
Narayan Kamath
c21dab9dcb Delete unused testing scripts and WithFramework.
These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.

If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java

This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.

bug: 22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
2015-07-02 11:41:52 +01:00
Dianne Hackborn
de15edaa9b Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW...
...to an explicit toggle to enable in Settings

Add a new permission flag, saying the permission can be automatically
granted to pre-api-23 apps.  Apply this to SYSTEM_ALERT_WINDOW.

Change-Id: I24a0ceabe7e9f5e458a864d30eda2696ad14a699
2015-07-01 12:37:00 -07:00
Dianne Hackborn
593334ab70 Fix issue #22124996: VI: Command Request not Active
Just forgot to add the request to the active set.

Also eradicate a bunch of old cruft that has been replaced
by the final APIs, and improve voice interaction test to
sit fully on top of the final APIs and have a test for
command request.

Change-Id: Ieff7a6165ebf2a4c5fb80c1ebd020511a2ae63ee
2015-06-30 16:59:41 -07:00
Dianne Hackborn
70d8be7616 Fix issue #22013372: Assist should take translationX and friends...
...into account when calculating the position information

Actually what we need here is the full transformation matrix, if it
is available.  And that means actually computing the location of
views on the screen requires doing this all through transformations,
so the AssistVisualizer has been changed to do this (while still
also keeping the old mechanism for comparison to verify that things
are working correctly).

Also added new properties for elevation and alpha.

And optimized the parcelling of AssistStructure to not write things
that aren't needed; this reduces the parcelled size by about half.

Change-Id: I50b0dd2e6599c74701a5d188617a3eff64b07d03
2015-06-25 20:24:34 -07:00
Selim Gurun
cb247780d3 Merge "Remove Webviewtests in frameworks" into mnc-dev 2015-06-25 17:54:01 +00:00