186481 Commits

Author SHA1 Message Date
Clara Bayarri
3af4330c53 Merge "Editor: Provide the selection content rect to ActionMode.Callback2" 2015-03-31 13:41:58 +00:00
Tom Hudson
f6967e686b Merge "Enter RectangleMode when the clip region is a rectangle" 2015-03-31 11:58:10 +00:00
Clara Bayarri
ea4f150c38 Editor: Provide the selection content rect to ActionMode.Callback2
This is necessary for the positioning of the floating toolbar.

Change-Id: I790c1f011a7e90c5e315aad77e96569b26b553af
2015-03-31 12:31:50 +01:00
Clara Bayarri
80d4bd84ed Merge "Editor: Reorder items in the text selection action mode." 2015-03-31 10:38:06 +00:00
Neil Fuller
cea283535c resolved conflicts for merge of 962a11ad to master
Change-Id: I8c6ac62d7267629c019997bb343d863aa56264eb
2015-03-31 11:15:39 +01:00
Neil Fuller
962a11ad5b am efd92907: am 25c5296b: Merge "An updater for all timezone data on a device"
* commit 'efd92907898161efe466889d2229e4acde2e973c':
  An updater for all timezone data on a device
2015-03-31 09:39:47 +00:00
Neil Fuller
efd9290789 am 25c5296b: Merge "An updater for all timezone data on a device"
* commit '25c5296b0d85979ad216195000b857dce8127ab1':
  An updater for all timezone data on a device
2015-03-31 09:31:48 +00:00
Narayan Kamath
b12dcfb1b1 Remove org.apache.http.legacy for declared shared lib lists.
We currently unconditionally include this shared library in the
boot classpath, so attempts to compile it will fail resulting in
unnecessary logspam.

Change-Id: Iafe9b2e725e10d939cd39dd4a816a146a6031baf
2015-03-31 08:51:53 +00:00
Neil Fuller
25c5296b0d Merge "An updater for all timezone data on a device" 2015-03-31 08:31:00 +00:00
Craig Mautner
0b037e93fc Merge "Remove one ANR cause and add logging for another" 2015-03-31 05:50:42 +00:00
Craig Mautner
cceeb58c13 Remove one ANR cause and add logging for another
For bug 19823482.

Change-Id: Ic44c4fd11ef92546118b09526c97446a92a7b4e7
2015-03-30 22:46:38 -07:00
Jinsuk Kim
6fd2d1d5c8 Merge "CEC: API setSystemAudioMode" 2015-03-31 04:53:51 +00:00
Jeff Sharkey
0e9503de20 Merge "Progress towards dynamic storage support." 2015-03-31 04:01:29 +00:00
Andreas Gampe
a60e809994 am abeba1ff: am c10fa20b: am 02c4bbb9: Merge "Frameworks/base: Support dex2oat threads system property"
* commit 'abeba1ff3306eab6ba6e58dce895cd2cf9117700':
  Frameworks/base: Support dex2oat threads system property
2015-03-31 03:44:02 +00:00
Andreas Gampe
abeba1ff33 am c10fa20b: am 02c4bbb9: Merge "Frameworks/base: Support dex2oat threads system property"
* commit 'c10fa20bf2dd5efa1e6f93062f8040b2bdf83e99':
  Frameworks/base: Support dex2oat threads system property
2015-03-31 03:39:04 +00:00
Andreas Gampe
c10fa20bf2 am 02c4bbb9: Merge "Frameworks/base: Support dex2oat threads system property"
* commit '02c4bbb9648da99947da57b1605020340a334b5f':
  Frameworks/base: Support dex2oat threads system property
2015-03-31 03:31:36 +00:00
Andreas Gampe
02c4bbb964 Merge "Frameworks/base: Support dex2oat threads system property" 2015-03-31 03:20:09 +00:00
Andreas Gampe
e035238823 Frameworks/base: Support dex2oat threads system property
Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART
with "-j" as a compiler option, if found.

Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to
ART with "-j" as an image compiler option, if found.

Bug: 19992386
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
2015-03-30 20:16:03 -07:00
Jeff Sharkey
4887789e44 Progress towards dynamic storage support.
Storage devices are no longer hard-coded, and instead bubble up from
whatever Disk and VolumeBase that vold uncovered, turning into
sibling Java objects in MountService.  We now treat vold events as
the source-of-truth for state, and synchronize our state by asking
vold to "reset" whenever we reconnect.

