8568 Commits

Author SHA1 Message Date
Tyler Gunn
bdbec480e8 Merge "Add "Call subject" capability to phone accounts." into mnc-dev 2015-07-28 20:07:40 +00:00
Dianne Hackborn
3551a59b27 Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev 2015-07-28 19:52:53 +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
Robert Greenwalt
a36c074052 Un-remove legacy ConnectivityManager API.
These were @removed too soon.  We need to keep them @deprecated until
the bulk of devices support the new API and then we can remove them.

bug:22728205
Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
2015-07-28 11:41:31 -07:00
Selim Cinek
114ef3085e resolved conflicts for merge of f3da5dc7 to master
Change-Id: I2013f1cb6b258b81f7d415a5e0f7daaa4eb7de80
2015-07-27 20:31:16 -07:00
Adrian Roos
7811d9f509 Fix and deprecate lock pattern related settings
Bug: 22557690
Change-Id: Ib4b3ef7cebe815ba9d9d2284f945a9ec746b216c
2015-07-27 19:59:27 -07:00
Tyler Gunn
65a3d3430a Add "Call subject" capability to phone accounts.
Indicates whether the phone account supports displaying a subject line
for incoming calls and sending a subject line for outgoing calls.
Supports the IMS Instant Lettering feature.

Bug: 22769741
Change-Id: I6d803dc288bfd6d4e356310a8d10d5468c5d4186
2015-07-27 16:06:16 -07:00
Selim Cinek
71bfb27013 Merge "Added the content description for the fingerprint icon" into mnc-dev 2015-07-27 20:51:57 +00:00
Selim Cinek
3974e603ac Added the content description for the fingerprint icon
Added a content description for the fingerprint icon,
which should be used throughout the platform.

Bug: 22616421
Change-Id: I8d65a568af926a692fd6be3e27d40b5d2dd6cbb1
2015-07-24 16:25:26 -07:00
Jim Miller
225c8f9913 am 5703cd54: am 72d9a4df: am 56e1be70: am ecfbd588: am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '5703cd5448e0f7efb0a164ca971b6ca0cc117173':
  Add FEATURE_FINGERPRINT to PackageManager's feature list
2015-07-24 05:17:10 +00:00
Svetoslav Ganov
61fe8e0105 am 1298b1a0: am 1ad413c0: am af27474f: am cc3c6dbf: am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev
* commit '1298b1a0a25a19559c81293ac87b31a4ffcbc973':
  Add a privileged permission to get user accounts
2015-07-24 05:11:51 +00:00
Jim Miller
abd35bfc81 Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev 2015-07-24 02:41:00 +00:00
Dianne Hackborn
bf822d39a2 am c9e454a5: am 26b2453c: am d363399b: am 86350411: am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev
* commit 'c9e454a544233b6d4d7ae96d4442505bbad22fcb':
  Work on issue #22303510: Additional permissions aren't properly...
2015-07-23 22:07:41 +00:00
Jorim Jaggi
ffbc117229 am f30c5f56: am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit 'f30c5f56187fed6452d557a44df8b63d8eb130a2':
  Add callback to voice interaction session for lockscreen shown
2015-07-23 22:06:29 +00:00
Tomasz Mikolajewski
a375a99884 Add support for efficient move within a document provider.
Currently moving files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where moving even huge files can be
instant.

This CL adds an optional moveDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
moving things. If not implemented, we would fallback to moving by
streaming.

BUG=None

Change-Id: I74d6754f96cbafa749a04ca9aebf2e0e2b64b515
2015-07-23 16:00:05 +09:00
Tomasz Mikolajewski
74fe1816e8 Add support for efficient copy within a document provider.
Currently copying files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where copying even huge files can be
instant.

This CL adds an optional copyDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
copying things. If not implemented, we would fallback to copying by
streaming.

BUG=None

Change-Id: I8f2b2c0c834717f07d42f8247cd1fc025e82239a
2015-07-23 13:43:49 +09:00
Jim Miller
d9b9d41082 Add FEATURE_FINGERPRINT to PackageManager's feature list
Fixes bug 22674557

