11461 Commits

Author SHA1 Message Date
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
Svet Ganov
5a9a85d3d2 am 0bdfb97a: am 88c3918d: am 3ceb043f: am b7cf986e: am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev
* commit '0bdfb97a0acb8b40c78b1f40151b334d5401a2d1':
  Add an API for apps to query if a permisison is denied by policy.
2015-07-10 02:38:11 +00:00
Carlos Valdivia
319883c80e Merge "Security: AccountChooser shouldn't auto reveal accounts." into mnc-dev 2015-07-10 01:25:36 +00:00
Carlos Valdivia
c3b3f46d5f Security: AccountChooser shouldn't auto reveal accounts.
Bug: 9739125
Change-Id: Ib9032271def423aaafdab2505afaf6b1d3fcad06
2015-07-09 18:18:22 -07:00
Eino-Ville Talvala
639fffee62 Camera2: Reorganize high-speed recording API slightly
- Split off distinct high speed capture session class from base capture session
- Move createHighSpeedRequestList to CameraConstrainedHighSpeedCaptureSession

Bug: 21664295
Change-Id: I67d705fdeee1eaa6e5e3e1416771d5d0df642843
2015-07-10 00:56:18 +00:00
Svet Ganov
171fe6ac0a Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev 2015-07-10 00:32:12 +00:00
Dianne Hackborn
b6fbe91a02 am 782e31df: am 2dc2cdc0: am 1dfeb0b2: am d0e005de: am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev
* commit '782e31dfcc448eaaab814fd76f42c3390a952037':
  Fix issue #22328792: Fix scalability issues in AssistStructure
2015-07-09 23:29:51 +00:00
Dianne Hackborn
782d498268 Fix issue #22328792: Fix scalability issues in AssistStructure
We can now stream the AssistStructure across processes, avoiding
IPC size limitations for large structures.  There is also a new
API that gets called on the VoiceInteractionSession if there is
a failure retrieving the assist data.

Also fix issue #22351981: Runtime restart due to ANR in system server,
getting rid of a deadlock.

And also tweak object lifecycles to try to avoid keeping around
in an app the previous AssistStructure after we request a new one.

Change-Id: Ifb136a0d31a14e56a8db6b90768d9fc65557a17f
2015-07-09 14:06:47 -07:00
Paul Jensen
49e3edff51 Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
This new class replaces the awkward string token and ConnectivityManager APIs
used by apps handling captive portals.

Bug:21343774
Change-Id: I1a2c69edb17322715bf8422bb4216b0ea60bfd59
2015-07-09 10:47:34 -04:00
Jim Miller
39c154a3d2 am 4b3bd02a: am 45ff18ee: am b76bbf1b: am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit '4b3bd02a14332954b52588a3fbf72142982a0658':
  Remove "final" qualifier from AuthenticationResult
2015-07-09 04:29:58 +00:00
Jim Miller
748bc36f2e Remove "final" qualifier from AuthenticationResult
This allows mock implementations to be created for testing
purposes.

Fixes bug 22362080

Change-Id: I5ff002c077d22b1338f2f4e394ad19827bb2ae9c
2015-07-09 03:19:31 +00:00
Svet Ganov
ad3b297557 Add an API for apps to query if a permisison is denied by policy.
bug:22177216

Change-Id: I32227f55097fae997f33743fd1eee06cb18f47f1
2015-07-08 18:12:58 -07:00
Eric Laurent
264a1de1f4 am 0cd06433: am 373a0b5c: am dfea212b: am 070df444: am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
* commit '0cd064335c8daec8c8a4d9fbf0ca246e5e6a3b90':
  audio: add definitions for devices connected over IP
2015-07-08 18:38:11 +00:00
Eric Laurent
c0344a80fd Merge "audio: add definitions for devices connected over IP" into mnc-dev 2015-07-08 17:24:23 +00:00
Dianne Hackborn
ee94484303 am 7b3add61: am f368f6b9: am 6ee8a509: am c55c4a28: am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev
* commit '7b3add61c9e47b708725147dffc23d396db37add':
  Add new "preinstalled" permission flag.
2015-07-08 02:17:58 +00:00
Dianne Hackborn
1699ba48ce am 88936b7f: am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit '88936b7f82a6ec4023078e62304425147da4b56e':
  Implement better handling of text in assist.
2015-07-08 02:05:44 +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
Eino-Ville Talvala
810bc8d335 am af72d92b: am 314877b8: am 2915f3c6: am 26dfd03d: am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev
* commit 'af72d92bf124697dd2f4528a730806c56bff503d':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
2015-07-08 02:03:35 +00:00
Jeff Tinker
1c227145f6 am 2405899e: am c1e0e38e: am 5ece42b9: am 105633d9: am 6826b25c: Merge "Report specific exception type on decrypt with invalid session" into mnc-dev
* commit '2405899eff9f10164a5b0ef0e4e3ad77bd296af8':
  Report specific exception type on decrypt with invalid session
