106386 Commits

Author SHA1 Message Date
Nick Kralevich
a299862dd2 Merge "Fix App Ops permission mapping structure." 2013-10-08 21:25:24 +00:00
Robert Craig
f97616c7ba Fix App Ops permission mapping structure.
The entry to map the post notification op
to a permission is at the wrong offset
within the sOpPerms array. This patch
fixes the issue.

Change-Id: Ia241d274e484b6a24edbfb17b87bb887b61f1ee1
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-10-07 12:43:06 -04:00
Alex Klyubin
8474214925 Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG." 2013-10-03 22:12:36 +00:00
Alex Klyubin
6ab3d20d3c Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
On devices with Hardware RNG (HW RNG), this makes EntropyMixer
periodically (every three hours) read 512 bytes from HW RNG and mix
them into the Linux RNG.

This is done without increasing Linux RNG's entropy estimates to
avoid having to trust the quality of the HW RNG. This approach cannot
reduce the quality of the Linux RNG output, but may increase it.

Change-Id: Ifde851004301ffd41b2189151a64a0c5989c630f
2013-10-03 15:07:37 -07:00
Alex Klyubin
1a07229bc2 Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes." 2013-10-03 21:34:23 +00:00
Alex Klyubin
3c2ae2f4ed Reduce EntropyMixer seed size from 4096 to 512 bytes.
The suggested seed size from Linux drivers/char/random.c is 512 bytes
rather than the 4096 bytes currently used.

Change-Id: I3dd55105f0a95ce9cda34b4cf08987b8a28c4ac9
2013-10-03 13:56:09 -07:00
Elliott Hughes
7fb64c6e6c Merge "more locale-appropriate screenshot share text" 2013-10-01 21:30:25 +00:00
Victoria Lease
e733a4012d more locale-appropriate screenshot share text
The SimpleDateFormat version of this produces very poor results in
locales other than en_US. Trusting DateFormat to do its thing
produces more consistently-pleasing results across all locales.

(cherry-pick of e45e1f2efe69ba931efa88c6e33879fbc8d8c4c1.)

Change-Id: I7f1714446bb50285d851e8e313e7f32a0a822bf2
2013-10-01 14:25:39 -07:00
Elliott Hughes
b4d1ad29c0 Merge "Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)" 2013-10-01 17:49:16 +00:00
Romain Guy
5fceada31f Merge "Fragement, or Fragment: that is the question" 2013-09-30 22:48:44 +00:00
Cyril Mottier
2de5082f43 Fragement, or Fragment: that is the question
Change-Id: Iac3a14b9d2d7b4bd1e452db987b3c5c95dbefd3b
2013-09-30 22:43:59 +02:00
Taeho Kim
3d02011734 Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)
With code snippet on current docs, the accessibility service does not show up on the Settings > Accessibility > Services list, with API level 17 or higher. In order to declare service correctly, user have to declare "permission" property with value of "android.permission.BIND_ACCESSIBILITY_SERVICE".

Change-Id: I70c8f98d4ff6fd2286bf5866098b22443afb6cd9
2013-09-30 04:11:39 +09:00
Elliott Hughes
ebd397ad91 Merge "Regenerate all the OpenGL stubs." 2013-09-27 22:33:25 +00:00
Nick Kralevich
7a56d949ef Merge "Fix SELinux.java doc errors" 2013-09-27 16:32:57 +00:00
Dianne Hackborn
3a7d5f7145 Merge "Replace SEAndroid with SELinux." 2013-09-25 18:39:58 +00:00
Elliott Hughes
9d8721f8ab Merge "Remove dead code." 2013-09-25 00:47:54 +00:00
Elliott Hughes
4b395a3625 Remove dead code.
This hasn't been used since at least 2011, and we're no longer
shipping the data supporting it either.

Change-Id: Ibe42057650b49794c65d6f0d54ed7a492f3b594b
2013-09-24 17:22:11 -07:00
Elliott Hughes
428d3fcbe3 Regenerate all the OpenGL stubs.
Bug: https://code.google.com/p/android/issues/detail?id=60390
Change-Id: I2e6f210178f656a5f08a1fcd4239581d680329a6
2013-09-24 17:15:41 -07:00
Nick Kralevich
effefbc48f Merge "Proper security labeling of multi-user data directories." 2013-09-20 19:35:17 +00:00
Nick Kralevich
69aa2f8a05 Merge "revert ADDR_COMPAT_LAYOUT workaround." 2013-09-18 21:46:13 +00:00
Nick Kralevich
d53afd2b05 revert ADDR_COMPAT_LAYOUT workaround.
Stop working around bad applications by setting ADDR_COMPAT_LAYOUT.
ADDR_COMPAT_LAYOUT is undesirable because it reduces the amount of
address space available to an application.

The Android emulator, in both 4.3 and 4.4, does not set
ADDR_COMPAT_LAYOUT. Anyone needing to test their application on a
version of Android without ADDR_COMPAT_LAYOUT can use the emulator
and reproduce the failures.

Change-Id: I8f753acc205798bd7f031026c7ece12d26de562c
2013-09-18 14:29:46 -07:00
Robert Craig
8643dc6b70 Proper security labeling of multi-user data directories.
This patch covers 2 cases. When an app is installed
and the resulting data directory is created for all
existing users. And when a new user is created and
all existing app data directories are created for
the new user.

