55533 Commits

Author SHA1 Message Date
Robin Lee
7e67871174 Clean up DevicePolicyManager CA certificate APIs
For consistency all CA-related methods now require the ComponentName
of a DeviceAdminReceiver as the first parameter. Updated javadoc for
this and added in some more detail about the methods in general as
well.

Created two new utility APIs,one to list all installed CAs and one to
remove all installed (user) CAs. Deleted old hasAnyCaCertsInstalled
method because it is now redundant.

@bug 16488006

Change-Id: I55eec17e01489ab323f8a0e68b11592605a7b740
2014-08-12 16:54:40 +01:00
George Mount
8d2ba6dac3 Merge "Pass elevation to enable shadow in shared elements." into lmp-dev 2014-08-12 04:17:55 +00:00
George Mount
26c82b6ed1 Pass elevation to enable shadow in shared elements.
Bug 15932772

Change-Id: Ia4cb89035244656a2dd24936bf0e36a5b7970ea6
2014-08-11 15:38:56 -07:00
Igor Murashkin
d42a5fd3e7 camera2: (legacy) Fix the comparison for fixed-focus cameras
* Use #equals instead of == for string comparison
* Also make sure lens.info.minimumFocusDistance shows up in
  CameraCharacteristics#getKeys() for fixed-focus cameras

Bug: 16900875
Change-Id: I3b9248c5cb62ddcfb13587c6349525e145e353ac
2014-08-11 13:25:01 -07:00
Igor Murashkin
7336f470e3 camera: (LEGACY) - Add captureIntent and physicalSize metadata
Bug: 16900182
Change-Id: I159f2416da71c2d7ea803d61b63476da90e03b1c
2014-08-11 13:25:01 -07:00
Igor Murashkin
8c4486c141 camera: (Legacy) Add support for SCENE_MODE == FACE_PRIORITY
Bug: 16898478
Change-Id: I4306f6380ea06e8bd95af8738e5dde1a42a8098c
2014-08-11 13:25:01 -07:00
Sungsoo Lim
6219fa8b2d Add version attribute in tv_content_rating_system.xml
- 'version' attribute is added in 'rating-system-definitions' tag.
- Update javadoc for the format change of XML file in TvContentRating.
- Fix some errors in the javadoc comment.

Bug: 16805703
Change-Id: If9473c89cef0777232470d67f1542a5e5eac3182
2014-08-12 21:49:20 +09:00
Yuncheol Heo
7d9acc7a3e Use the system property for the HdmiControlService configuration.
- We've used the system resoure overlay for this purpose, but we found
  that it's hard for OEM which uses PDK to override this.  Since the
  resource was already compiled and provided as a binary, so it's hard
  to change it.

Bug: 16965963
Change-Id: I868305d6f76c128d79c00ab6a8023656cd476c62
2014-08-12 15:55:52 +09:00
Jeff Davidson
328e679b21 Merge "Security-related cleanup for network scoring." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Davidson
ac7285dc1e Security-related cleanup for network scoring.
-Perform additional checks for the SCORE_NETWORKS permission when
broadcasting scoring requests to the active scorer and when accepting
score updates. In theory, these checks are unnecessary as we manually
check package manager when obtaining the list of valid scorers, but
they cannot hurt to add.

-Fix multi-user. Since the active scorer is a global setting, we
ensure that scoring can only be done by apps available to the primary
user / owner of the phone, and that the request scores broadcast is
sent to that user's profile. When the scorer is changed, we send that
to all user profiles as it's just informational, although it's
unlikely that apps outside the primary user's profile would need to
respond.

Bug: 14117916
Bug: 16399238
Change-Id: Iaf06bda244eec730b590a30a3f4ffab4965bde96
2014-08-11 15:46:20 -07:00
Barnaby James
2bed283743 Merge "Fix VoiceInteractionService.isActiveService()." into lmp-dev 2014-08-11 18:14:57 +00:00
Jeff Sharkey
93f871126c Merge "Hack and ship: NetworkStats edition." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Sharkey
eb2c2c790c Hack and ship: NetworkStats edition.
Some devices use clatd for catching raw IPv4 traffic when running on
a pure-IPv6 carrier network.  In those situations, the per-UID
stats are accounted against the clat iface, so framework users need
to combine both the "base" and "stacked" iface usage together.

This also means that policy rules (like restricting background data
or battery saver) need to apply to the stacked ifaces.

Finally, we need to massage stats data slightly:

-- Currently xt_qtaguid double-counts the clatd traffic *leaving*
the device; both against the original UID on the clat iface, and
against UID 0 on the final egress interface.

-- All clatd traffic *arriving* at the device is missing the extra
IPv6 packet header overhead when accounted against the final UID.