Change-Id: I3d78e6bedc3ac18a25a06ac50e3a7eee4161fe70
2015-07-22 19:54:15 -07:00
Svetoslav Ganov
3d6f606031 Merge "Add a privileged permission to get user accounts" into mnc-dev 2015-07-22 21:41:40 +00:00
Dianne Hackborn
b73946715c Merge "Work on issue #22303510: Additional permissions aren't properly..." into mnc-dev 2015-07-22 16:14:59 +00:00
Svet Ganov
2062eeff01 Add a privileged permission to get user accounts
bug:22602794

Change-Id: I6e5429f0eb5f2cb274d4740755070e588735e179
2015-07-21 19:23:21 -07:00
Dianne Hackborn
cfbfafe1b9 Work on issue #22303510: Additional permissions aren't properly...
...disabled after toggling them off

Keep track of whether a permission that has been declared by an app
was able to actually be installed in the system, along with an API
to find this information so that system UI can tell whether that
permission is of interest.

Also clean up some of the permission debug output.

Change-Id: If4541bedb857789b255bb18f03cad155dcda0b95
2015-07-21 17:01:15 -07: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
Dianne Hackborn
b4a3d4df6f am d9c5769e: am 0f8d156e: am 5c97a4ba: am 609cb585: am a7ce2344: Merge "Fix issue #22564918: Request is inactive" into mnc-dev
* commit 'd9c5769e1b0b9fd6044876e5f8af640a16dcd7c3':
  Fix issue #22564918: Request is inactive
2015-07-21 00:15:44 +00:00
Qiwen Zhao
06e260b8db Merge commit '01fda527'
Change-Id: I08b5e7e8576f463c00be12879b465fa9c8cda8f5
2015-07-20 15:52:23 -07:00
Dianne Hackborn
1b4447f728 Fix issue #22564918: Request is inactive
Add Request.isActive() API.  Also improve documentation to tell
people what things cause it to become inactive.  And fix a race
where we were modifying the active list from outside the main
thread without locking it.

Change-Id: I9248e014126cb121612edbe595108ace753456e2
2015-07-20 14:49:58 -07:00
Billy Lau
973bd8850a am 1ab5d397: am 68a2b655: am e4bcf480: am dd0602e8: am 072e04a7: Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
* commit '1ab5d39764f2b8ab238bcb1b570b788e86c8067b':
  Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps
2015-07-20 20:55:11 +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
Billy Lau
072e04a7f1 Merge "Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev 2015-07-20 17:57:30 +00:00
Billy Lau
24b9c8314b Bug: 22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
through AppOps

Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.

Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb
2015-07-20 18:36:39 +01:00
Dan Sandler
0b6fa13530 am 1663c5e9: am 19d6dae4: am cfaf2d54: am 8f895de9: am 86647987: Icon-related Notifications API changes:
* commit '1663c5e91c6565f48af5d869c9aa822e4e3013a9':
  Icon-related Notifications API changes:
2015-07-17 02:12:21 +00:00
Adam Powell
7e4c29e2da am 7e89a40c: am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
* commit '7e89a40c2e6a9adad41724c0db0019e2d48fde03':
  Update ChooserTarget constructor to take ComponentName, Bundle
2015-07-17 01:31:37 +00:00
Dan Sandler
86647987c3 Icon-related Notifications API changes:
- Deprecate Notification.icon and largeIcon.
    setSmallIcon(Icon) and setLargeIcon(Icon) should be used
    instead.
  - Add Icon support to Notification actions; deprecate
    Action.icon and methods/ctors that use int.

Bug: 21310773
Bug: 21271587
Change-Id: Iddac8121e7690e9d7a0360edb488ab77e3e8fb3a
2015-07-17 00:59:20 +00:00
Adam Powell
666d82a6d5 Update ChooserTarget constructor to take ComponentName, Bundle
Simplify ChooserTarget handling by requiring a target component and an
extras bundle instead of a full PendingIntent/IntentSender. This
simplifies the handling of URI grants from sending apps.

