OSDN Git Service

android-x86/frameworks-base.git
9 years agoMerge "Manually add SignalStrength to preloaded-classes"
Brian Carlstrom [Thu, 5 Mar 2015 06:15:53 +0000 (06:15 +0000)]
Merge "Manually add SignalStrength to preloaded-classes"

9 years agoManually add SignalStrength to preloaded-classes
Brian Carlstrom [Thu, 5 Mar 2015 05:56:26 +0000 (21:56 -0800)]
Manually add SignalStrength to preloaded-classes

Bug: 19323020
Change-Id: I61e9d2dd5d06fe2353da17e5646f259122e5ea98

9 years agoMerge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."
Nick Kralevich [Tue, 3 Mar 2015 16:55:09 +0000 (16:55 +0000)]
Merge "SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates."

9 years agoMerge "Revert "Add potential future APIs for postmessage""
Selim Gurun [Tue, 3 Mar 2015 02:13:40 +0000 (02:13 +0000)]
Merge "Revert "Add potential future APIs for postmessage""

9 years agoRevert "Add potential future APIs for postmessage"
Selim Gurun [Tue, 3 Mar 2015 01:54:25 +0000 (01:54 +0000)]
Revert "Add potential future APIs for postmessage"

This reverts commit 37bd8907cb94be69c9bd4c308e49c38524e87269.

Change-Id: Iaa9356b95859846ce9c3209d3d1bcfc800d2ff93

9 years agoMerge "[Renderscript] JAVA API update for Allocation.CopyTo add the following functio...
Miao Wang [Tue, 3 Mar 2015 00:57:47 +0000 (00:57 +0000)]
Merge "[Renderscript] JAVA API update for Allocation.CopyTo add the following functions to make it more symmetric to copyFrom()."

9 years agoMerge "Fix crash when updating adapter offsets."
Jason Sams [Mon, 2 Mar 2015 23:57:11 +0000 (23:57 +0000)]
Merge "Fix crash when updating adapter offsets."

9 years agoMerge "Add potential future APIs for postmessage"
Selim Gurun [Mon, 2 Mar 2015 23:02:11 +0000 (23:02 +0000)]
Merge "Add potential future APIs for postmessage"

9 years agoAdd potential future APIs for postmessage
Selim Gurun [Mon, 2 Mar 2015 21:59:56 +0000 (13:59 -0800)]
Add potential future APIs for postmessage

Bug: 10237116

The APIs are hidden while work is ongoing.

Change-Id: I3e2f06d6e41af276171b127f06bdd74924c2e74c

9 years agoSELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.
Stephen Smalley [Fri, 27 Feb 2015 19:35:53 +0000 (14:35 -0500)]
SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates.

The current SELinuxPolicyInstallReceiver logic can yield a partial
or mixed (old and new) set of policy files under /data/security/current
if there is an error or a crash at certain points before completing
the installation of the update.

Rewrite the logic to avoid the possibility of such partial or mixed
policy updates by using rename on the entire directory of policy
files rather than operating on a per-file basis.  Also separate
the extraction of the policy files from the bundle into their own
temporary directory.  Make sure we delete any previous temporary directory
or backup directory before using them for this update.  Drop the
use of a symlink for /data/security/current altogether; it provides
no benefit.

Change-Id: I564af01c2c3ca1531c216013b8724c7511f32de8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
9 years agoMerge "jni: Add paranoia regarding android_logger_list_read"
Mark Salyzyn [Fri, 27 Feb 2015 18:46:04 +0000 (18:46 +0000)]
Merge "jni: Add paranoia regarding android_logger_list_read"

9 years agojni: Add paranoia regarding android_logger_list_read
Mark Salyzyn [Thu, 26 Feb 2015 22:43:04 +0000 (14:43 -0800)]
jni: Add paranoia regarding android_logger_list_read

Change-Id: Ic52be201ec7efaef6a385aaf8ea523554aa06f22