2015-07-08 02:03:27 +00:00
Dianne Hackborn
a90c8def2c Add new "preinstalled" permission flag.
This allows you to specify that a permission can be granted to
any pre-installed system app (not just privileged ones).

And as long as I am doing this, clean up the old "system" permission
flag, renaming it to "privileged" which is what it really is today,
deprecating the old names.  And switch the platform's permission
declarations to use the new name.

Change-Id: Iabf484746af232144786851ec7fe90e3de9dddb2
2015-07-07 17:25:25 -07:00
Dianne Hackborn
f2474d336a Merge "Implement better handling of text in assist." into mnc-dev 2015-07-07 23:51:06 +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
Svetoslav
3e07ee078d Merge "Grant installer and verifier install permissions robustly" into mnc-dev 2015-07-07 23:44:34 +00:00
Eino-Ville Talvala
384a04d936 Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev 2015-07-07 21:36:47 +00:00
Jeff Tinker
6826b25c22 Merge "Report specific exception type on decrypt with invalid session" into mnc-dev 2015-07-07 21:19:13 +00:00
Svetoslav
3e7d977ff7 Grant installer and verifier install permissions robustly
bug:22248271

Change-Id: I3a47ae9a112ba7d88b421fcb5f9651d1168ba7a5
2015-07-07 14:02:51 -07:00
Eino-Ville Talvala
0dd17509a9 Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement
This mode splits processing quality based on stream resolution, to
enable ZSL operation where low-resolution (preview/recording) streams
require more processing since they are immediately user-visible, while
the high-resolution intermediate ZSL stream should have minimal/no
processing since it will be reprocessed into final quality when
necessary

Bug: 22266686

Change-Id: Ib41102b66b07d61a099f021f8c6251f28c62686f
2015-07-07 13:39:55 -07:00
Ian Pedowitz
ecb7af7d10 am 0a5e18bf: am a3599c78: am 8ea98a8a: am 13c2a4f5: am 937edac8: Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
* commit '0a5e18bfe23f4b256bbda995a1f3e383fa979ee3':
  Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
2015-07-07 19:09:08 +00:00
Richard Coles
1636ad867e am 4683bea8: am 2ec1f9d5: am 604e0cc7: am 2bb68288: am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev
* commit '4683bea8b60285e7480f997b6fb4c0e2e9f6106b':
  Add WebView permission MIDI sysex
2015-07-07 19:08:30 +00:00
Tim Kilbourn
b7f593819c resolved conflicts for merge of 50431490 to master
Change-Id: Ife9af8acc617ac2c3a289b49327578ab6e087f18
2015-07-07 12:04:47 -07:00
Ian Pedowitz
937edac8e8 Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"
This reverts commit d6b404c72da7e2475508c7d5948494b2e9b1a262.

This CL seems to have broken the build, causing GMSCore to continuously
crash.

Bug: 22313634
Bug: 22312938
Bug: 22314605
Bug: 22308392
Bug: 22307889
2015-07-07 08:32:44 -07:00
Richard Coles
fad2e49c42 Merge "Add WebView permission MIDI sysex" into mnc-dev 2015-07-07 10:15:17 +00:00
Ian Pedowitz
5bc88b9f46 Merge "Final resource IDs." into mnc-dev 2015-07-07 06:13:14 +00:00
Billy Lau
bfe288690a am 4ce9ebea: am bb1a1e5f: am e2835f9f: am 212c006e: am c81ecb6d: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '4ce9ebea91be2456f5958b86e1c7e36b800e8dde':
  Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
2015-07-07 03:23:43 +00:00
Dianne Hackborn
0c95770080 am 7a90c536: am bcbf4641: am 569984f2: am d178b2da: am 5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev
* commit '7a90c536310796426f9f8be16265db2803bfd74b':
  Add easy way to get device idle whitelist.
  Don't prevent windows from drawing when they are just moving
  Added support for mid-call enabled SRVCC conference call
  MWI,phantom call,Suppl services, error codes
  Rename VoLTE/WFC enable API to available - add VT available API.
  Avoid IllegalStateException when generating/importing keys.
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
  Unhide signal strength constants used by getLevel.
2015-07-07 00:33:16 +00:00
Billy Lau
c81ecb6d2c Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev 2015-07-07 00:27:33 +00:00
Billy Lau
d6b404c72d 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.

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: I939a95b9a8b1ae75bf67aa6d8190c92a8d2001d3
2015-07-07 00:27:53 +01:00
Casey Ho
becddea63e Merge "Unhide signal strength constants used by getLevel." into mnc-dev 2015-07-06 21:39:31 +00:00