Change-Id: Iaba7c40645bc7b6cc823d613da0c3782acf6ddd5
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-09-18 13:21:24 +00:00
Christopher Tate
ac39c604d6 Merge "Fix formatting in clearApplicationUserData exception message." 2013-09-13 21:58:45 +00:00
Alex Klyubin
03ea04715c Fix formatting in clearApplicationUserData exception message.
Before:
  4539 does not have permission:android.permission.CLEAR_APP_USER_DATA to clear datafor process:com.android.chrome
After:
  PID 4539 does not have permission android.permission.CLEAR_APP_USER_DATA to clear data of package com.android.chrome

Change-Id: Ic466decb050e4fa7f3fee4098c4f2abdc6cedf5c
2013-09-13 09:51:42 -07:00
Kenny Root
457f0f5e48 Merge "Move helper function to webkit" 2013-09-13 06:30:53 +00:00
Kenny Root
cb4317a5a7 Move helper function to webkit
This particular helper function is being removed from NativeCrypto, so
move it here as it's the last user of it.

Change-Id: Iea13ba499487d838068d6156d4d1e6861d05eb36
2013-09-12 23:00:54 -07:00
Amith Yamasani
c286ae17a0 Merge "GlobalAction dialog ref not set to null" 2013-09-12 16:24:20 +00:00
Elliott Hughes
c3415a918d Merge "Remove ArpPeer; dead code from Google TV." 2013-09-11 23:48:34 +00:00
Elliott Hughes
62d7bf2ab3 Remove ArpPeer; dead code from Google TV.
Change-Id: I595a6b6f52ab513a008e0fd861e98bc4488a1999
2013-09-11 16:21:16 -07:00
Kenny Root
90e42717e5 Merge changes I5d2be3c5,I9017256b
* changes:
  Add argument to binder call to check key types
  Use hostname verifier directly instead of instance
2013-09-10 18:50:02 +00:00
Kenny Root
0b83f9c805 Add argument to binder call to check key types
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.

(cherry picked from commit b91773bce1126d28a93f73fbef18f3a79245f24e)

Bug: 10600582
Change-Id: I5d2be3c514ff7404a90df76dc263484c5f226e6f
2013-09-10 18:49:40 +00:00
Kenny Root
4a406787c7 Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I9017256b3b5d137aeb5a6f455868af7bdfec7885
2013-09-10 11:05:23 -07:00
Kenny Root
7adc233cf8 Merge "Add support for DSA and ECDSA key types" 2013-09-03 07:11:36 +00:00
Kenny Root
f64386fc26 Add support for DSA and ECDSA key types
Change-Id: Ic6f029d66210052ce2f75d46102a100ac7db2b49
2013-08-30 17:54:13 -07:00
Jeff Hao
6110d16b8d Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." 2013-08-30 22:17:12 +00:00
Jeff Hao
6f0a04f5d2 Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
(cherry picked from commit ffbe799f3824f4be705ca726988355d3943a9004)

Change-Id: Ic87a254171fca7dfdf02c8643cd367055c8889cd
2013-08-30 14:40:26 -07:00
Brian Carlstrom
39e885dc82 Merge "Make MeasuredText.sCached field final" 2013-08-30 05:01:55 +00:00
Kenny Root
85b666c3b6 Merge "Use core-tests-support instead of core-tests" 2013-08-29 21:49:32 +00:00
Kenny Root
c2d6728350 Use core-tests-support instead of core-tests
The core-tests-support library is newly created. It doesn't have any
tests itself but some support for tests that need to use mocked classes
for testing. In this case, some tests are using TestKeyStore for SSL
testing in frameworks tests.

Change-Id: I70dc31c9fcddf256b515e2c16f581648bc8cf880
2013-08-29 14:28:41 -07:00
Brian Carlstrom
d4f4526cb4 Make MeasuredText.sCached field final
Change-Id: Id3be64c48be1bcf55ac1a4b00b76a40861bf2f61
2013-08-29 01:32:13 -07:00
Jeff Hao
6b34ab3f1a Merge "Merge MPSE and SPSE Chunk handlers for ddms." 2013-08-28 01:14:26 +00:00
Jeff Hao
366291e283 Merge "Add frameworks support for sample profiling from traceview gui." 2013-08-28 01:14:20 +00:00
Jeff Hao
6c7bac69f5 Merge MPSE and SPSE Chunk handlers for ddms.
(cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)

Change-Id: I1dab7801d47f092259916c4aea19b20d17951c2f
2013-08-27 17:59:32 -07:00
Jeff Hao
ffee626c3a Add frameworks support for sample profiling from traceview gui.
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)

Change-Id: Ic193ddadf01c42905fc7c35a1a8bf89fba4556e9
2013-08-27 17:46:18 -07:00
Chris Craik
3c0624aa1a Merge "Forward compatibility fix" 2013-08-27 18:07:49 +00:00
Chris Craik
28fe1ee579 Forward compatibility fix
Change-Id: Ib031372d43881a9bb7af1e51fb2c7cf55e03a326
2013-08-27 10:55:44 -07:00
Victoria Lease
1b8c33c614 Merge "Forward compatibility fixes" 2013-08-27 16:52:33 +00:00
John Reck
e982b7231f Forward compatibility fixes
Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8
2013-08-26 16:53:40 -07:00
Elliott Hughes
f39abeb4c4 Merge "The VM handles blocking SIGPIPE." 2013-08-21 22:35:28 +00:00
Elliott Hughes
437e76208d The VM handles blocking SIGPIPE.
We don't need this any more.

Bug: 10211309
Change-Id: I8be0071d50296974e3861f8af9d2bae4f5678d5a
2013-08-21 13:56:15 -07:00