186499 Commits

Author SHA1 Message Date
Kenny Root
fbf4f81179 am 6a2d2b9f: (-s ours) am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '6a2d2b9f2b8b3fab6eafe37626a02b0a2f52747f':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
2015-03-31 17:04:26 +00:00
Kenny Root
6a2d2b9f2b am 5fdb2ea7: (-s ours) am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit '5fdb2ea76a8e0ffe8786a1e92ce565f7380384db':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
2015-03-31 16:54:32 +00:00
Wale Ogunwale
29382d2961 resolved conflicts for merge of 6abcec1d to master
Change-Id: I28986f8863298a767a8290b02d5418d4d1d42d17
2015-03-31 09:53:39 -07:00
Kenny Root
5fdb2ea76a am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
* commit 'a7645df5973cfb26aecabe093409e33eb745df17':
  Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
2015-03-31 16:46:39 +00:00
Clara Bayarri
6cedefa2e4 Merge "Editor: Fix crash when selecting text on a non-editable TextView" 2015-03-31 16:42:33 +00:00
Kenny Root
a7645df597 Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev 2015-03-31 16:40:15 +00:00
Olawale Ogunwale
6abcec1d76 am df736de8: am d052a3d3: Merge "[ActivityManager] Fix index out of bounds when updating next pss time."
* commit 'df736de8d8165b1aff675d00581ccdf94a7547aa':
  [ActivityManager] Fix index out of bounds when updating next pss time.
2015-03-31 16:27:48 +00:00
Mike Lockwood
63473869da Merge "Add event scheduling support to USB MIDI Manager code" 2015-03-31 16:23:24 +00:00
Olawale Ogunwale
df736de8d8 am d052a3d3: Merge "[ActivityManager] Fix index out of bounds when updating next pss time."
* commit 'd052a3d37beffff3735716340745ec7c83efc23d':
  [ActivityManager] Fix index out of bounds when updating next pss time.
2015-03-31 16:21:03 +00:00
Ben Kwa
3c0439bed6 Merge "Add a "Select All" menu item and code." 2015-03-31 16:19:12 +00:00
Kenny Root
9eed9e962c Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE
This reverts commit 4ff668d47ab9f49ec81606aec6d469ecd6ca37fa.

Bug: 19894176
Change-Id: I3cabec555f46b535720c58db73d9116d83a239dd
2015-03-31 09:15:37 -07:00
Ben Kwa
3bcc9488a1 Add a "Select All" menu item and code.
Change-Id: I31ed8bff83d8a621a31ea5c2a0d1bb218f53d6e2
2015-03-31 09:12:37 -07:00
Olawale Ogunwale
d052a3d37b Merge "[ActivityManager] Fix index out of bounds when updating next pss time." 2015-03-31 16:09:16 +00:00
Mike Lockwood
2776133be7 Add event scheduling support to USB MIDI Manager code
Change-Id: I9fdaaac35c296acc67ee0cf346b0c7b56bf58393
2015-03-31 08:57:06 -07:00
Doris Liu
9e6afce34a Merge "Fix per-keyframe interpolators" 2015-03-31 15:17:32 +00:00
Clara Bayarri
7fc946eb5d Editor: Fix crash when selecting text on a non-editable TextView
We are querying the insertion controller, which is null on a
non-editable TextView.

Change-Id: Ie8428c6264385a1283310823c959ecdd63ef5a3f
2015-03-31 15:13:06 +01:00
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
riddle_hsu
6793fc328a [ActivityManager] Fix index out of bounds when updating next pss time.
Symptom:
System server crash.

Root Cause:
The value curProcState for array index is -1 if the process
has not attached yet.

Solution:
Skip computing for process which is not attached or curProcState
is nonexistent state.

Change-Id: I71aaf45bb78d73097ebe9dfebf76b72f2d243232
2015-03-31 11:54:14 +08: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