We've now moved to a model where all storage devices are mounted in
the root mount namespace (user boundaries protected with GIDs), so
we no longer need app-to-vold path translation.  This also means that
zygote only needs to bind mount the user-specific /mnt/user/n/ path
onto /storage/self/ to make legacy paths like /sdcard work.  This
grealy simplifies a lot of system code.

Many parts of the platform depend on a primary storage device always
being present, so we hack together a stub StorageVolume when vold
doesn't have a volume ready yet.

StorageVolume isn't really a volume anymore; it's the user-specific
view onto a volume, so MountService now filters and builds them
based on the calling user.  StorageVolume is now immutable, making
it easier to reason about.

Environment now builds all of its paths dynamically based on active
volumes.  Adds utility methods to turn int types and flags into
user-readable strings for debugging purposes.

Remove UMS sharing support for now, since no current devices support
it; MTP is the recommended solution going forward because it offers
better multi-user support.

Simplify unmount logic, since vold will now gladly trigger EJECTING
broadcast and kill stubborn processes.

Bug: 19993667
Change-Id: I9842280e61974c91bae15d764e386969aedcd338
2015-03-30 19:46:23 -07:00
Fabrice Di Meglio
607f1f09c3 Merge "Add IntentFilter auto verification" 2015-03-31 00:16:59 +00:00
Jason Sams
27b2442e22 Merge "Update LaunchOptions description" 2015-03-31 00:16:28 +00:00
Jason Sams
8610f837bc Update LaunchOptions description
Change-Id: I7425c9ea9d82ed54950557e93aa46b69ebc02c23
2015-03-30 17:01:10 -07:00
Selim Gurun
75e4f35383 Merge "Remove unnecessary code" 2015-03-30 23:57:10 +00:00
Zhijun He
8091ac4cfe Merge "ImageFormat: add PRIVATE format" 2015-03-30 23:46:12 +00:00
Selim Gurun
fc90c05649 Remove unnecessary code
Bug: 19313118

As part of the "better error reporting for Webview" work, a new public
API was defined for MNC release to report blocked loads. However,
we decided to use WebChromeClient.onConsoleMessage for this case.
Removing the API.

Change-Id: I1a599385f1ecdd10ba5a774b0b2a6b9f4bdcbd95
2015-03-30 16:41:06 -07:00
Olawale Ogunwale
673cec6ab5 am ad0acc08: am 5670d9a2: am 4af5bd7c: Merge "Add ProcessInfoService to activity manager."
* commit 'ad0acc08af6b5692a0ea50f77c40c4a00249c69c':
  Add ProcessInfoService to activity manager.
2015-03-30 23:37:55 +00:00
Makoto Onuki
7864e8e25a Merge "Enterprise quick contact 1/2" 2015-03-30 23:32:06 +00:00
Olawale Ogunwale
ad0acc08af am 5670d9a2: am 4af5bd7c: Merge "Add ProcessInfoService to activity manager."
* commit '5670d9a2503557ca583eddcab1702800b5016cd9':
  Add ProcessInfoService to activity manager.
2015-03-30 23:30:35 +00:00
Makoto Onuki
1040da1d4e Enterprise quick contact 1/2
Now openQuickContact goes thorough DPM.  When a lookup URI is build with
a lookup key returned by the enterprise lookup APIs for a corp contact, the
lookup key will have a special prefix.  In that case we go through DPM
and have it launch QC on the managed profile, if the policy allows.

For now we use the same DPM policy as enterprise-caller-id to disable this.

Design doc: go/cp2-mnc-enterprise-dd

Bug 19546108

Change-Id: I831a8190ae902ae3b1248cce6df02e3a48f602d2
2015-03-30 16:28:39 -07:00
Olawale Ogunwale
5670d9a250 am 4af5bd7c: Merge "Add ProcessInfoService to activity manager."
* commit '4af5bd7cdaccdba6001a384a81c258f542e74075':
  Add ProcessInfoService to activity manager.
