OSDN Git Service
Kenny Root [Mon, 14 Oct 2013 18:17:25 +0000 (11:17 -0700)]
Remove direct reference to X509CertImpl
This should use the system default X.509 certificate provider.
Change-Id: Ibdfd800a9d10f9dc566a360401efe7c3dc6cef5d
Nick Kralevich [Tue, 8 Oct 2013 21:25:23 +0000 (21:25 +0000)]
Merge "Fix App Ops permission mapping structure."
Robert Craig [Mon, 7 Oct 2013 16:32:02 +0000 (12:32 -0400)]
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>
Alex Klyubin [Thu, 3 Oct 2013 22:12:36 +0000 (22:12 +0000)]
Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG."
Alex Klyubin [Thu, 3 Oct 2013 20:23:13 +0000 (13:23 -0700)]
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
Alex Klyubin [Thu, 3 Oct 2013 21:34:23 +0000 (21:34 +0000)]
Merge "Reduce EntropyMixer seed size from 4096 to 512 bytes."
Alex Klyubin [Thu, 3 Oct 2013 20:56:09 +0000 (13:56 -0700)]
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
Elliott Hughes [Tue, 1 Oct 2013 21:30:25 +0000 (21:30 +0000)]
Merge "more locale-appropriate screenshot share text"
Victoria Lease [Mon, 30 Sep 2013 22:33:43 +0000 (15:33 -0700)]
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
Elliott Hughes [Tue, 1 Oct 2013 17:49:16 +0000 (17:49 +0000)]
Merge "Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)"
Romain Guy [Mon, 30 Sep 2013 22:48:44 +0000 (22:48 +0000)]
Merge "Fragement, or Fragment: that is the question"
Cyril Mottier [Mon, 30 Sep 2013 20:42:26 +0000 (22:42 +0200)]
Fragement, or Fragment: that is the question
Change-Id: Iac3a14b9d2d7b4bd1e452db987b3c5c95dbefd3b
Taeho Kim [Sun, 29 Sep 2013 18:39:30 +0000 (03:39 +0900)]
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
Elliott Hughes [Fri, 27 Sep 2013 22:33:25 +0000 (22:33 +0000)]
Merge "Regenerate all the OpenGL stubs."
Nick Kralevich [Fri, 27 Sep 2013 16:32:56 +0000 (16:32 +0000)]
Merge "Fix SELinux.java doc errors"
Dianne Hackborn [Wed, 25 Sep 2013 18:39:57 +0000 (18:39 +0000)]
Merge "Replace SEAndroid with SELinux."
Elliott Hughes [Wed, 25 Sep 2013 00:47:54 +0000 (00:47 +0000)]
Merge "Remove dead code."
Elliott Hughes [Wed, 25 Sep 2013 00:22:11 +0000 (17:22 -0700)]
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
Elliott Hughes [Wed, 25 Sep 2013 00:15:41 +0000 (17:15 -0700)]
Regenerate all the OpenGL stubs.
Bug: https://code.google.com/p/android/issues/detail?id=60390
Change-Id: I2e6f210178f656a5f08a1fcd4239581d680329a6
Nick Kralevich [Fri, 20 Sep 2013 19:35:16 +0000 (19:35 +0000)]
Merge "Proper security labeling of multi-user data directories."
Nick Kralevich [Wed, 18 Sep 2013 21:46:13 +0000 (21:46 +0000)]
Merge "revert ADDR_COMPAT_LAYOUT workaround."
Nick Kralevich [Wed, 18 Sep 2013 21:29:46 +0000 (14:29 -0700)]
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
Robert Craig [Mon, 29 Jul 2013 13:06:51 +0000 (09:06 -0400)]
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>
Christopher Tate [Fri, 13 Sep 2013 21:58:45 +0000 (21:58 +0000)]
Merge "Fix formatting in clearApplicationUserData exception message."
Alex Klyubin [Fri, 13 Sep 2013 16:51:42 +0000 (09:51 -0700)]
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
Kenny Root [Fri, 13 Sep 2013 06:30:53 +0000 (06:30 +0000)]
Merge "Move helper function to webkit"
Kenny Root [Fri, 13 Sep 2013 06:00:26 +0000 (23:00 -0700)]
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
Amith Yamasani [Thu, 12 Sep 2013 16:24:19 +0000 (16:24 +0000)]
Merge "GlobalAction dialog ref not set to null"
Elliott Hughes [Wed, 11 Sep 2013 23:48:34 +0000 (23:48 +0000)]
Merge "Remove ArpPeer; dead code from Google TV."
Elliott Hughes [Wed, 11 Sep 2013 23:21:16 +0000 (16:21 -0700)]
Remove ArpPeer; dead code from Google TV.
Change-Id: I595a6b6f52ab513a008e0fd861e98bc4488a1999
Kenny Root [Tue, 10 Sep 2013 18:50:02 +0000 (18:50 +0000)]
Merge changes I5d2be3c5,I9017256b
* changes:
Add argument to binder call to check key types
Use hostname verifier directly instead of instance
Kenny Root [Thu, 5 Sep 2013 20:03:16 +0000 (13:03 -0700)]
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
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
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
Kenny Root [Tue, 3 Sep 2013 07:11:36 +0000 (07:11 +0000)]
Merge "Add support for DSA and ECDSA key types"
Kenny Root [Fri, 16 Aug 2013 21:03:29 +0000 (14:03 -0700)]
Add support for DSA and ECDSA key types
Change-Id: Ic6f029d66210052ce2f75d46102a100ac7db2b49
Jeff Hao [Fri, 30 Aug 2013 22:17:12 +0000 (22:17 +0000)]
Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks."
Jeff Hao [Thu, 29 Aug 2013 18:19:39 +0000 (11:19 -0700)]
Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
(cherry picked from commit
ffbe799f3824f4be705ca726988355d3943a9004)
Change-Id: Ic87a254171fca7dfdf02c8643cd367055c8889cd
Brian Carlstrom [Fri, 30 Aug 2013 05:01:55 +0000 (05:01 +0000)]
Merge "Make MeasuredText.sCached field final"
Kenny Root [Thu, 29 Aug 2013 21:49:32 +0000 (21:49 +0000)]
Merge "Use core-tests-support instead of core-tests"
Kenny Root [Thu, 29 Aug 2013 21:27:20 +0000 (14:27 -0700)]
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
Brian Carlstrom [Wed, 28 Aug 2013 18:01:57 +0000 (11:01 -0700)]
Make MeasuredText.sCached field final
Change-Id: Id3be64c48be1bcf55ac1a4b00b76a40861bf2f61
Jeff Hao [Wed, 28 Aug 2013 01:14:26 +0000 (01:14 +0000)]
Merge "Merge MPSE and SPSE Chunk handlers for ddms."
Jeff Hao [Wed, 28 Aug 2013 01:14:20 +0000 (01:14 +0000)]
Merge "Add frameworks support for sample profiling from traceview gui."
Jeff Hao [Tue, 27 Aug 2013 01:47:18 +0000 (18:47 -0700)]
Merge MPSE and SPSE Chunk handlers for ddms.
(cherry picked from commit
fd224b97797dfb7e3ee1e2f56c3109d1594cf040)
Change-Id: I1dab7801d47f092259916c4aea19b20d17951c2f
Jeff Hao [Thu, 22 Aug 2013 22:53:12 +0000 (15:53 -0700)]
Add frameworks support for sample profiling from traceview gui.
(cherry picked from commit
ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)
Change-Id: Ic193ddadf01c42905fc7c35a1a8bf89fba4556e9
Chris Craik [Tue, 27 Aug 2013 18:07:49 +0000 (18:07 +0000)]
Merge "Forward compatibility fix"
Chris Craik [Tue, 27 Aug 2013 17:55:12 +0000 (10:55 -0700)]
Forward compatibility fix
Change-Id: Ib031372d43881a9bb7af1e51fb2c7cf55e03a326
Victoria Lease [Tue, 27 Aug 2013 16:52:33 +0000 (16:52 +0000)]
Merge "Forward compatibility fixes"
John Reck [Mon, 26 Aug 2013 23:53:40 +0000 (16:53 -0700)]
Forward compatibility fixes
Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8
Elliott Hughes [Wed, 21 Aug 2013 22:35:28 +0000 (22:35 +0000)]
Merge "The VM handles blocking SIGPIPE."
Elliott Hughes [Wed, 21 Aug 2013 20:56:15 +0000 (13:56 -0700)]
The VM handles blocking SIGPIPE.
We don't need this any more.
Bug:
10211309
Change-Id: I8be0071d50296974e3861f8af9d2bae4f5678d5a
Elliott Hughes [Fri, 16 Aug 2013 21:14:19 +0000 (21:14 +0000)]
Merge "Fix NPE in DateFormat.is24HourFormat."
Elliott Hughes [Fri, 16 Aug 2013 18:56:35 +0000 (11:56 -0700)]
Fix NPE in DateFormat.is24HourFormat.
In some cases, we end up being called by code that doesn't have a valid
Context. It got away with this historically because it wasn't formatting
times (just dates), so it never went down a path that tried to query the
user's 12/24-hour preference. This patch just ensures that we don't try
to get the preference unless we actually need it.
Bug:
10339015
Change-Id: I2df466d85cdeba14dbf882498808cbad9bbb57f4
Elliott Hughes [Wed, 14 Aug 2013 22:26:12 +0000 (22:26 +0000)]
Merge "DateUtils should use the user's 12/24-hour preference, not the locale's."
Elliott Hughes [Wed, 14 Aug 2013 22:12:43 +0000 (15:12 -0700)]
DateUtils should use the user's 12/24-hour preference, not the locale's.
Bug:
10312832
Change-Id: If23c124cf8442988de5feccb6f2c40b808a2eb89
Elliott Hughes [Fri, 9 Aug 2013 21:58:37 +0000 (21:58 +0000)]
Merge "Remove possible leak when exception occurred."
Marco Nelissen [Wed, 7 Aug 2013 15:39:39 +0000 (15:39 +0000)]
Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
Marco Nelissen [Wed, 7 Aug 2013 15:30:51 +0000 (15:30 +0000)]
Merge "Guarantee that all db related files are deleted together."
Henrik Baard [Tue, 23 Jul 2013 07:31:57 +0000 (09:31 +0200)]
GlobalAction dialog ref not set to null
When a GlobalAction dialog is dismissed when screen goes into
sleep the reference mDialog is not set to null. Next time the
long presses power button and brings up the GlobalAction dialog
the old reference still exist and we try to dismiss the dialog
again even if it does not exist.
The dialog reference in this case holds on to the dialog object
using more memory than neccesary, and in rare cases we might get
a crash when the dialog object is dissmissed the second time.
Change-Id: I44ef1c385d90777e8f6dd9fe111eb3d9b0d3cf3f
jangwon.lee [Wed, 7 Aug 2013 00:50:43 +0000 (09:50 +0900)]
Guarantee that all db related files are deleted together.
When deleting a db file, all db related files has to be deleted together
like journal, wal, shm etc.
Change-Id: I49d4581673d03fe669e9e0eaa2b50f7b9d3c34a4
Signed-off-by: jangwon.lee <jangwon.lee@lge.com>
Wink Saville [Tue, 6 Aug 2013 00:10:02 +0000 (00:10 +0000)]
Merge "Set subscription_mode in the database to a default value"
Elliott Hughes [Mon, 5 Aug 2013 18:01:33 +0000 (18:01 +0000)]
Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:31:54 +0000 (17:31 -0700)]
Revert "be more robust with handling unknown sensors"
This reverts commit
80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:13:24 +0000 (00:13 +0000)]
Merge "be more robust with handling unknown sensors"
Elliott Hughes [Fri, 2 Aug 2013 22:13:07 +0000 (22:13 +0000)]
Merge "If frameworks wants ASCII casing, it should explicity ask for it."
Elliott Hughes [Fri, 2 Aug 2013 17:00:44 +0000 (10:00 -0700)]
If frameworks wants ASCII casing, it should explicity ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
Mathias Agopian [Wed, 3 Jul 2013 22:38:29 +0000 (15:38 -0700)]
be more robust with handling unknown sensors
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up
Bug:
9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
Elliott Hughes [Fri, 2 Aug 2013 17:24:41 +0000 (17:24 +0000)]
Merge "If media wants ASCII lowercasing, it needs to ask for it."
Elliott Hughes [Fri, 2 Aug 2013 16:30:06 +0000 (09:30 -0700)]
If media wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
Elliott Hughes [Fri, 2 Aug 2013 16:39:59 +0000 (16:39 +0000)]
Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
Elliott Hughes [Fri, 2 Aug 2013 16:31:11 +0000 (09:31 -0700)]
If graphics wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: I13c106985302335dbb15bb9176d35ec6b4546d4e
Elliott Hughes [Fri, 2 Aug 2013 16:07:54 +0000 (09:07 -0700)]
When wifi wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67
Naveen Kalla [Wed, 3 Jul 2013 23:39:27 +0000 (16:39 -0700)]
Set subscription_mode in the database to a default value
If ro.telephony.default_cdma_sub is set, use that to set the
default CDMA subscription source in the database. If that is not set
use the default preferred value defined in the source code.
Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
Elliott Hughes [Thu, 1 Aug 2013 00:49:09 +0000 (00:49 +0000)]
Merge changes I80eaecff,Ia2b4f79b
* changes:
Switch Process.myTid over to the libcore JNI too.
Replace native Process getpid/getuid with calls to libcore equivalents.
Elliott Hughes [Thu, 1 Aug 2013 00:38:11 +0000 (17:38 -0700)]
Switch Process.myTid over to the libcore JNI too.
Change-Id: I80eaecff014fabf809f4be3c9ee8b26aa64bf0cf
Jeff Hao [Tue, 30 Jul 2013 17:13:41 +0000 (10:13 -0700)]
Replace native Process getpid/getuid with calls to libcore equivalents.
The Process natives were getting called were getting called while
handling a jdwp packet before the vm had a chance to register them.
(cherry-pick of
5bce6a308fc8a3c1e449cf905b8b6e8ace4ef3e2.)
Change-Id: Ia2b4f79b11e427283a712b2d0c52948f394640bf
jangwon.lee [Mon, 22 Jul 2013 10:52:48 +0000 (19:52 +0900)]
When deleting a db file,
Context.deleteDatabase() has to be called instead of File.delete()
to guarantee all db related files
like journal, wal, shm, etc are deleted together.
Signed-off-by: jangwon.lee<jangwon.lee@lge.com>
Change-Id: I3c3d7dfa13ffbe709ab7d8a5c7cfe6cfa2864fea
Jean-Baptiste Queru [Tue, 30 Jul 2013 22:24:15 +0000 (22:24 +0000)]
Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter."
Elliott Hughes [Tue, 30 Jul 2013 21:04:52 +0000 (21:04 +0000)]
Merge "Update preloaded-classes"
Sungmin Choi [Tue, 30 Jul 2013 19:09:28 +0000 (12:09 -0700)]
Update preloaded-classes
Change-Id: I42247e498ad532e3f4699bc87c0d314cde74e3f6
Wink Saville [Tue, 30 Jul 2013 19:19:47 +0000 (19:19 +0000)]
Merge "Add support for MNC=00"
Elliott Hughes [Tue, 30 Jul 2013 18:37:59 +0000 (18:37 +0000)]
Merge "fix typo: Remove dulplicated comment line"
Sungmin Choi [Tue, 30 Jul 2013 18:31:19 +0000 (11:31 -0700)]
fix typo: Remove dulplicated comment line
Change-Id: I6b95998b4af5b27c7e1f9040aa5e7b7deb5d8609
Marco Nelissen [Tue, 30 Jul 2013 17:11:55 +0000 (17:11 +0000)]
Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
Lorenzo Colitti [Tue, 30 Jul 2013 16:50:40 +0000 (16:50 +0000)]
Merge "Make legacy VPN work over stacked interfaces."
Lorenzo Colitti [Tue, 30 Jul 2013 16:50:03 +0000 (16:50 +0000)]
Merge "464xlat: use a gatewayed route, not point-to-point"
Jean-Baptiste Queru [Tue, 30 Jul 2013 16:16:38 +0000 (16:16 +0000)]
Merge "Update getCheckedItemPositions() documentation"
Lorenzo Colitti [Fri, 28 Jun 2013 08:26:21 +0000 (17:26 +0900)]
Make legacy VPN work over stacked interfaces.
On stacked interfaces like 464xlat, Legacy VPN can't find the
default gateway because it uses getRoutes, which only returns
routes for the base link and not for the stacked links. It also
assumes that the interface that the default route points to is
the interface for the base link (e.g., rmnet0) instead of the
interface the route actually points to (e.g., clat4).
Fix this by calling getAllRoutes to find the default IPv4 route,
and get the interface name from the route we find instead of
assuming it's the base interface.
Bug:
9597516
Change-Id: Ia6ce0b6258a421cd22f60dedca7e94176b32176b
Lorenzo Colitti [Mon, 17 Jun 2013 18:10:27 +0000 (11:10 -0700)]
464xlat: use a gatewayed route, not point-to-point
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.
Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:
default dev clat4 scope link
to:
default via 192.0.0.4 dev clat4 scope link
192.0.0.4 dev clat4 scope link
and those apps now work.
Bug:
9597256
Bug:
9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6
Michael Wright [Tue, 30 Jul 2013 02:26:01 +0000 (02:26 +0000)]
Merge "Remove deleted keylayout from Makefile"
Michael Wright [Tue, 30 Jul 2013 02:24:49 +0000 (19:24 -0700)]
Remove deleted keylayout from Makefile
Change-Id: I8aecc00861cf99d8e7278519f4e2e6fb726b7e17
Jean-Baptiste Queru [Mon, 29 Jul 2013 23:03:00 +0000 (23:03 +0000)]
Merge "MediaFormat: Fix the documentation link to the AAC profile constants"
Michael Wright [Mon, 29 Jul 2013 22:50:01 +0000 (22:50 +0000)]
Merge "Remove incorrect keymapping"
Michael Wright [Mon, 29 Jul 2013 22:48:55 +0000 (15:48 -0700)]
Remove incorrect keymapping
Turns out Snakebytes produce all 0s for their vendor / product IDs. This
somehow got the vendor / product ID of an international apple keyboard, which
will break them. Unfortunately, this also means we cannot map Snakebyte
controllers at all.
Relevant bug: https://code.google.com/p/android/issues/detail?id=58202
Change-Id: I09d246b1ab793ec04a19d558f6b98badac48b20f
Marco Nelissen [Fri, 26 Jul 2013 21:13:58 +0000 (21:13 +0000)]
Merge "Fix NullpointerException in MediaMetadataRetriever"
Mattias Petersson [Fri, 7 Oct 2011 07:33:52 +0000 (09:33 +0200)]
Add support for MNC=00
This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)
Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).
Bug:
7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
Daniel Karlberg [Wed, 15 Aug 2012 08:00:41 +0000 (10:00 +0200)]
Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.
This fix ensures that onFinished() is always called in a syncClient
even if the application lacks the READ_SYNC_SETTINGS permission.
Change-Id: I944717e71ceae06a665f8a3b1199b41d73e12da4
Oscar Rydhé [Tue, 28 Aug 2012 05:55:36 +0000 (07:55 +0200)]
Fix NullpointerException in MediaMetadataRetriever
According to the API documentation and the ICS implementation
the setDataSource(String) method throws an
IllegalArgumentException if path is null. In JB a
NullpointerException is thrown instead. This fix restores
the earlier behaviour.
Change-Id: Ic47baadf91076acc227d92d84f6b8d1d6ecd0c03
Stephen Smalley [Fri, 12 Apr 2013 18:49:38 +0000 (14:49 -0400)]
Replace SEAndroid with SELinux.
Change-Id: Ibbe544a9f025d71ad416bc01cee2145b62d7b2d4
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Chet Haase [Thu, 25 Jul 2013 21:46:49 +0000 (21:46 +0000)]
Merge "Return the actual interpolator of the ViewPropertyAnimator"