9 years agoMerge "Bad month value in DatePicker in Calendar Mode"
Narayan Kamath [Thu, 26 Feb 2015 17:42:22 +0000 (17:42 +0000)]
Merge "Bad month value in DatePicker in Calendar Mode"

9 years agoBad month value in DatePicker in Calendar Mode
You Kim [Thu, 26 Feb 2015 10:06:16 +0000 (19:06 +0900)]
Bad month value in DatePicker in Calendar Mode

Calendar MONTH field is zero based. Use predefined month.

Change-Id: I957bf385dc8e877e8698dacad68808f4d9d8a6d0

9 years agoFix crash when updating adapter offsets.
Jason Sams [Thu, 26 Feb 2015 00:42:00 +0000 (16:42 -0800)]
Fix crash when updating adapter offsets.

Change-Id: I0a6923e387f9743a06cc2c4c67995a79789d4cdd

9 years ago[Renderscript] JAVA API update for Allocation.CopyTo
Miao Wang [Sat, 21 Feb 2015 02:36:32 +0000 (18:36 -0800)]
[Renderscript] JAVA API update for Allocation.CopyTo
add the following functions to make it more symmetric to copyFrom().

  - copy1DRangeToUnchecked, copy1DRangeTo
  - copy2DRangeToUnchecked, copy2DRangeTo
  - copy3DRangeToUnchecked, copy3DRangeTo
  - setFromFieldPacker, 2D and 3D variants
  - copyElementTo, (1D, 2D & 3D)

Change-Id: I6b896123e1c00cead552aa5b31a701b15dd70f85

9 years agoMerge "Update autogenerated gl functions."
Dan Albert [Wed, 25 Feb 2015 22:50:24 +0000 (22:50 +0000)]
Merge "Update autogenerated gl functions."

9 years agoMerge "jni: switch to ANDROID_LOG_* mode flags"
Mark Salyzyn [Wed, 25 Feb 2015 19:04:24 +0000 (19:04 +0000)]
Merge "jni: switch to ANDROID_LOG_* mode flags"

9 years agojni: switch to ANDROID_LOG_* mode flags
Mark Salyzyn [Mon, 26 Jan 2015 20:51:27 +0000 (12:51 -0800)]
jni: switch to ANDROID_LOG_* mode flags

Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3

9 years agoMerge "Track removal of refcounts from FileMap."
Narayan Kamath [Tue, 24 Feb 2015 12:50:55 +0000 (12:50 +0000)]
Merge "Track removal of refcounts from FileMap."

9 years agoMerge "Remove wrong javadoc comment"
Narayan Kamath [Tue, 24 Feb 2015 10:04:31 +0000 (10:04 +0000)]
Merge "Remove wrong javadoc comment"

9 years agoMerge "Add new IKeystoreService methods to KeyStore"
Chad Brubaker [Mon, 23 Feb 2015 22:20:54 +0000 (22:20 +0000)]
Merge "Add new IKeystoreService methods to KeyStore"

9 years agoMerge "Add Keymaster 0.4 binder API"
Chad Brubaker [Mon, 23 Feb 2015 22:20:37 +0000 (22:20 +0000)]
Merge "Add Keymaster 0.4 binder API"

9 years agoAdd new IKeystoreService methods to KeyStore
Chad Brubaker [Wed, 11 Feb 2015 05:33:23 +0000 (21:33 -0800)]
Add new IKeystoreService methods to KeyStore

Add wrappers for all the new IKeystoreService keymaster 0.4 methods to
android.security.KeyStore.

Change-Id: Icb5500cfffb62d1af326edf326e1b9b67e5cece9

9 years agoAdd Keymaster 0.4 binder API
Chad Brubaker [Wed, 21 Jan 2015 22:00:55 +0000 (14:00 -0800)]
Add Keymaster 0.4 binder API

This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.

Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3

9 years agoUpdate autogenerated gl functions.
Dan Albert [Mon, 23 Feb 2015 18:41:10 +0000 (10:41 -0800)]
Update autogenerated gl functions.

Corresponding frameworks/native change:
https://android-review.googlesource.com/#/c/134491/