Bug: 12249687, 15459248, 16296564
Change-Id: I0ee59d96831f52782de7a980e4cce9b061902fff
2014-08-11 18:40:23 -07:00
Jeff Brown
6d2a9492e2 Eliminate power manager latency for boot completed.
The power manager disables the power button until boot completed
occurs.  If there are many pending broadcasts in the queue, it
may be possible for BOOT_COMPLETED to be delayed for several
seconds after boot.

To avoid the delay, introduced a new boot phase which is
sent to system services immediately when boot completed happens.

Bug: 13398280
Change-Id: I1833d2ffb20305009dd76363b43e534034f1d0a2
2014-08-11 17:13:03 -07:00
Barnaby James
e2c020a449 Fix VoiceInteractionService.isActiveService().
Change-Id: Ifda467bfae0d15fe4ea0fd15ffc0e9612401b218
2014-08-11 15:29:12 -07:00
Jinsuk Kim
91e25eda41 Merge "Move input change event handling out of TVInputManager" into lmp-dev 2014-08-11 19:42:53 +00:00
Jinsuk Kim
d38bf476f6 Move input change event handling out of TVInputManager
HDMI input change event should be handled best in TIS implementation
of HDMI input since the input change request from TV/other device
needs to be properly coordinated. This requires the listener be
moved the input service.

Provided an interface in HdmiTvClient for the input service to access
the API through getSystemService(Context.HDMI_CONTROL_SERVICE).

Conflicts:
	services/core/java/com/android/server/tv/TvInputHardwareManager.java

Bug: 15570939
Change-Id: Ie2ad10d77907de3d4501f9c892ca553b75365467
2014-08-12 08:27:32 +09:00
George Mount
480ca829e2 Custom snapshot capture and reconstitution.
Bug 16865996
Bug 14450297
Bug 16866642

Added a mechanism for custom capture and restore of snapshot
Views. By default, it captures a Bitmap and restores a View
using that Bitmap as a background.

Change-Id: I77c2c62df53b552872e467380565bbe0e6d5c114
2014-08-11 14:28:45 -07:00
Chelsea Derrick
2ef022d23a Merge "Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]"" into lmp-dev 2014-08-11 17:55:01 +00:00
Chelsea Derrick
c216c473eb Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]"
This reverts commit 41158d90a69cae2a9c4ced0e04f235e8cfef5259.

Bug: 16871063
Change-Id: I93623be92f2de41789b16827867f3f95bf0480c5
2014-08-11 12:51:18 -07:00
Adam Lesinski
d4c25dbe67 Merge "Fix shared library bug in bag attributes" into lmp-dev 2014-08-11 17:09:06 +00:00
Sandeep Siddhartha
97887cf255 Merge "Remove direct field access from event payload" into lmp-dev 2014-08-11 17:09:03 +00:00
Sandeep Siddhartha
a3a5af04a0 Merge "Add debugging info to VIS via dump()" into lmp-dev 2014-08-11 17:09:01 +00:00
Sandeep Siddhartha
d5730bc88c Remove direct field access from event payload
Change-Id: I0b4462e56a977bfbaaebd2dd31d9246051af1b99
2014-08-11 09:53:44 -07:00
Yorke Lee
a79e2bedba Block access to call logs from the corp profile
Bug: 16812842
Change-Id: Ie4342b5efb2419097c35c0ddebd486a098cea523
2014-08-11 09:43:18 -07:00
Sandeep Siddhartha
6df952ec22 Add debugging info to VIS via dump()
Change-Id: I9e8f4536de309256db835b30d94765bfc27d4e80
2014-08-11 09:38:38 -07:00
Adam Lesinski
ccf25c7bf6 Fix shared library bug in bag attributes
A ResTable_map entry has a name attribute, which
could be a dynamic reference if it comes from
a shared library. It was not being patched with
the correct package id.

Bug:16795890
Change-Id: Ia8df6a943269b2fefb2132c3ed74eb1997d7701b
2014-08-11 09:16:01 -07:00
Etan Cohen
1584609f42 Add configuration flag controlling whether IMS can be completely disabled.
Change-Id: I70e6fc163d65bba7d1260df0acb74ca614e54b68
2014-08-11 08:41:19 -07:00
Craig Stout
362dac08e4 Merge "Fix NPEs when inflating a ValueAnimator." into lmp-dev 2014-08-10 19:43:29 +00:00
Nicolas Prevot
4c8db339bb Merge "Removing the personal icon, which was only a placeholder." into lmp-dev 2014-08-08 20:34:05 +00:00
Nicolas Prevot
aac303d0a2 Removing the personal icon, which was only a placeholder.
This icon should never show up: the avatar of the personal space should show up instead.

If something goes wrong and correct avatar fails to show, the systems falls back to the green android now, which is desired behaviour.

BUG: 15875652