Prune ChooserTargets that point at ComponentNames that don't share a
package with the original matching Activity target or that aren't
exported so that we don't show the user something they can't launch.

Bug 22516282

Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e
2015-07-16 16:29:59 -07:00
Dianne Hackborn
0bc31f6d73 am b876fb5a: am d649b575: am f9aa4b4d: am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev
* commit 'b876fb5aef80cb9cf4143c32a473afaa0b6f885e':
  Implement issue #22403908: Enable assistant to refuse context sharing
2015-07-16 00:40:29 +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
Billy Lau
4c8d312606 am e385d26f: am cb2a7a2c: am 0be2efb2: am f028ba3d: am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit 'e385d26fef2f62988c082ee8066f5d6715aa16c9':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-14 16:50:20 +00:00
Carlos Valdivia
4eafb7a0d2 am 50cf5e3a: am 1aefc776: am 4e976dd1: am cc3c93d3: am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev
* commit '50cf5e3a2bd544f4661660756ffc4c67d5afbb21':
  Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
2015-07-14 16:49:09 +00:00
Billy Lau
96d00ab359 Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 2015-07-12 22:02:37 +00:00
Billy Lau
22b3f4cb15 Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Raised the protection level of WRITE_SETTINGS permission to appop and also
allowed backwards compatibility with pre23 flag. Also made sure that this
permission is not added as RuntimePermission in DefaultPermissionGrantPolicy as
that breaks a lot of gmscore stuff.

Introduced new action to manage write system settings as a new API and
renamed the string that describes the managing of overlay permission.

Change-Id: Ifd25a6ddc06de68ee37015cb9fb23452e4ef10f4
2015-07-12 22:41:00 +01:00
Carlos Valdivia
a3db8acf3d Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""
Fixes api stuff.

This reverts commit f2d248db8078e716b809e0a17cacdea5c5609bd5.

Change-Id: I75c05a17ebde4f245e1f3e0cc22e622d06534c4b
2015-07-10 14:47:07 -07:00
Paul Jensen
a6d97a575f am 851bcaf2: am ca36baaf: am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
* commit '851bcaf2edc88d3d193304d64415a50613f46141':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
2015-07-10 15:57:45 +00:00
Paul Jensen
00c64f7ca5 Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 2015-07-10 14:57:13 +00:00
Bart Sears
f65166af52 am 1893e12f: am 19dd9c9c: am 6d583ad9: am 1773f2df: am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev
* commit '1893e12f9cdc9d1caa54e773241803f9e5777c30':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
2015-07-10 04:15:23 +00:00
Eino-Ville Talvala
e9f09e4f3d am 440cfa88: am 9bc8438e: am 9dbe6b1f: am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
* commit '440cfa88769641d12566918df4901d5a6c8c193e':
  Camera2: Reorganize high-speed recording API slightly
2015-07-10 04:15:16 +00:00
Bart Sears
1aa4049286 Merge "Revert "Security: AccountChooser shouldn't auto reveal accounts."" into mnc-dev 2015-07-10 03:15:57 +00:00
Eino-Ville Talvala
a2cd9c56f8 Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 2015-07-10 03:14:35 +00:00
Baligh Uddin
f2d248db80 Revert "Security: AccountChooser shouldn't auto reveal accounts."
This reverts commit c3b3f46d5fcbd89deeb557556e5a695c3e5349a1.

Change-Id: I6d156e1ad82c052606f76644fe6085f14e82a734
2015-07-10 03:01:47 +00:00
Carlos Valdivia
3380518c66 am fa644238: am 5338a34b: am ce31576d: am be8c3eb1: am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev
* commit 'fa6442389765f1a53382d050722e3b92ad4a6b55':
  Security: AccountChooser shouldn't auto reveal accounts.
2015-07-10 02:39:04 +00:00