Since this fixes the int-to-pointer cast issues, stop ignoring that
warning.

Change-Id: I85134dc151ba368e4619e36125264b2b3f104202

9 years agoTrack removal of refcounts from FileMap.
Narayan Kamath [Mon, 23 Feb 2015 15:47:54 +0000 (15:47 +0000)]
Track removal of refcounts from FileMap.

Use delete instead of release.

Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076

9 years agoMerge "Clean up Javadocs for UEventObserver"
Narayan Kamath [Mon, 23 Feb 2015 10:50:18 +0000 (10:50 +0000)]
Merge "Clean up Javadocs for UEventObserver"

9 years agoClean up Javadocs for UEventObserver
Valter Strods [Tue, 19 Aug 2014 20:42:18 +0000 (23:42 +0300)]
Clean up Javadocs for UEventObserver

This commit removes a couple of apostrophes from the word "UEvents" as
the apostrophes would only be needed if something that belongs to the
UEvent was being talked about. Instead, the UEvents are being talked
about themselves - as a bunch.

Change-Id: I6a7908c6b73c0739102b632d2499e0f1e3c2d47f

9 years agoMerge "Fix 'fuchsia' typo."
Elliott Hughes [Sat, 21 Feb 2015 17:04:21 +0000 (17:04 +0000)]
Merge "Fix 'fuchsia' typo."

9 years agoFix 'fuchsia' typo.
Elliott Hughes [Sat, 21 Feb 2015 03:07:41 +0000 (19:07 -0800)]
Fix 'fuchsia' typo.

Bug: https://code.google.com/p/android/issues/detail?id=152142
Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83

9 years agoMerge "Implement finalizer for RS contexts."
Jason Sams [Fri, 20 Feb 2015 19:51:54 +0000 (19:51 +0000)]
Merge "Implement finalizer for RS contexts."

9 years agoImplement finalizer for RS contexts.
Jason Sams [Fri, 20 Feb 2015 01:19:52 +0000 (17:19 -0800)]
Implement finalizer for RS contexts.

Fixes memory leak when apps forget to call .destroy() on the context.

Change-Id: Ida4685768e92cfe3875da38846d17b86cc386cd0

9 years agoMerge "Fix a couple of issues with system_server forking."
Narayan Kamath [Thu, 19 Feb 2015 10:17:31 +0000 (10:17 +0000)]
Merge "Fix a couple of issues with system_server forking."

9 years agoMerge "Support single PDP network for Unite operator of Moldova"
Robert Greenwalt [Thu, 19 Feb 2015 00:39:21 +0000 (00:39 +0000)]
Merge "Support single PDP network for Unite operator of Moldova"

9 years agoMerge "Add BLAS intrinsic."
Tim Murray [Tue, 17 Feb 2015 21:57:23 +0000 (21:57 +0000)]
Merge "Add BLAS intrinsic."

9 years agoAdd BLAS intrinsic.
Tim Murray [Tue, 13 Jan 2015 00:47:56 +0000 (16:47 -0800)]
Add BLAS intrinsic.

Change-Id: I95ddc46cb3f6217d2ead1091fd47450389544324

9 years agoMerge "Add missing <sys/file.h> include for flock."
Elliott Hughes [Tue, 17 Feb 2015 01:22:19 +0000 (01:22 +0000)]
Merge "Add missing <sys/file.h> include for flock."

9 years agoMerge "Prevent leaking surfaces from exiting windows"
Craig Mautner [Mon, 16 Feb 2015 22:59:20 +0000 (22:59 +0000)]
Merge "Prevent leaking surfaces from exiting windows"

9 years agoAdd missing <sys/file.h> include for flock.
Elliott Hughes [Mon, 16 Feb 2015 18:43:19 +0000 (10:43 -0800)]
Add missing <sys/file.h> include for flock.

Change-Id: I0c66c03aeb4df614f7880a830b95c40f43f804db

9 years agoMerge "Register DDM handlers at the beginning of main method."
Piotr Jastrzebski [Mon, 16 Feb 2015 12:47:07 +0000 (12:47 +0000)]
Merge "Register DDM handlers at the beginning of main method."