2015-03-30 23:25:15 +00:00
Chris Craik
9d7b58571f Merge "Fix glop usage for drawTextureLayer" 2015-03-30 23:22:08 +00:00
Rich Slogar
8aa74c0a1c am 69fe4588: am 88077629: am 400fd04f: am b1dc614d: am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit '69fe4588b762267a08c94b9d95600ab70bd363c7':
  docs: build tools 22.0.1 revision updates
2015-03-30 23:21:01 +00:00
Zhijun He
2f17431194 ImageFormat: add PRIVATE format
Bug: 19865019
Change-Id: I1a9335fe1733a5b28d9cb20485b509fb216cb52b
2015-03-30 16:17:35 -07:00
Rich Slogar
69fe4588b7 am 88077629: am 400fd04f: am b1dc614d: am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit '88077629748f90211684c2676ca16a8a7c85b9fd':
  docs: build tools 22.0.1 revision updates
2015-03-30 23:13:20 +00:00
Ying Wang
89e0a1a033 Merge "Fix build." 2015-03-30 22:50:41 +00:00
Ying Wang
b67cd46436 Fix build.
private class SearchIndexablesContract.BaseColumns is extended by public
classes. We need to make it public too.

Change-Id: Id77575f7857020531b9d311ca5ba12c6462268a5
2015-03-30 15:46:30 -07:00
Chris Craik
31dbfc1b3e Fix glop usage for drawTextureLayer
Change-Id: I45fcdfc9e3f41a687b6f4679f81e2b1f4479b9fc
2015-03-30 15:42:23 -07:00
Jason Sams
d6b693b90b Merge "unhide RS apis" 2015-03-30 22:36:36 +00:00
Jason Sams
6a420b5e0b unhide RS apis
Change-Id: I30c3349c9222765ad7850890e0431bc6a6d3757a
2015-03-30 15:31:26 -07:00
Raph Levien
647d010b40 Merge "Revert "Fix build: Revert "Record hyphens from Minikin and draw them""" 2015-03-30 22:29:17 +00:00
Raph Levien
26d443aee4 Revert "Fix build: Revert "Record hyphens from Minikin and draw them""
This reverts commit 5a6eeb3cbe0896ddf4bdccc0b1a81d7aac49821e and
fixes the underlying issue (needed to @hide getHyphen() for subclasses
of Layout, not just the base class), and layoutlib changes for
checkbuild.

Change-Id: I7a2b5f20ae014ea8e224d8c4079cf9131e17e1c1
2015-03-30 15:13:50 -07:00
Adrian Roos
988e3a570f Merge "Prevent sensor induced rotations while screen is touched" 2015-03-30 22:02:00 +00:00
Adrian Roos
4249c049cc Merge "Explicitly specify package in EmergencyButton" 2015-03-30 22:01:23 +00:00
Olawale Ogunwale
4af5bd7cda Merge "Add ProcessInfoService to activity manager." 2015-03-30 22:00:12 +00:00
Fabrice Di Meglio
71036a89e6 Merge "Make Settings search API as a SystemAPI" 2015-03-30 21:57:23 +00:00
Rich Slogar
8807762974 am 400fd04f: am b1dc614d: am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit '400fd04fa14309220b74fcd87d5a3eb66ab430bf':
  docs: build tools 22.0.1 revision updates
2015-03-30 21:42:58 +00:00
Rich Slogar
400fd04fa1 am b1dc614d: am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit 'b1dc614d151a90e8745964157f0f7bc2c145894f':
  docs: build tools 22.0.1 revision updates
2015-03-30 21:37:05 +00:00
Rich Slogar
b1dc614d15 am f80370c6: Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev
* commit 'f80370c60118441c0022333a5b4f8cda99c86774':
  docs: build tools 22.0.1 revision updates
2015-03-30 21:30:39 +00:00
Rich Slogar
f80370c601 Merge "docs: build tools 22.0.1 revision updates" into lmp-mr1-dev 2015-03-30 21:24:20 +00:00
Alex Klyubin
8a78286915 am 7ca65f09: am b000d129: am 6a6f0c7d: Merge "Add HmacSHA256 backed by AndroidKeyStore."
* commit '7ca65f09013e807b6df61b2ba3e650a09ceff432':
  Add HmacSHA256 backed by AndroidKeyStore.
2015-03-30 21:01:39 +00:00