Change-Id: I41beb4cbd5e707d27ef6d4cf35d02ec9cfa1b61d
2014-08-11 11:29:26 +00:00
Craig Stout
7f9988f0f5 Fix NPEs when inflating a ValueAnimator.
Change-Id: I4489b9e80635053792668a2f8032635893fb4afd
2014-08-08 11:17:50 -07:00
Yohei Yukawa
7c023fada2 Merge "Fix handling of line-end and RTL characters in CursorAnchorInfo" into lmp-dev 2014-08-07 16:36:32 +00:00
Yohei Yukawa
987eb3f109 Fix handling of line-end and RTL characters in CursorAnchorInfo
This CL addresses line-end handling and RTL characters handling
in CursorAnchorInfo.

BUG: 16499624
Change-Id: Ie23569fb136751c40f79dd9886e279dc01cefae9
2014-08-11 20:39:12 +09:00
Calin Juravle
01db916970 Pass the name of the native bridge library to the runtime
Bug: 16843953

(cherry picked from commit 2f4cf2cfd1125abfe928d6137f3d1553b0888f61)

Change-Id: I223f9041e424be024265e46bcff19cd9dfd18dfc
2014-08-11 11:37:17 +01:00
Sungsoo Lim
98ea5fa8e4 TIF: Add content rating systems
- Change the strings for translation to English only.
- Add content rating systems for many countries.
- Update javadoc of TvContentRating which is auto-generated based on
  tv_content_rating_systems.xml and strings.xml

Bug: 16862855, Bug: 16889743
Change-Id: Ifd81c85934b8631e8ae00633639989275982ecfb
2014-08-11 14:44:05 +09:00
Jungshik Jang
61daf6b38e Hook up device power status change to TIF
Instead of introducing new api update existing
IDeviceEventListener

Bug: 16445063
Change-Id: I93bfc736a06a78e83c95877a53f4f241b51ed9c0
2014-08-11 10:40:29 +09:00
Christopher Tate
83b2fb8f73 Merge "Start using cancelFullBackup() when appropriate" into lmp-dev 2014-08-09 00:40:15 +00:00
Christopher Tate
bf1a4a81eb Start using cancelFullBackup() when appropriate
The API was in place but the framework wasn't yet calling it.

Bug 16524520

Change-Id: Ie368758c830a7d0ad11e7dd3142a0ed896069944
2014-08-09 00:48:47 +00:00
Amith Yamasani
a6f4d58b90 Allow singleton providers to accept connections from other users
This is required for singleton providers like sms log.

Change-Id: Icb18a764c27dc1b43f8b8bcc24c21c91274995fd
2014-08-08 16:50:42 -07:00
George Mount
9985aaf268 Merge "Move shared elements to overlay when in a transition group." into lmp-dev 2014-08-08 23:02:20 +00:00
Igor Murashkin
696bbee963 camera2: Fix TotalCaptureResult#getKeys not to return empty list
Bug: 16680352
Change-Id: Ie6b8a8bff6f9b87d058a21b07eb3447371a62b6b
2014-08-08 22:45:00 +00:00
Adam Lesinski
81f6d857c1 Merge "Second iteration of the UsageStats API" into lmp-dev 2014-08-08 18:15:47 +00:00
Adam Lesinski
3516800b61 Second iteration of the UsageStats API
Based on feedback from API council, updated the API.
Also added support for querying the event log.

Change-Id: Ibaa008b9e5bd145acdfe8e20c25c2ed2d96be123
2014-08-08 12:08:15 -07:00
George Mount
fe361d2113 Move shared elements to overlay when in a transition group.
Bug 15744995

Change-Id: Icf1ee603de23c7bb3bce3723cb24009e36f153d7
2014-08-08 18:01:31 +00:00
Nicolas Prevot
d18a1da18d Merge "Validate that the authority of incoming uris matches." into lmp-dev 2014-08-07 18:53:12 +00:00
Nicolas Prevot
f300babd25 Validate that the authority of incoming uris matches.
BUG: 16864837

Change-Id: I2d4473985777b9525b101c1b02ad2395342b9722
2014-08-08 18:27:00 +01:00
Torne (Richard Coles)
0fb176417e Merge "Make WebViewFactory more robust." into lmp-dev 2014-08-07 18:53:12 +00:00
Torne (Richard Coles)
27cb0d22a8 Make WebViewFactory more robust.
Catch and discard any exception thrown in getWebViewNativeLibraryPaths
to avoid the system server crashing if there is something wrong with the
update APK. prepareWebViewInSystemServer(nativePaths) is safe to call
even if nativePaths is null or invalid, and must be called to ensure
that any process waiting for relro processing is unblocked.

Bug: 16894062
Change-Id: I76c759bebcb7c4643fb50979376afea764c859c4
2014-08-08 18:40:51 +01:00
Nicolas Prevot
c3093eb86b Merge "Making getProviderMimeType work across users." into lmp-dev 2014-08-07 18:39:40 +00:00