9 years agoPrevent leaking surfaces from exiting windows
tiger_huang [Mon, 16 Feb 2015 08:14:47 +0000 (16:14 +0800)]
Prevent leaking surfaces from exiting windows

AM would set the exiting app to be invisible twice by calling
setAppVisibility(). If the screen is turned off during these calls,
the window surfaces of this exiting app won't be destroyed.

The flow:
 1. Screen is on
 2. App A is finished
 3. AM calls setAppVisibility() token=App A, visible=false
 4. WM sets a dummy animation to App A
 5. WM marks App A's wtoken.inPendingTransaction=true
 6. Screen is turned off
 7. AM calls setAppVisibility() token=App A, visible=false
 8. WM calls setTokenVisibilityLocked() directly (screen is off)
 9. WM sends app visibility to App A's client (ViewRootImpl)
10. WM clears the dummy animation from App A
11. App A's client calls WMS.relayoutWindow() to be not visible
12. WM sets App A's window mExiting=true but not destroy its surface
13. App A's window surface leaks...

Note:
a. The call in 3. is from ActivityStack.finishActivityLocked
b. The call in 7. is from ActivityStack.resumeTopActivityInnerLocked
c. In 10., App A won't get the real animation while screen is off
d. In 12., App A's inPendingTransaction=true; WM takes it's animating
e. mExiting won't be cleared because App A has no animation to
   trigger WindowStateAnimator.finishExit()

After applying this patch, WM would destroy the surface in 12. of the
above flow.

Change-Id: I18b79ba96695ec80d57a85dc15cf92a9e7d3a6ef

9 years agoMerge "Prevent duplicated registration of OnComputeInternalInsetsListener"
Yohei Yukawa [Sat, 14 Feb 2015 15:08:04 +0000 (15:08 +0000)]
Merge "Prevent duplicated registration of OnComputeInternalInsetsListener"

9 years agoFix a couple of issues with system_server forking.
Narayan Kamath [Fri, 13 Feb 2015 17:31:25 +0000 (17:31 +0000)]
Fix a couple of issues with system_server forking.

- Remove the obsolete --runtime-init arg. its prescence
  was preventing other arguments from being parsed.

- Be stricter about unparsed args - throw if we see arguments
  we don't expect. This was already implemented but broken
  (probably implemented by a crap programmer).

bug: 19378905
Change-Id: Id8b6158db7ef6368dd13ae61f591cdf2b278dfd1

9 years agoRegister DDM handlers at the beginning of main method.
Piotr Jastrzebski [Thu, 12 Feb 2015 13:55:23 +0000 (13:55 +0000)]
Register DDM handlers at the beginning of main method.

Compiler initializes RuntimeInit during compilation and stores an
initialized version of the class in oat file. Same thing happens to
DdmServer which handles DDM packets in JDWP thread started during JVM
creation. This means that after the creation of JVM all
DDM packets are handled by DdmServer.dispatch and since it's already
initialized during compilation it has all framework related handlers
already registered. If a packet arrives before AndroidRuntime.startReg
is called then framework native methods are not yet registered and the
processing of the packet fails with UnsatisfiedLinkError.

To fix this problem the registration of framework related DDM handlers
is moved to the beginning of ZygoteInit.main and RuntimeInit.main. This
means that the handlers won't be registered until main method is called
and that's guaranteed to be after AndroidRuntime.startReg is called. It
also guarantees that DDM packets will be properly handled as soon as
Java code is executed.

Bug: 18081539.
Change-Id: I9c674f53f3f62d58c46886e0b60698182e08f0c3

9 years agoMerge "Remove code that sets user.* system properties."
Narayan Kamath [Fri, 13 Feb 2015 11:57:38 +0000 (11:57 +0000)]
Merge "Remove code that sets user.* system properties."

9 years agoRemove code that sets user.* system properties.
Narayan Kamath [Thu, 12 Feb 2015 17:50:24 +0000 (17:50 +0000)]
Remove code that sets user.* system properties.

This has been disallowed by the SELinux for several years now,
so can safely be removed. Given that saveLocaleLocked is
simplified quite a bit, we can now inline into its only caller.

bug: 18910417

Change-Id: I18251f77e4a25a0e7ecda8e85a9b3fcdc2dc7b05

9 years agoMerge "Call startInput on return from sleep mode"
Jeff Brown [Fri, 13 Feb 2015 02:00:00 +0000 (02:00 +0000)]
Merge "Call startInput on return from sleep mode"

9 years agoMerge "Remove references to persist.sys.language/country."
Narayan Kamath [Thu, 12 Feb 2015 16:31:07 +0000 (16:31 +0000)]
Merge "Remove references to persist.sys.language/country."

9 years agoRemove references to persist.sys.language/country.
Narayan Kamath [Thu, 12 Feb 2015 12:57:17 +0000 (12:57 +0000)]
Remove references to persist.sys.language/country.

Addresses a couple of TODOs now that all usages have been
removed and fixes a doc that specifies how the emulator locale
can be set.

bug: 17691569

Change-Id: I802ea1e12448a5442840cad1fdc0956d3e2c7a8c

9 years agoMerge "Remove usages of FloatMath"
Neil Fuller [Thu, 12 Feb 2015 09:26:47 +0000 (09:26 +0000)]
Merge "Remove usages of FloatMath"

9 years agoRemove usages of FloatMath
Neil Fuller [Wed, 11 Feb 2015 15:49:47 +0000 (15:49 +0000)]
Remove usages of FloatMath

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iec8fb663ed54eb967050f6ff25a36ba534204c4d

9 years agoMerge "Use ICU for relative time formatting"
Tao Bao [Thu, 12 Feb 2015 04:30:43 +0000 (04:30 +0000)]
Merge "Use ICU for relative time formatting"

9 years agoUse ICU for relative time formatting
Tao Bao [Fri, 6 Feb 2015 23:44:00 +0000 (15:44 -0800)]
Use ICU for relative time formatting

Rewrite the DateUtils' relative time formatting APIs
(getRelativeTimeSpanString, getRelativeDateTimeString) to use ICU ones.
Two APIs that take withPreposition parameter are not changed. Because
(a) ICU doesn't provide functionality to format preposition; (b) They
are not really computing relative time but instead calling
formatDateRange() to get the absolute time/date string.

Bug: 19146457
Bug: 5252772
Change-Id: Iea8d699d63cc4438513910da66d038912e44fb8d

9 years agoMerge "Move hidden ApplicationInfo flags into a separate field."
Alex Klyubin [Wed, 11 Feb 2015 19:27:14 +0000 (19:27 +0000)]
Merge "Move hidden ApplicationInfo flags into a separate field."

9 years agoMove hidden ApplicationInfo flags into a separate field.
Alex Klyubin [Tue, 3 Feb 2015 19:12:59 +0000 (11:12 -0800)]
Move hidden ApplicationInfo flags into a separate field.

The public API field android.content.pm.ApplicationInfo.flags can
support only 32 flags. This limit has been reached. As a short term
workaround to enable new public flags to be added, this CL moves flags
which are not public API into a separate new field privateFlags and
renames the affected flags constants accordingly (e.g., FLAG_PRIVILEGED
is now PRIVATE_FLAG_PRIVILEGED).

The new privateFlags field is not public API and should not be used
for flags that are public API.

The flags that are moved out of ApplicationInfo.flags are:
* FLAG_HIDDEN,
* FLAG_CANT_SAVE_STATE,
* FLAG_FORWARD_LOCK, and
* FLAG_PRIVILEGED.

NOTE: This changes the format of packages.xml. Prior to this CL flags
were stored in the "flags" attribute. With this CL, the public flags
are stored in a new "publicFlags" attribute and private flags are
stored in a new "privateFlags" attribute. The old "flags" attribute
is interpreted by using the old values of hidden/private flags.

Change-Id: Ie23eb8ddd5129de3c6e008c5261b639e22182ee5

9 years agoMerge "Store compiled code in Context.getCodeCacheDir()"
Pirama Arumuga Nainar [Wed, 11 Feb 2015 17:08:00 +0000 (17:08 +0000)]
Merge "Store compiled code in Context.getCodeCacheDir()"

9 years agoMerge "Fix memory leak"
Marco Nelissen [Tue, 10 Feb 2015 23:46:27 +0000 (23:46 +0000)]
Merge "Fix memory leak"

9 years agoFix memory leak
Marco Nelissen [Tue, 10 Feb 2015 23:45:23 +0000 (15:45 -0800)]
Fix memory leak

Change-Id: Id691f9b32f9daeb23a01b17c5418b4d74a294cda

9 years agoStore compiled code in Context.getCodeCacheDir()
Pirama Arumuga Nainar [Tue, 10 Feb 2015 20:41:42 +0000 (12:41 -0800)]
Store compiled code in Context.getCodeCacheDir()

bug 16345623

Use Context.getCodeCacheDir for EGL shader cache and RenderScript
compiled code.

Change-Id: I54c4e43674bd1f9342ae13059cb8899f4a3f4734

9 years agoMerge "Get the instruction set that the libraries of secondary Abi is supported."
Calin Juravle [Tue, 10 Feb 2015 16:13:29 +0000 (16:13 +0000)]
Merge "Get the instruction set that the libraries of secondary Abi is supported."

9 years agoMerge "Implement array types"
Jason Sams [Mon, 9 Feb 2015 22:58:13 +0000 (22:58 +0000)]
Merge "Implement array types"

9 years agoMerge "Avoid static initialization of Layout from TextUtils"
Neil Fuller [Mon, 9 Feb 2015 17:29:59 +0000 (17:29 +0000)]
Merge "Avoid static initialization of Layout from TextUtils"

9 years agoMerge "Remove obsolete 'numeric_date_template'."
Elliott Hughes [Mon, 9 Feb 2015 15:42:23 +0000 (15:42 +0000)]
Merge "Remove obsolete 'numeric_date_template'."

9 years agoRemove obsolete 'numeric_date_template'.
Elliott Hughes [Sat, 7 Feb 2015 02:18:06 +0000 (18:18 -0800)]
Remove obsolete 'numeric_date_template'.

The only caller was removed in f91f06a5991451e4af3cf99eba791cb3009810d2.

Bug: 18388178
Bug: 18322220
Change-Id: I222363186ad1b9e25c8d8bf0f3928e42cf9bd275

9 years agoImplement array types
Jason Sams [Sat, 7 Feb 2015 01:45:15 +0000 (17:45 -0800)]
Implement array types

Change-Id: I1b83f21ea2aeaa4b9f5934aadcb69d4a1c1fea20

9 years agoAvoid static initialization of Layout from TextUtils
Neil Fuller [Fri, 6 Feb 2015 10:03:08 +0000 (10:03 +0000)]
Avoid static initialization of Layout from TextUtils

This works around a bug in standalone (e.g. non-Zygote)
runtimes when a device is attached to a host that is running
DDM.

There is a race condition:

When the runtime receives a HELLO from DDM it calls
TextUtils.isEmpty().

Calling any TextUtils methods statically initializes
Layout. Layout has dependencies on other classes, which in
turn have dependencies on native methods that are not always
registered when the call takes place. Registration and DDM
handling are done in separate threads.

This is not a fix, merely a workaround until the race can
be resolved.

Bug: 18081539
(cherry-picked from commit d29bdb266d54b4551f42776bb790e80147a279d0)

Change-Id: Id0d8578eab9e59d479a7c1b2e7ea1890ac0c8de6

9 years agoMerge "Fix clang build."
Elliott Hughes [Fri, 6 Feb 2015 05:37:33 +0000 (05:37 +0000)]
Merge "Fix clang build."

9 years agoFix clang build.
Elliott Hughes [Fri, 6 Feb 2015 05:36:10 +0000 (21:36 -0800)]
Fix clang build.

Change-Id: If795820ef6431fee9c9c3862cc91ad4a9cc04507

9 years agoMerge "Adds invocable functions to ScriptGroup"
Yang Ni [Thu, 5 Feb 2015 01:05:08 +0000 (01:05 +0000)]
Merge "Adds invocable functions to ScriptGroup"

9 years agoAdds invocable functions to ScriptGroup
Yang Ni [Sat, 24 Jan 2015 01:16:02 +0000 (17:16 -0800)]
Adds invocable functions to ScriptGroup

This also includes InvokeID support

Change-Id: I5b59df166ea30b309b8dd9623825ac0e72d03856

9 years agoMerge "Add a unit test for StaticIpConfiguration."
Lorenzo Colitti [Thu, 5 Feb 2015 00:21:57 +0000 (00:21 +0000)]
Merge "Add a unit test for StaticIpConfiguration."

9 years agoMerge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native...
Miao Wang [Thu, 5 Feb 2015 00:01:29 +0000 (00:01 +0000)]
Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)"

9 years agoMerge "Fix ANR caused by hwuiTask thread"
John Reck [Wed, 4 Feb 2015 21:53:47 +0000 (21:53 +0000)]
Merge "Fix ANR caused by hwuiTask thread"

9 years agoMerge "Fix build."
Elliott Hughes [Wed, 4 Feb 2015 20:26:02 +0000 (20:26 +0000)]
Merge "Fix build."

9 years agoFix build.
Elliott Hughes [Wed, 4 Feb 2015 20:24:21 +0000 (12:24 -0800)]
Fix build.

Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f

9 years agoMerge "Fix comment according to review."
Christopher Ferris [Wed, 4 Feb 2015 19:07:15 +0000 (19:07 +0000)]
Merge "Fix comment according to review."

9 years agoFix comment according to review.
Christopher Ferris [Wed, 4 Feb 2015 18:40:12 +0000 (10:40 -0800)]
Fix comment according to review.

Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d

9 years agoAdd a unit test for StaticIpConfiguration.
Lorenzo Colitti [Fri, 23 Jan 2015 05:31:30 +0000 (14:31 +0900)]
Add a unit test for StaticIpConfiguration.

Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7

9 years agomake Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT
Miao Wang [Wed, 4 Feb 2015 01:16:43 +0000 (17:16 -0800)]
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT
(Native RS)

Change-Id: I23041da03c2c928ceec76037804abb5dc7e6eb64

9 years agoMerge "[ActivityManager] Prevent application holding AMS lock"
Craig Mautner [Tue, 3 Feb 2015 18:41:12 +0000 (18:41 +0000)]
Merge "[ActivityManager] Prevent application holding AMS lock"

9 years agoMerge "[ActivityManager] Set appropriate relation of task to home"
Craig Mautner [Tue, 3 Feb 2015 17:54:25 +0000 (17:54 +0000)]
Merge "[ActivityManager] Set appropriate relation of task to home"

9 years agoMerge "Remove fall through for KEYCODE_VOICE_ASSIST"
Craig Mautner [Tue, 3 Feb 2015 17:36:54 +0000 (17:36 +0000)]
Merge "Remove fall through for KEYCODE_VOICE_ASSIST"

9 years agoMerge "Deutsche Telekom VVM free SMS shortcodes DE"
Robert Greenwalt [Tue, 3 Feb 2015 16:44:01 +0000 (16:44 +0000)]
Merge "Deutsche Telekom VVM free SMS shortcodes DE"

9 years agoRemove fall through for KEYCODE_VOICE_ASSIST
Henrik Baard [Tue, 3 Feb 2015 08:25:28 +0000 (09:25 +0100)]
Remove fall through for KEYCODE_VOICE_ASSIST

Removing unintentional fallthrough for the case
KEYCODE_VOICE_ASSIST.

The code works today since KEYCODE_VOICE_ASSIST is the
last case in the switch statement, however it is bad
practice. If somone adds another case statement the
code will break.

Change-Id: Iee6234807bbe176bd94e2584de288105d6c6a7cb

9 years agoMerge "Pass in code cache directory when creating a script group."
Yang Ni [Tue, 3 Feb 2015 06:20:19 +0000 (06:20 +0000)]
Merge "Pass in code cache directory when creating a script group."

9 years agoMerge "Fixing up the formatting code which is already merged"
Robert Greenwalt [Mon, 2 Feb 2015 17:00:42 +0000 (17:00 +0000)]
Merge "Fixing up the formatting code which is already merged"

9 years agoFixing up the formatting code which is already merged
Robert Greenwalt [Wed, 21 Jan 2015 19:52:20 +0000 (19:52 +0000)]
Fixing up the formatting code which is already merged

I just apply google coding guide like space.

Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"

This code is about + plus number converting logic for international NANP.

Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666

9 years agoMerge "Also include the domain when parceling StaticIpConfiguration."
Lorenzo Colitti [Fri, 30 Jan 2015 07:07:48 +0000 (07:07 +0000)]
Merge "Also include the domain when parceling StaticIpConfiguration."

9 years agoMerge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"
Lorenzo Colitti [Fri, 30 Jan 2015 07:00:38 +0000 (07:00 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"

9 years agoMerge "Fix wrap property creation when truncating."
Christopher Ferris [Thu, 29 Jan 2015 23:41:05 +0000 (23:41 +0000)]
Merge "Fix wrap property creation when truncating."

9 years agoFix wrap property creation when truncating.
Christopher Ferris [Thu, 29 Jan 2015 01:56:32 +0000 (17:56 -0800)]
Fix wrap property creation when truncating.

If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.

Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
Change-Id: Icc1a26593237ca19ad0ebd776a60b3d6290bb355

9 years agoPass in code cache directory when creating a script group.
Yang Ni [Fri, 16 Jan 2015 19:06:26 +0000 (11:06 -0800)]
Pass in code cache directory when creating a script group.

Change-Id: Ia73ea917a126a5055ec97f13d90a5feaafd6a2f5

9 years agoAlso include the domain when parceling StaticIpConfiguration.
Lorenzo Colitti [Thu, 29 Jan 2015 08:10:52 +0000 (17:10 +0900)]
Also include the domain when parceling StaticIpConfiguration.

StaticIpConfiguration objects are parceled at least as part of the
IpConfiguration objects that are passed to IEthernetManager when an
application sets static IP configuration on Ethernet.

Change-Id: I49991e2f591cc6cf01b503c18eb343b5929efe29

9 years agoMerge "Support connecting to networks with misconfigured subnet masks."
Lorenzo Colitti [Thu, 29 Jan 2015 08:35:35 +0000 (08:35 +0000)]
Merge "Support connecting to networks with misconfigured subnet masks."

9 years agoFix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Paul Jensen [Wed, 5 Nov 2014 14:35:26 +0000 (09:35 -0500)]
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()

setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

(cherry picked from commit c53113b37f33c7ed19660c8ec5bfd578e8bb5409)

bug:18252947
Change-Id: I6235fcd6b875aee516efbb5f880db1a99380355b

9 years agoSupport connecting to networks with misconfigured subnet masks.
Lorenzo Colitti [Tue, 20 Jan 2015 06:53:02 +0000 (15:53 +0900)]
Support connecting to networks with misconfigured subnet masks.

In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207

(cherry picked from commit 2dfb79a54adeb4bcf1f62332a9db467fce302ced)

Change-Id: I80088f291466dbd5a47f360dcc1620acee5cf57e

9 years agoMerge "Initialize clipping structure"
Jason Sams [Tue, 27 Jan 2015 20:41:42 +0000 (20:41 +0000)]
Merge "Initialize clipping structure"

9 years agoMerge "Fix printf format"
Marco Nelissen [Tue, 27 Jan 2015 20:19:46 +0000 (20:19 +0000)]
Merge "Fix printf format"

9 years agoFix printf format
Marco Nelissen [Tue, 27 Jan 2015 20:17:48 +0000 (12:17 -0800)]
Fix printf format

Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28