• Home
  • History
  • Annotate
  • only in /frameworks/base/core/java/
History log of /frameworks/base/core/java/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
c031561475959b3632d521566bbf1af8f806987d 17-Feb-2015 Marco Nelissen <marcone@google.com> Fix NPE

Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.

Bug: 19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
ndroid/provider/MediaStore.java
51754778266652d206696fc905161db02b608880 17-Feb-2015 Alan Viverette <alanv@google.com> Fix year picker initial range

BUG: 19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
ndroid/widget/DatePickerCalendarDelegate.java
36ebab675cba49e5201c5c228a524e6e1bb7dcea 17-Feb-2015 Craig Mautner <cmautner@google.com> Do not make ActivityContainer available to apps. DO NOT MERGE

A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
ndroid/app/ActivityManagerNative.java
ndroid/app/ActivityThread.java
ndroid/app/IActivityManager.java
27ad2e95b40fd0ca76de384695498ea114d627ca 13-Feb-2015 Svetoslav <svetoslavganov@google.com> Accessibility: Ensure fresh accessilbity focused and input focused nodes.

Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
ndroid/view/accessibility/AccessibilityCache.java
d2ccbd43d24a79122e404206c528995600a6507d 13-Feb-2015 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
259f3d90b8784e150e4b903f9810f089f2d9bd42 12-Feb-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Fix legacy scaling factor application.

Bug: 19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
ndroid/hardware/camera2/legacy/SurfaceTextureRenderer.java
20be0e25ba660a7555577988cefcfa36d84e7e2f 12-Feb-2015 Jeremy Joslin <jjoslin@google.com> Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
c70d0e71c09da0292958d748cedaa5fbacbec74a 12-Feb-2015 Benjamin Franz <bfranz@google.com> Fix the javadocs for lock task mode intents.

Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
ndroid/app/admin/DeviceAdminReceiver.java
fcde58f155e8a188078885ec7529a9fe4a67f10e 12-Feb-2015 Jeremy Joslin <jjoslin@google.com> Update Javadoc for EXTRA_NETWORK.

Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
ndroid/net/ConnectivityManager.java
0ec652cf72bd8b7f619462f172ac0152d4d6c83d 12-Feb-2015 Adam Powell <adamp@google.com> Merge "Add DENSITY_280" into lmp-mr1-dev
f6d4045d6c386fe09eafb894aa1ff79ca6f04178 11-Feb-2015 Adam Powell <adamp@google.com> Add DENSITY_280

Bug 19350604

Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
ndroid/util/DisplayMetrics.java
c73cfa0ffba344a83d61e2f4eb9715152a2807b8 10-Feb-2015 Svetoslav <svetoslavganov@google.com> Accessibiltiy: missed update to the previous patch.

Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
ndroid/view/ViewGroup.java
ndroid/view/ViewRootImpl.java
b2ba6dfc7b33ec9e58d9f556206440a26069e264 10-Feb-2015 Baligh Uddin <baligh@google.com> Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
455502b7501bdbc55a739083878431c3ba7ef81a 10-Feb-2015 Andre Eisenbach <eisenbach@google.com> Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
a63ba4287e5c87f41cd7d4b43111fd18f3ec499b 09-Feb-2015 Matthew Xie <mattx@google.com> Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
61333d1b51ae36c9e5b1f4ea95bd00731c5e991a 09-Feb-2015 Amith Yamasani <yamasani@google.com> Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
2b8696e3a91194db0bfd876b8cc68843a7ccd080 06-Feb-2015 Andre Eisenbach <eisenbach@google.com> Add API to check if a Bluetooth connection is encrypted (1/2)

Bug: 19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
ndroid/bluetooth/BluetoothDevice.java
ndroid/bluetooth/IBluetooth.aidl
460a7b461902d55d20e99f6c19e131947384d04a 06-Feb-2015 Amith Yamasani <yamasani@google.com> Limit cache update to packages that have changed

When updating the RegisteredServicesCache, don't remove any packages
that are not in the list of modified packages.

Bug: 19228972
Change-Id: Id4f264403b7ceca9005854dfbbc25abfd7b54889
ndroid/content/pm/RegisteredServicesCache.java
07c745b525d39309a9ea93605fb5f85c295502f1 08-Feb-2015 Zhijun He <zhijunhe@google.com> Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
f33fe1f4860d4cbc49633162cf6441d315550cc9 07-Feb-2015 Svet Ganov <svetoslavganov@google.com> Accessibility: Handle a missed case when clicking focused views.

The special logic for clicking on views in accessibility mode should not
prevent event interception and if a view interceptes the gesture we must
clear the special flag and do normal event dispatch. Also once we have a
view handling the touch gesture we do not need the special flag as we
know what will handle the event. This tightly follows standard event
dispatching.

bug:19252492

Change-Id: I0c9764c5050ec73f5f7980f3f0340dd9509a725a
ndroid/view/ViewGroup.java
ndroid/view/ViewRootImpl.java
dd72be5971039f6f61af47c956287dc28b33f34c 06-Feb-2015 Zhijun He <zhijunhe@google.com> camera-metadata: clarify the AE precapture trigger spec

Doc only change.

Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
ndroid/hardware/camera2/CaptureRequest.java
ndroid/hardware/camera2/CaptureResult.java
60675b227354ab158e11fc5df2bbe654608d43dc 06-Feb-2015 Matthew Xie <mattx@google.com> Separate the protection of mProxyServiceStateCallbacks from that of mService

The overuse of mManagerCallback caused a deaklock.
Bug: 19264190

Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
ndroid/bluetooth/BluetoothAdapter.java
34123f1ce83e39a5a6045b1a90a148cd4c514e7e 06-Feb-2015 Svet Ganov <svetoslavganov@google.com> Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
060bca7444b8bf34fa95a6a71daf72fa8a85d78e 06-Feb-2015 Svet Ganov <svetoslavganov@google.com> Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
55bdb10c168615ee7721c657e0633b3aefbff777 06-Feb-2015 Svet Ganov <svetoslavganov@google.com> Accessibility: ignore children of a view with node provider.

A view that has an accessibility node provider should not have real children
since the provider is responsible to generate the node infos for the subtree
rooted at its hosting view. This is how the APIs are designed to work. However,
it is a common mistake and if this occurs the accessibility services
introspecting the screen get into an infinite loop.

The framework now does not add the real children of a view with a node provider
to the list of accessibility children. If the developer wants them exposed they
have to do that via the provider APIs as per contract.

bug:19297093

Change-Id: I1b01b1e4a85e1c397886fcd2506b434beb063687
ndroid/view/ViewGroup.java
0a2cceebd5503329f7038847906351af21434048 06-Feb-2015 Svet Ganov <svetoslavganov@google.com> Accessibility: Handle a missed case when clicking focused views.

The clicking logic was missing the case where a child of the accessibility
focused view reacts to the injected down up events for clicking. This
results of a whole class of views being non-interactive. Now if an event
is targeting accessibility focus and the dispatching view group has this
focus, we clear the flag before dispatching to children, so they can
handle the event rather ignoring it becuase they are not accessibility
focused.

bug:19252492

Change-Id: I6ac25bb7a50b35bb638ca4bfb9fc4198d08c2d4d
ndroid/view/View.java
ndroid/view/ViewGroup.java
f789d45b24acc3745ccc97adb687502d488404f6 06-Feb-2015 Neil Fuller <nfuller@google.com> Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
8debf21357477083a716275e2a32cb7169d42c47 06-Feb-2015 Kenny Guy <kennyguy@google.com> Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
d29bdb266d54b4551f42776bb790e80147a279d0 06-Feb-2015 Neil Fuller <nfuller@google.com> 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
Change-Id: If1bd3de6597bc93da381c8f86dacf40156449561
ndroid/text/Layout.java
ndroid/text/StaticLayout.java
ndroid/text/TextUtils.java
9a166c7da3d77c4b9801dbe249f78149649d5b0e 06-Feb-2015 Alan Viverette <alanv@google.com> Merge "Mutate scroll bar drawables" into lmp-mr1-dev
f8512ce08174426dfbba96e8108e5a64332f1e71 06-Feb-2015 Alan Viverette <alanv@google.com> Mutate scroll bar drawables

Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
ndroid/view/View.java
ndroid/widget/ScrollBarDrawable.java
9adf1c54226940e9f9065d92b4edd2b232122302 05-Feb-2015 John Spurlock <jspurlock@google.com> am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.

* commit 'ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42':
Fix a few typos in Parcel.java.
ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42 05-Feb-2015 John Spurlock <jspurlock@google.com> am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.

* commit '42d3b66f48906e35244ffc9a45daae87021fc1a5':
Fix a few typos in Parcel.java.
42d3b66f48906e35244ffc9a45daae87021fc1a5 05-Feb-2015 John Spurlock <jspurlock@google.com> am e0852368: Fix a few typos in Parcel.java.

* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
Fix a few typos in Parcel.java.
cd0d7cdefef0dbf395e5b159dccb6e884a2077b7 05-Feb-2015 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev
74a7024af08d8815ab3a76fe749216b58df88858 05-Feb-2015 Kenny Guy <kennyguy@google.com> Fix mangled javadoc for setPermittedInputMethods.

Fix java doc for setPermittedInputMethods.

Bug: 19276777
Change-Id: Iecd670b35cd675ff9dd4654c9876697801eb20ac
ndroid/app/admin/DevicePolicyManager.java
967439b4d1151a613058b1439e1e4240cdef28d9 05-Feb-2015 Adam Lesinski <adamlesinski@google.com> Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
f15f6a5087f22a0d083be9edc08e860e51c9a0d0 05-Feb-2015 Alan Viverette <alanv@google.com> Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev
b6bdb0f02df1004307d25ae86e09cdbbc6865e75 05-Feb-2015 Adam Lesinski <adamlesinski@google.com> Make ArrayMap.EMPTY immutable

This is a regression from KitKat.

Bug:19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349
ndroid/util/ArrayMap.java
3f7360df823b45b8b8c9a1f00dd1ec221664f798 05-Feb-2015 Alan Viverette <alanv@google.com> Invalidate SubtitleView during setText()

Ensures that even if layout does not change, the view is redrawn.

Bug: 19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a
om/android/internal/widget/SubtitleView.java
e3c0434d9741c78ef0405de3e9f4d16b6a8ef360 05-Feb-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Make legacy error handling more robust.

- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
allow proper cleanup + release of Camera1 API client.

Bug: 19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408
ndroid/hardware/camera2/legacy/RequestThreadManager.java
bac8e12ebd8ed143cd2f1974280f0495c837def4 05-Feb-2015 Alan Viverette <alanv@google.com> Move layer-list to be top-level element in seek bar progress

There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
ndroid/widget/ProgressBar.java
81c80180311803d9faabc0bbd6c0813f44edcf7d 05-Feb-2015 Zhijun He <zhijunhe@google.com> Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
80252a92e5736c62d26a7ee013c60c4fbfe4b66b 05-Feb-2015 Alan Viverette <alanv@google.com> Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
ae12ee34f36226fce4de2314dbd69541d1a8863a 05-Feb-2015 Alan Viverette <alanv@google.com> Allow top-level drawable container in progressDrawable

Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
ndroid/widget/ProgressBar.java
c3a043cf0e1c91dcffc2cd596908266ba92a4c28 04-Feb-2015 George Mount <mount@google.com> Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.

Bug 19254085

Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
ndroid/view/Window.java
e08523684d5414117f81debd4eb14bc8eb494c29 04-Feb-2015 John Spurlock <jspurlock@google.com> Fix a few typos in Parcel.java.

Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16
ndroid/os/Parcel.java
f1745ce8a86f79ec8401a40560a8e045f1875006 04-Feb-2015 Zhijun He <zhijunhe@google.com> Camera2: relax the EV compensation requirements

FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8
ndroid/hardware/camera2/CameraCharacteristics.java
fdb2112bbc140aab869aac047454cd2f67809df1 03-Feb-2015 Lajos Molnar <lajos@google.com> camera2: limit flexYUV array size in DngCreator

corrected overread

Bug: 19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
ndroid/hardware/camera2/DngCreator.java
ded133c446fa9d0d23e6bde19a66fb2ce3980491 31-Jan-2015 Svetoslav <svetoslavganov@google.com> Fix broken activation of the selected view in accessibility mode.

We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.

This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.

The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.

bug:18986806
bug:18889611

Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
ndroid/accessibilityservice/IAccessibilityServiceConnection.aidl
ndroid/view/AccessibilityInteractionController.java
ndroid/view/MotionEvent.java
ndroid/view/View.java
ndroid/view/ViewGroup.java
ndroid/view/ViewRootImpl.java
ndroid/view/accessibility/AccessibilityInteractionClient.java
ndroid/view/accessibility/IAccessibilityInteractionConnection.aidl
ndroid/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl
95b1048d390e79029978efd4654c05816722e17f 29-Jan-2015 Christopher Ferris <cferris@google.com> 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

(cherry picked from commit e32df45fe1a8cb7286bfdad392a0d36e0ddcf8e7)

Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b
om/android/internal/os/ZygoteConnection.java
d24047dcfed3fb7c913a0a5950c9f48ce3d49b9e 30-Jan-2015 Raph Levien <raph@google.com> Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev
6f9f1d4b3b9f9844dc294758398f87cc7aa934b0 12-Sep-2014 Igor Viarheichyk <viarheichyk@google.com> Use constants instead of resources for ellipsis.

All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

(cherry-pick of ed0daa93e48d38e54a7ad1c99c461510a4c07599.)

Bug: 18542179
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
ndroid/text/TextUtils.java
dbdaea0c6d44ead142f42ac060af2f5cd7f942ac 29-Jan-2015 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
af461e12a12dba8fc544fa373831368ba2c18096 29-Jan-2015 Raph Levien <raph@google.com> Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
42b3024efdec647266c1ae54a2a7c2c46915b380 29-Jan-2015 Raph Levien <raph@google.com> Refine resolution order for typeface and fontFamily

Previously any fontFamily value on a TextView would override a typeface
value, even if the fontFamily is from a TextAppearance (for example,
from the theme) and the typeface is explicitly set. This patch changes
the resolution order to fontFamily set directly on the TextView,
typeface set directly on the TextView, fontFamily from TextAppearance,
typeface from TextAppearance.

Bug: 16154223
Change-Id: I45c1e511fba8f64eb236200e3fa2e885c02b59dc
ndroid/widget/TextView.java
8b8d61952a4599439f3308a5f73bb0a2a0610563 29-Jan-2015 Jon Larimer <jlarimer@google.com> am 9570e144: am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit '9570e144fe38a53c507838cc5234225c7a0da315':
Fix ParceledListSlice to enforce the same concrete types among its elements.
9570e144fe38a53c507838cc5234225c7a0da315 29-Jan-2015 Jon Larimer <jlarimer@google.com> am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1 29-Jan-2015 Jon Larimer <jlarimer@google.com> am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit '88add68942694fc643518bcf5c26f6c3df7e9aa0':
Fix ParceledListSlice to enforce the same concrete types among its elements.
88add68942694fc643518bcf5c26f6c3df7e9aa0 29-Jan-2015 Jon Larimer <jlarimer@google.com> am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit 'a5ccca242747d59233ec5ecebc20d4a721e7850e':
Fix ParceledListSlice to enforce the same concrete types among its elements.
a5ccca242747d59233ec5ecebc20d4a721e7850e 29-Jan-2015 Jon Larimer <jlarimer@google.com> am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2982d64802ed0d5b59130680c43485e9d7862e50 29-Jan-2015 Jon Larimer <jlarimer@google.com> am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
Fix ParceledListSlice to enforce the same concrete types among its elements.
de9a76ed997c300a6c5f2f82c517719503af9045 29-Jan-2015 Jon Larimer <jlarimer@google.com> am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev

* commit 'fc731e6e40f6f449b8e7ac72c2cd36a57c04a32b':
Fix ParceledListSlice to enforce the same concrete types among its elements.
c8aaaef20f5d773037cf337d6f1419ba7ebf7832 29-Jan-2015 Jinsuk Kim <jinsukkim@google.com> CEC: Do null/empty check against the parameter for checkRecordSource()

This prevents out-of-bound exception from occurring.

Bug: 19188370
Change-Id: I051dccf7760cb542ea3dc9b0adc9625fa2ad8b1f
ndroid/hardware/hdmi/HdmiRecordSources.java
a17ab21d4c81ecc80b00b14fe56ce721b4e757ae 29-Jan-2015 Eino-Ville Talvala <etalvala@google.com> Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev
ccf6e88eec6081f83b21e97d930205fa5419583e 28-Jan-2015 Eino-Ville Talvala <etalvala@google.com> Camera2 legacy: Do not advertise NV21 support.

Also reduce logging somewhat for common scenarios.

Bug: 19161738
Change-Id: If96ed7d2bac0229159564072d7969d7bea3fae27
ndroid/hardware/camera2/legacy/LegacyMetadataMapper.java
ndroid/hardware/camera2/utils/ArrayUtils.java
bd769a15abfcb23b16daaed10c09029bbb978eef 28-Jan-2015 Jose Lima <joselima@google.com> Fix crash caused by disabling the Options panel on TVs

Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.

Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
ndroid/app/Activity.java
1061652a37e18683c994f9d4b872ecf990125a05 28-Jan-2015 Bryce Lee <brycelee@google.com> Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
034dc3839f2dced12d89e6ebbb93e6e288cfa9bf 28-Jan-2015 Bryce Lee <brycelee@google.com> Revert "Make THEATER_MODE_ON setting a system api."

This reverts commit 35dafda1b0357eb0f2eef766427a2b473967a918.

Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11
ndroid/provider/Settings.java
d8cb404035e8e133e310f5d811d44e3b0ecb8dcf 28-Jan-2015 Bryce Lee <brycelee@google.com> Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev
f741c3727383008b131cd3877cbdb3857e07fc9b 07-Nov-2014 Adam Lesinski <adamlesinski@google.com> Fix ParceledListSlice to enforce the same concrete types among its elements.

Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit 3df1c38ee098872352086e03d6f1adb16796ee29)
ndroid/content/pm/ParceledListSlice.java
aa6945ac7904611499ae4ad33799d1f1fe434d32 27-Jan-2015 George Mount <mount@google.com> Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
197adec3656fc087d4aa56396e601bb8d04aa9fd 27-Jan-2015 Svetoslav <svetoslavganov@google.com> Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev
3fd8a433a918fc9c57b6d7ff12839a1e028d6dad 27-Jan-2015 Jose Lima <joselima@google.com> Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev
7a22fc62d364bba4c1604a7e88fbd321eb541f4e 24-Jan-2015 Jose Lima <joselima@google.com> Allow disabling the Options Pannel feature for TVs

- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.

Bug: 18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
ndroid/app/Activity.java
ndroid/app/Dialog.java
cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11 27-Jan-2015 Chris Craik <ccraik@google.com> Merge "Invalidate outline on padding update" into lmp-mr1-dev
5229be05b439cf24b7028adbb64d05ecc23184ac 27-Jan-2015 Alan Viverette <alanv@google.com> Merge "Convert getHourForDegrees result to 12-hour format when needed" into lmp-mr1-dev
fbd459642fe732115f135e456eafdec2dc8e9bb6 26-Jan-2015 George Mount <mount@google.com> Activity Transition: fix quick back after enter.

Bug 19105460

When an Activity Transition was receiving an exit call
immediately after the enter, the transition for the enter
was still in progress. TransitionManager does not allow
multiple transitions to work at once, so the enter transition
would run, but the exit did not. This CL detects when the
enter transition is still pending and tells the
ActivityTransitionState to delay one frame so that the
enter can finish its required work prior to starting the
exit transition.

Change-Id: I1b40f1e41d61a67da3fd672419ea321e7d0496da
ndroid/app/ActivityTransitionCoordinator.java
ndroid/app/ActivityTransitionState.java
ndroid/app/EnterTransitionCoordinator.java
5efe0d199e9a6133af355ace6e4b52b82a65af6e 27-Jan-2015 Alan Viverette <alanv@google.com> Convert getHourForDegrees result to 12-hour format when needed

Also prevents the selector from jumping between the inner and outer
circle during touch exploration in 24-hour mode.

Bug: 19101918
Change-Id: If342056b378927397f8651dad5e8d806bcda03a6
ndroid/widget/RadialTimePickerView.java
c43a82094584d2112aef2ee7bf74e1510a7a0b16 26-Jan-2015 Chris Craik <ccraik@google.com> Invalidate outline on padding update

bug:19113359

Ensures that ViewOutlineProvider#PADDED_BOUNDS is always kept up to
date with the view's padding.

Change-Id: I5e090bd8272e89d6b8b9055dbe95ef3d45333fcb
ndroid/view/View.java
09dff843b8ed402564c4c89d7e1cabceb715e458 26-Jan-2015 Lorenzo Colitti <lorenzo@google.com> Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev
2563095d2d2798c05ebef81290c592826a1758f0 26-Jan-2015 Alan Viverette <alanv@google.com> Prevent drag-to-open from cycling pressed state, propagate hotspot

Avoids unnecessary changes to pressed state. Ensures hotspot propagates
to both the list view and the list item view since both receive the
pressed state.

Bug: 19134424
Change-Id: If2496ce2042e43fe1c1efd527eeca10dc53e1f4a
ndroid/widget/ListPopupWindow.java
35dafda1b0357eb0f2eef766427a2b473967a918 26-Jan-2015 Bryce Lee <brycelee@google.com> Make THEATER_MODE_ON setting a system api.

This will allow an unbundled home to continue accessing this property.

Bug: 19043538
Change-Id: I845a8726e617ca7b6f7f7347a0ac5aa0620d6658
ndroid/provider/Settings.java
df59053588501178263e0e8de37f23717e649ffc 22-Jan-2015 Lorenzo Colitti <lorenzo@google.com> Only try to fetch time from NTP if there is a network connection.

Bug: 19046107
Change-Id: Iff647ee33fe0eb9b530d7baad636d32b386e4fa7
ndroid/util/NtpTrustedTime.java
a1ac6a09252a8a615230f08767ab6153bd23a165 24-Jan-2015 Svetoslav <svetoslavganov@google.com> Accessibility: Ignore overlapping siblings when computing a click location

To click a view we were computing a click location by ignoring overlapping
views that are actionable. However, detection whether a view is actionable
is not always possible as the view may handle touch events directly. This
leads to unhandled edge cases. We are taking a conservative approach and
ignore all overlapping siblings regardless if clickable. This is also has
limitations but hopefully less frequent edge cases.

bug:18889611

Change-Id: Icea0b7b3e2d4ed53e50e01cb6a99b880be560b14
ndroid/view/View.java
ndroid/view/ViewGroup.java
ndroid/widget/HorizontalScrollView.java
ndroid/widget/Toolbar.java
om/android/internal/widget/ActionBarContainer.java
42a13865a4527aaf907a6ced96f726b49b2cbbed 23-Jan-2015 Svetoslav <svetoslavganov@google.com> Merge "Accessibilty: Cannot click on views in a scrollable container covered by the toolbar." into lmp-mr1-dev
af8c621d2165248cdb60699a6655e56e7dfa2e05 23-Jan-2015 Chet Haase <chet@google.com> Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev
e77adabeafa16f9b401a6ad67405205bd96f2219 16-Jan-2015 Prerepa Viswanadham <dham@google.com> Don't compute flags length for scan response

Bug 19041626

Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
ndroid/bluetooth/le/BluetoothLeAdvertiser.java
ae38596bcf2a077753d170c0cad68f4dfde4277b 23-Jan-2015 Lorenzo Colitti <lorenzo@google.com> Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
2dfb79a54adeb4bcf1f62332a9db467fce302ced 20-Jan-2015 Lorenzo Colitti <lorenzo@google.com> 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
Change-Id: I822e1d754b336691b675438eefa959a3d75fd07b
ndroid/net/StaticIpConfiguration.java
76cf035513d843c66d2fafe85b6a37c4c19b9223 23-Jan-2015 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
78d51c2292b5a3b56be1b1e92bc67b70f4eebce4 23-Jan-2015 Lorenzo Colitti <lorenzo@google.com> Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev
b2053114562830369a9d060e79f0c9eff4be27e7 20-Jan-2015 Lorenzo Colitti <lorenzo@google.com> Use the proper IpPrefix and LinkAddress constructors in VPN code.

This simplifies the code, and also makes it possible for
users to point multicast routes at the VPN. The LinkAddress
objects we were previously using to construct the RouteInfo do
not accept these, but IpPrefix objects do.

Bug: 18485968
Change-Id: Ie914a2eb359b78161810ee473df725059f944f4e
ndroid/net/VpnService.java
om/android/internal/net/VpnConfig.java
41fceb462b6eefbaa3a4d4e56b962fdb2910a6f5 23-Jan-2015 Svetoslav <svetoslavganov@google.com> Accessibilty: Cannot click on views in a scrollable container covered by the toolbar.

In accessibility mode we calculate a point where to click in the accessibility
focused view as a bridge-gap solution before switching to accessibility click
actions. We cannot detect whether a view is covered by another one that consumes
all touch events, and therefore we may click on the wrong target. This was the
case with the toolbar. As a result a partially scrolled view in a scrollable
container covered by a toolbar cannot be activated and this is not an edge case.

bug:18986806

Change-Id: Ib41470c39806cec13e9b00b319879cd7f3412ab5
ndroid/view/ViewGroup.java
ndroid/widget/Toolbar.java
om/android/internal/widget/ActionBarContainer.java
d15e94f0309a91d5a75d03a9ae165121e7f24907 23-Jan-2015 Chet Haase <chet@google.com> Allow infinite-repeat zero-duration animators to continue repeating

A recent change to ValueAnimator caused infinitely repeating animators with
duration 0 to be ended immediately. BatterySaver mode can cause animators
to have 0 duration, which means that apps depending on animator update events
no longer receive those events due to this behavior change.

The fix is to restore the previous behavior of allowing repeating animators
to continue, regardless of duration.

Issue #19113776 Fix infinite-repeating, zero-duration animator behavior

Change-Id: I4d1c7afb6d06ca45ef41db73c160f6a6d5754e24
ndroid/animation/ValueAnimator.java
7fde5e5ba3d306bc694e2b97edf5892755fcb6d0 23-Jan-2015 Eino-Ville Talvala <etalvala@google.com> Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev
ad44f7448f0b9aa672cad21300f436e369c8105d 22-Jan-2015 Nicolas Prevot <nprevot@google.com> Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
cb8661c08f4a7b00eaa2ede06a30c32dd3cbc53b 18-Jan-2015 Jinsuk Kim <jinsukkim@google.com> CEC: Add logic to return to internal source

This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.

Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.

Bug: 19008579

Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
ndroid/hardware/hdmi/HdmiDeviceInfo.java
ffd1a49c0b8e442aea73c4f5336ea486492981f6 22-Jan-2015 Jim Miller <jaggies@google.com> Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev
fa0b9a00b48394bd9b7e5d54b2b4a5a33d7bd186 20-Jan-2015 Eino-Ville Talvala <etalvala@google.com> Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)

Add missing implementation.
Also improve docs for flexible Surface sources.

Bug: 19076351
Change-Id: I1f1126a291480dcb68d3dd90825b5994e54dcc99
ndroid/hardware/camera2/CameraDevice.java
ndroid/hardware/camera2/legacy/LegacyCameraDevice.java
ndroid/hardware/camera2/params/StreamConfigurationMap.java
7ca16ff8c6133b211d6163bd17847ed3eaa1948a 22-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
b5db57a27d5147c8a46f1ba8a6016c3f95d52756 15-Jan-2015 Jim Miller <jaggies@google.com> Clarify getTrustAgentConfiguration() documentation.

Fixes bug 18983802

Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
ndroid/app/admin/DevicePolicyManager.java
213269599bdec3d83d3d811f5e8f62b9fd8d245c 21-Jan-2015 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev
76ff4dd0de8d9747b9341f064dd270c5762705c6 17-Jan-2015 Svetoslav <svetoslavganov@google.com> AlertActivity now behaves as a dialog for accessibility purposes.

AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.

bug:18865632

Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
om/android/internal/app/AlertActivity.java
455625e298204a27d3958eb56ff155f27562eec8 21-Jan-2015 Dianne Hackborn <hackbod@google.com> Work on issue #18201239: ANRs in com.google.process.gapps:

Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
ndroid/app/ActivityThread.java
daf92066db6b3934e71277b0290b7149740198de 21-Jan-2015 Nicolas Prevot <nprevot@google.com> Never set "Work" or "Personal apps" as prefered activities.

In ResolverActivity: when the user chooses work or personal:
Do not set them as prefered activities.

BUG:19091836

Change-Id: Ibe0081eb16e58cc25decb3f25b7fd50b5403d5fc
om/android/internal/app/ResolverActivity.java
06ab0ca4812450ec297722957e18b34cbfa733b2 21-Jan-2015 Kenny Guy <kennyguy@google.com> Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev
054f2656a17a438aa6e8c8f6dcd61b1217f41b88 20-Jan-2015 Jinsuk Kim <jinsukkim@google.com> Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
28d2a693efaa10e9b71d679919566cab640f73e0 20-Jan-2015 Jinsuk Kim <jinsukkim@google.com> Mark TimeUnit as @SystemApi

Bug: 18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
ndroid/hardware/hdmi/HdmiTimerRecordSources.java
2b43c73e66d99a5ccc8a23fd1c4e2028f9dd05f2 19-Jan-2015 Kenny Guy <kennyguy@google.com> Only hide cross profile disclosure when showing resolver.

Hiding the cross profile discoloure for all system apps
also meant it wasn't shown for CALL_PRIVILEGED intents.

Bug: 18702461
Change-Id: I8129bc4b07573b547aefe2dbcc6938a60305c216
om/android/internal/app/IntentForwarderActivity.java
830f39ad3cb2c0ff2300c7288e695def37e3b1dd 16-Jan-2015 Svet Ganov <svetoslavganov@google.com> Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev
ac70b2d1722fd3ad94b2bf1e8c7695bded56987a 16-Jan-2015 Craig Mautner <cmautner@google.com> Merge "More debugging for bug 18201239." into lmp-mr1-dev
66c4a824b9b11a47c7bd1bf858d92fe207409ab9 16-Jan-2015 Craig Mautner <cmautner@google.com> More debugging for bug 18201239.

Fixes bug 19045133.

Change-Id: I2ef2b8600278ed91df59db4acf4740dac970ee3a
ndroid/app/ActivityThread.java
90312d808f4a5181b5cb99c78e64b7e5d1465895 16-Jan-2015 Ricardo Cervera <rcervera@google.com> am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2287879039556ad3c8fce58974e2396b4a2dab45 16-Jan-2015 Ricardo Cervera <rcervera@google.com> am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
893d6fe48d37f71e683f722457bea646994a10bf 16-Jan-2015 Svet Ganov <svetoslavganov@google.com> Fixing a memory leak: activities are leaked.

TextLine was not fully cleared before recycling it which leads to
activity leaks if the activity happens: to register a text watcher.

bug:19045507

Change-Id: Ife0f7ce29865bd30ca2dfe8795023f51f275d659
ndroid/text/TextLine.java
93f94c2ca5bf23533fc5a9bd70a4795584d20618 16-Jan-2015 Ricardo Cervera <rcervera@google.com> resolved conflicts for merge of e8f6bd48 to lmp-dev

Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
97c4ba9862006e2c9f4cea07f55dc7120d305e5a 04-Apr-2014 Ricardo Cervera <rcervera@google.com> docs: Added info on noHistory and onActivityResult().

Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
ndroid/app/Activity.java
ndroid/content/Intent.java
e8f6bd484627e16fa2fd9509b0f06056ee44be94 16-Jan-2015 Ricardo Cervera <rcervera@google.com> am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
98f07d901492335f51258655fbfa032fa3f2d58e 16-Jan-2015 Ricardo Cervera <rcervera@google.com> am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
92cf3608b8f171f84f74ab1f7193a6a816063d14 16-Jan-2015 Craig Mautner <cmautner@google.com> Merge "Debug for bug 18201239." into lmp-mr1-dev
9776ad41b900c6c7da0a3b6baf91b609be27f9b9 15-Jan-2015 Craig Mautner <cmautner@google.com> Debug for bug 18201239.

Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
ndroid/app/ActivityThread.java
77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1 15-Jan-2015 Alan Viverette <alanv@google.com> Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev
03748a5707fe3d1f071226ea3caf571abdc0d25d 15-Jan-2015 Alan Viverette <alanv@google.com> Ensure scroll assets are drawn with correct opacity

Bug: 18903443
Change-Id: I5a7e738b1a09c22857683e2540c96a050b82866e
ndroid/widget/ScrollBarDrawable.java
9787039d91ad23805a1e73e1cd973b85295b85c2 15-Jan-2015 Roozbeh Pournader <roozbeh@google.com> Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev
a9f9c4b90a8af25974bc74971efeafa521073df2 15-Jan-2015 Nicolas Prevot <nprevot@google.com> Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
b96a6916f657c4b3f5da7a5d2d8d32dee4d6167c 15-Jan-2015 Dianne Hackborn <hackbod@google.com> Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev
2ffe412b0eb8f53043356fe50dc4ceb04d267fa2 12-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Rerun entitlementcheck on sim change.

Only run if entitlement is needed and tethering is running.

bug:18356505
Change-Id: Ifc50189bf573e4575f747975edcce093c4870356
ndroid/net/NetworkFactory.java
43a4a8c777fbb8f71540ac7fbe82674489ef557b 09-Jan-2015 Christopher Tate <ctate@google.com> Fix redundant file backups

We'd observed a bug in which an unchanged file was nevertheless
being redundantly transmitted for backup on every backup pass.
The underlying issue turns out to have been the FileBackupHelper
base implementation's logic for diffing the prior-state file
set against the current state, in the case when there had been
deletions of prior files. In addition, there was also a
parallel bug in which file checksums were not calculated
properly in some cases, leading to at least one additional
redundant backup of the file in question.

Bug 18694053

Change-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0
ndroid/app/backup/BackupHelperDispatcher.java
7c0e7db67efda303a9964746dfcc7db243fb5fb4 15-Jan-2015 Roozbeh Pournader <roozbeh@google.com> Fudge getRightPaddingOffset in TextView to match clipRect.

A previous change (df68999dc7de3893ca80e4c736704dcc9ed94e35) adjusted
the clipRect slightly on the right side, but didn't adjust the
padding offset used in fading.

Bug: 18820846
Change-Id: I68c0918f914742d1e7b91f9ea8d5acbd41938233
ndroid/widget/TextView.java
0ee10f6d263e5476d0eb8f8ba82ff5cd522883e9 15-Jan-2015 Dianne Hackborn <hackbod@google.com> Fix issue android-app doc, bump battery stats checkin version

Issue #18983662: API Reivew: clarify Intent docs for URI_ANDROID_APP_SCHEME
Issue #19019830: Bump up battery stats checkin version

Change-Id: I0bd8f32b9d8d5978bd01d421ea2232d20def340a
ndroid/content/Intent.java
ndroid/os/BatteryStats.java
42ebaa434f95417cbf55ef6975fab7cb9d27ab3e 14-Jan-2015 Nicolas Prevot <nprevot@google.com> Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev
2c1c5dd5ef75183101ec22d424b2d11f6b52b61b 12-Jan-2015 Nicolas Prevot <nprevot@google.com> Make documentation for cross-profile intent filters clearer.

Explain why FLAG_MANAGED_CAN_ACCESS_PARENT and FLAG_PARENT_CAN_ACCESS_MANAGED
have these names.
Also do not mention the disambiguation list since there is not always a
disambiguation list shown when resolving cross-profile intent filters.

BUG:18962528

Change-Id: Ibbb9505dcab7cf17d87435eff2cef3e745e95209
ndroid/app/admin/DevicePolicyManager.java
1a6dd2985ef1eab036f6fc77cf723e3f12832e93 14-Jan-2015 Wink Saville <wink@google.com> Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
54b1b1a07ad3edd1df060889aad453aa0e1cc79a 12-Jan-2015 Wink Saville <wink@google.com> StateMachine.dump produces no output sometimes.

If the content to dump is large no output is produced by dump. Change
back to using a loop and flush.

Bug: 18965342
Change-Id: Ibc33da8bfffd5f998a78df0e2d70ed8e8a0aa137
om/android/internal/util/StateMachine.java
9320e9f0a6af9269bc145ec7ab3d4b351f0614af 13-Jan-2015 Bryce Lee <brycelee@google.com> Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev
69c22e82e9c3e95f4689a57320de3199ffd29262 13-Jan-2015 Adam Powell <adamp@google.com> Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev
b14ed95647ff7c38869550606396d5b784eeece1 13-Jan-2015 Nicolas Prevot <nprevot@google.com> Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING

BUG:18983720

Change-Id: I3af3354f746cd2981cdb8ba2ed6cc380665249ee
ndroid/os/UserManager.java
6ab76bd434d587fecefd5801905b09bcd32b1661 13-Jan-2015 Nicolas Prévot <nprevot@google.com> Merge "Clarify docs for user restrictions" into lmp-mr1-dev
aa1008cba4b97a269f65f86534d994347b6cdeff 13-Jan-2015 Bryce Lee <brycelee@google.com> Update javadoc for DEFAULT_FEATURES deprecation.

Bug: 18983343
Change-Id: I10936e292edf9146e7acca231632fb704054215c
ndroid/view/Window.java
150514bd03312ab0a890cc040019cfbc73eb077c 08-Jan-2015 Amith Yamasani <yamasani@google.com> Clarify docs for user restrictions

Specify which restrictions are not relevant or behave differently
for managed profiles.

Bug: 18768578
Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2
ndroid/os/UserManager.java
71922de6c8e407ff24bb1a500cb53bb1a647c758 13-Jan-2015 Alan Viverette <alanv@google.com> Update docs for Window.setElevation(), apply changes immediately

BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
ndroid/view/Window.java
74bf065e43a3075ffcaf9fcdc1ef423a1e14b761 12-Jan-2015 Wale Ogunwale <ogunwale@google.com> Don't allow windows with invalid types to be added.

Bug: 18950225
Change-Id: Ia7ead72d036c7628e0a97f8fe9fef2a35525e4df
ndroid/view/ViewRootImpl.java
ndroid/view/WindowManagerGlobal.java
2b46774ff950270365238e12e4a336e2004500e2 09-Jan-2015 Jeff Sharkey <jsharkey@android.com> Merge "Guard against MountService throwing NPE." into lmp-mr1-dev
54f9b1eedc86a3066bedf3d8ea3e8ffbb83cb678 09-Jan-2015 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev
b3d4cb369e37b1b7e85832cc035226dc7cc8f380 09-Jan-2015 Dianne Hackborn <hackbod@google.com> Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi

FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
om/android/internal/util/FastPrintWriter.java
9708669b2fe8ae6aae4274d78d712c276b6fad40 08-Jan-2015 Jeff Sharkey <jsharkey@android.com> Guard against MountService throwing NPE.

Fall through to below logic and return null instead of crashing the
entire app. We already tell developers the value may be null.

Bug: 17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe
ndroid/app/ContextImpl.java
29cd7f19625a2a2a8528469e55f3aa495107b9e7 08-Jan-2015 Dianne Hackborn <hackbod@google.com> Fix issue #18827122: system server crashed on broadcasting...

...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
ndroid/os/BatteryStats.java
om/android/internal/content/PackageMonitor.java
om/android/internal/os/BatteryStatsImpl.java
b6ab098bad4b126eaaaa3aaa5a512fefc4e0749b 08-Jan-2015 Adam Powell <adamp@google.com> Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout

Add API for handling nested pre-processing of accessibility events
similar to nested pre-scroll or pre-fling. This allows custom views to
delegate a nested scroll to a parent via the accessibility system.

Use this functionality to allow opening the ResolverDrawerLayout via
accessibility commands.

Bug 18827274

Change-Id: Icd5a502605b78a861bb03e7b11923841a72eb9ab
ndroid/view/View.java
ndroid/view/ViewGroup.java
ndroid/view/ViewParent.java
ndroid/view/ViewRootImpl.java
om/android/internal/widget/ResolverDrawerLayout.java
bee49807dde9f19d5163e87b71fe17392bfe857c 08-Jan-2015 Christopher Tate <ctate@google.com> Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
574fa34dd53eec4cacc456296f69c12169b37ca8 07-Jan-2015 Ben Murdoch <benm@google.com> Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.

Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
ndroid/webkit/WebView.java
a517e81e2b1594da3e12c0547aabac5f357ce97b 07-Jan-2015 Paul Miller <paulmiller@google.com> Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev
8d46f934ca56e057182882034d796cc03e960c4d 07-Jan-2015 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
b89e1405cf9f1da533dc0843390a1b6783abb0f4 07-Jan-2015 Christopher Tate <ctate@google.com> Support single-package backup rejection by the transport

We now cleanly handle the case of the transport blacklisting specific
packages from key/value backup. Previously we would halt the entire
backup pass and reschedule if the transport returned any error from
performBackup(pkg). Now, we recognize the TRANSPORT_PACKAGE_REJECTED
result from that invocation, and properly drop that package's work
but proceed with running the rest of the backup queue as expected.

Bug 18694053

Change-Id: Id0dd6d59492bdea9f970540d776f37db0cc5d99c
ndroid/app/backup/BackupTransport.java
2bd01ebfa99815d4fb6b4e77754146a22cf66d03 06-Jan-2015 Deepanshu Gupta <deepanshu@google.com> am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev

* commit '7ed145493d3f5bea32c567980f77cc42f613197e':
Add preferences rendering.
f6bf1d7b30078adf4fb26a89f3b5988954c3287c 20-Dec-2014 Paul Miller <paulmiller@google.com> Fix crash on pasting text in a WebView

WindowDecorActionBar and Chrome's ContentViewCore each have their own ActionMode
reference. ActionModeImpl.finish() nulls WindowDecorActionBar's reference and
calls mCallback.onDestroyActionMode() to null ContentViewCore's reference. But
if the callback is deferred, there is a period when the ActionMode is finished
(and mCallback is null), but ContentViewCore doesn't know. ContentViewCore may
try to invalidate() the ActionMode, which will crash on the null mCallback.

Make ActionModeImpl more permissive so that calling invalidate() during this
period does nothing.

BUG:18758329
Change-Id: I407fa0e0cd3cffa217e165caed83130d44760316
om/android/internal/app/WindowDecorActionBar.java
941aac0c0753d41cf70437272538f51db2d50199 06-Jan-2015 Yin-Chia Yeh <yinchiayeh@google.com> Camera: doc update for color aberration modes

Code-gened document update for camera2 spec.

Bug: 18915494
Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
ndroid/hardware/camera2/CameraCharacteristics.java
9ffb53cb1131eeac5c246e7378455bb4b64293f5 17-Dec-2014 Paul Jensen <pauljensen@google.com> Clear process DNS NetID binding when expiring or releaseing legacy requests.

When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.

bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
ndroid/net/ConnectivityManager.java
7ed145493d3f5bea32c567980f77cc42f613197e 06-Jan-2015 Deepanshu Gupta <deepanshu@google.com> am 7081a114: Merge "Add preferences rendering." into lmp-dev

* commit '7081a114d4ee190c746f337057b0f84928c162dd':
Add preferences rendering.
4a5baeaec9294dbb43fe3b36a44b3176101756b6 06-Jan-2015 Deepanshu Gupta <deepanshu@google.com> Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
298071951210ae23c8023c4dc8f82da5d1760211 06-Jan-2015 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev
8c6b59f46da3e65ce157fe40a08f1c1fbba3e1c2 05-Jan-2015 Filip Gruszczynski <gruszczy@google.com> Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
b182955a1eabc30d3cf70856f838b46a91c34569 05-Jan-2015 Dianne Hackborn <hackbod@google.com> Fix issue #18901214: APR: Frequent crash in android

The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path. This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
om/android/internal/app/ShutdownActivity.java
1f3f47b3680547dbb764db173e02d833e12d65a2 05-Jan-2015 Alan Viverette <alanv@google.com> Merge "Avoid double-translating View background" into lmp-mr1-dev
b15703c9b4bd77383344a06c0043f5f7448b24ae 05-Jan-2015 Alan Viverette <alanv@google.com> Avoid double-translating View background

Reverse-translate the canvas before passing to Drawable.draw() so that
we don't double-apply the drawable's translation.

BUG: 18904688
Change-Id: I8450de9b240ddeae887b4e1003c0608da814a001
ndroid/view/View.java
748902420d26b2868296303be7df89d0c25b7f2b 05-Jan-2015 Alan Viverette <alanv@google.com> Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
fe568359340e58492e2ca1ebdab0f234b91e328a 05-Jan-2015 Filip Gruszczynski <gruszczy@google.com> Add system api for disabling touch events in wallpaper behind the window.

Bug: 18721756
Change-Id: I40b749a9916536d52042e5dd49a23575bedad754
ndroid/view/Window.java
5c2d8f7d51d5a944459ddc61034854c6cef7a639 05-Jan-2015 Alan Viverette <alanv@google.com> Don't override dialog icon drawable unless valid resource ID was set

Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.

BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
ndroid/app/AlertDialog.java
om/android/internal/app/AlertController.java
22a3163f1da8387e42c68c459f5667ac10744a3c 05-Jan-2015 Alan Viverette <alanv@google.com> Merge "Fix selector bug" into lmp-mr1-dev
dd508581216ef3ef47bd474316232f269db43f03 05-Jan-2015 Alan Viverette <alanv@google.com> Use min when comparing AM and PM text lengths

Also cleans up code a little to prevent unnecessary re-computation
of lower-cased strings and use final where possible.

BUG: 18874813
Change-Id: I852eb7a281aed64ac36e95f32f5fa410f50abfa4
ndroid/widget/TimePickerClockDelegate.java
e416d0f67bfed9c8a65573091016d49777c56e8f 05-Jan-2015 Jinsuk Kim <jinsukkim@google.com> CEC: Let MHL device be of type 'source'

MHL devices should be of type source that can stream AV contents
to the connected TV. This should be supported by the API
HdmiDeviceInfo.isSourceType().

Bug: 18897172
Change-Id: I7dcbd7773127bf26797c204504a12c3e2ebbd83b
ndroid/hardware/hdmi/HdmiDeviceInfo.java
f5b02eb7c43a96d3f70a3ecc81738b0dff86df13 18-Nov-2014 Deepanshu Gupta <deepanshu@google.com> resolved conflicts for a0bc2e7e to lmp-mr1-dev

The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.

This change also fixes the typo in the original change which was fixed
in a subsequent change.

Original commit: 12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a
fix for typo: cb09bc45c58740af953874f9915306d351fc3d9d

Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
ndroid/widget/TimePickerClockDelegate.java
a33424a540ea725d4b513ee713931c66e62721a2 30-Dec-2014 Michael Wright <michaelwr@google.com> Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev
e5ea48a7fe295a2815bab57f2e870901ce48b312 29-Dec-2014 Svetoslav <svetoslavganov@google.com> Fix a race in accessibility manager.

The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.

bug:18840784

Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
ndroid/view/accessibility/AccessibilityManager.java
446e019a06d632d9d65679e27c7e963b2c5179d2 22-Dec-2014 Michael Wright <michaelwr@google.com> Add MEDIA_PROJECTION_SERVICE to the ServiceName list.

This prevents our lint tooling from complaining that we're passing
invalid values when trying to get the MediaProjectionManager.

Bug: 18830590
Change-Id: I34633248e895b0ac7f5083e18a7d2385ca6f8adb
ndroid/content/Context.java
10bb1371dca38b5b59f083ee963f7987da6511f2 05-Oct-2014 Deepanshu Gupta <deepanshu@google.com> Add preferences rendering.

NO_SQ: Depends on updating layoutlib-api-prebuilt.jar
Change-Id: Iae93ab74c478e6f2158e1528467bec9ee2d7ee9b
ndroid/preference/Preference.java
ndroid/preference/PreferenceManager.java
2167b11de6f239d7f747d2e11897b6759232b8fd 20-Dec-2014 Chet Haase <chet@google.com> Fix selector bug

Issue #18784539 Row stays highlighted if I begin scrolling after the rows been highlighted in "About phone"

Change-Id: Ia91467d8fe64eec077f20af70eae0d5bb070c255
ndroid/widget/AbsListView.java
257ffbda601d287a0f5d54160a0b30be1b2ebe5e 19-Dec-2014 Svet Ganov <svetoslavganov@google.com> Remove a bad heuristic when determining click location for accessibility.

As a bride-gap solution to click on partially covered views in accessibility
mode we compute a point on the screen where to send a down/up event pair.
A heuristic we used was that if the action target is covered by a view that
that has a touch listener we consider the target obscured by the one with
the listener. However, this generates false positives, for example the target
is covered by a view that observers touches for scrolling but not clicking.

bug:18782023

Change-Id: I31ff34011d45667f1eddda47373ec00e4a23dbf6
ndroid/view/View.java
a320b2176c9e6a5b3f2c3fe6f80ca9b14e088e9a 18-Dec-2014 Winson Chung <winsonc@google.com> Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev
e494c382c0caf35f225dfb55f0e3b992c14d79f5 17-Dec-2014 Winson Chung <winsonc@google.com> Bug 18784289: Fix issue with transition animation callback.

This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback. This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.

Bug: 18784289

Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
ndroid/app/ActivityOptions.java
e2ed349cfa838223160e83be7df144e2265cdce4 18-Dec-2014 Winson Chung <winsonc@google.com> Merge "Removing context ref from AppWidgetHost. (Bug 18769791)" into lmp-mr1-dev
078ce5fc820d4744f5b1af384e427cedb7e90643 18-Dec-2014 Raph Levien <raph@google.com> Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev
047e816fe2e6c94ff425188c4b12f02921d3f5bf 17-Dec-2014 Raph Levien <raph@google.com> Revert "Change Linkify leniency to VALID"

This reverts commit 9dfe86d4102b93885b947917fccee35053cfc9f2.

That change moved the lenience from POSSIBLE to VALID, which eliminated
false positive links, especially 4 digit phone numbers, but caused
significant false negatives, leading to CTS test failures
(android.text.util.cts.LinkifyTest#testAddLinks7 in particular).

The true fix requires new functionality to validate phone numbers in
a mobile context. In the meantime, the best solution is to revert.

Bug: 18708556
ndroid/text/util/Linkify.java
cc4f18309a2a576b282a399a97a9d64d66713b89 17-Dec-2014 Jeff Davidson <jpd@google.com> Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev
7a96f3c917e0001ee739b65da37b2fadec7d7765 17-Dec-2014 Winson Chung <winsonc@google.com> Removing context ref from AppWidgetHost. (Bug 18769791)

Change-Id: Ieec1314ece219c178c140e572b031c94e83b8a93
ndroid/appwidget/AppWidgetHost.java
c3059b444fbd30b1344cd5ee3c7030d1e9e5c408 17-Dec-2014 Jorim Jaggi <jjaggi@google.com> Merge "Fix colored icons in doze mode" into lmp-mr1-dev
92df1f275831c23e3ed5b70d621a0c298e0bafea 16-Dec-2014 Jorim Jaggi <jjaggi@google.com> Fix colored icons in doze mode

Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.

Bug: 18537470

Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
ndroid/app/Notification.java
f2bd50b2ec0e5d7a25694170e0dc1363465fd24e 17-Dec-2014 Nicolas Prevot <nprevot@google.com> Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
fc7b4444629d9166e3fda7b28e96394356bcf56d 17-Dec-2014 Nicolas Prevot <nprevot@google.com> Fix the doc of addCrossProfileIntentFilter.

Mention that cross-profile-intent-filters only work for activity intents.

BUG:18776618

Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
ndroid/app/admin/DevicePolicyManager.java
0b22e395d24cba14d4113fb326bfcb57c6aa5996 17-Dec-2014 Christoph Studer <chstuder@google.com> Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev
4328588cb532571c3b11867048d0972ff2e4d969 17-Dec-2014 Christoph Studer <chstuder@google.com> am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs

* commit '3eff1e1f0e685e1dbb7e2621f5a8ab51a1c321d7':
Fix MediaStyle docs mentioning 2 max actions in compact view
3eff1e1f0e685e1dbb7e2621f5a8ab51a1c321d7 17-Dec-2014 Christoph Studer <chstuder@google.com> am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs

* commit '92c411b24eaa787158b19b209050ea35fc5070b6':
Fix MediaStyle docs mentioning 2 max actions in compact view
a20ca67d944a8a015206dcdec41eb87f55165358 16-Dec-2014 Jeff Davidson <jpd@google.com> Add global setting for ephemeral network timeout.

Bug: 18637384
Change-Id: I6bde3c9eef12caf2cc51c449abffc1c69f60c17f
ndroid/provider/Settings.java
0bb83b07d1602c1a99c938471edfc411a47dbffc 16-Dec-2014 Christoph Studer <chstuder@google.com> Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev
67af29f6d642c3c578ee1b5af70dc525955982a5 16-Dec-2014 Adam Powell <adamp@google.com> Merge "Fix touch intercept bug in ResolverDrawerLayout" into lmp-mr1-dev
c88b6bdcfada95447269b41d388fd7028dba574b 16-Dec-2014 Benjamin Franz <bfranz@google.com> Don't send the onServiceDisconnected callback after close.

Bug: 18667402
Change-Id: Ia029fd861d643f6646fb124d76ca2a1d2a1a695a
ndroid/bluetooth/BluetoothHeadset.java
ac2506c7e325b4e095405de155480a1abb3c4623 15-Dec-2014 Jay Shrauner <shrauner@google.com> Fix NPE in Transport.applyBatch

Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
ndroid/content/ContentProvider.java
f0af0ea33b6c10753c071c3881d5d50c79d90c72 15-Dec-2014 Adam Powell <adamp@google.com> Fix touch intercept bug in ResolverDrawerLayout

ResolverDrawerLayout could get into a state where it thought a drag
was in progress, but since there was no distance to drag it would
return false from onTouchEvent for ACTION_DOWN. This would cause it to
intercept all future touch events, blocking interaction with
ResolverDrawerLayout child views. This would only happen if none of
the child views wanted the initial ACTION_DOWN event and it ended up
being processed in the ResolverDrawerLayout itself, such as in
response to touching in empty space or on the title text, and if all
available options fit in view without needing to expand the drawer.

Fix this by only setting the dragging bit if we're going to claim the
rest of the touch events after ACTION_DOWN.

Bug 18563698

Change-Id: Iab2ec38528697c9ff36bbb08b1f1210a6879d5ef
om/android/internal/widget/ResolverDrawerLayout.java
9973643bfc123fcc73803542ef8cb74e243907ce 15-Dec-2014 Alan Viverette <alanv@google.com> Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev
2649c58b460c2cd841173a8db513a54180422330 15-Dec-2014 Alan Viverette <alanv@google.com> Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev
5c510ee551dd58d416578bc1247d672cfff84be8 15-Dec-2014 Christoph Studer <chstuder@google.com> Notification: Fix bigLargeIcon

Fix a bug in L where BigPictureStyle.bigLargeIcon never made it
into the notification layout.

Bug: 18735551
Change-Id: Ia72d1de8cca2e95df3a99aaffeaba31325f1d858
ndroid/app/Notification.java
0cecbc9c7208f918ddf9d117057649f6e132069f 12-Dec-2014 Alan Viverette <alanv@google.com> Avoid self-recursion if client calls init() from date listener

BUG: 18736166
Change-Id: Ibe04040356f4a3e4479ea55c53a0e167144ff877
ndroid/widget/DatePickerCalendarDelegate.java
cd305ae3ceef14dd5de807d75aa6167dfcd69c86 12-Dec-2014 Alan Viverette <alanv@google.com> Give accessibility delegate the first pass at handling ACTION_CLICK

Delegation is broken for widgets, but this fixes the most egregious issue
where TextViews that are top-level list items weren't handling CLICK
actions correctly. This will still need work, since now the focus action
won't run, but it's an improvement.

BUG: 18736135
Change-Id: I808ef628198946cc87f13c53d6245cd162a1e517
ndroid/view/View.java
ndroid/widget/TextView.java
7486bc1f5a8156e9b586ebb9c32ced218e668652 12-Dec-2014 Svet Ganov <svetoslavganov@google.com> Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
4357d4eabc375c392190cf2d1dfc3aeba9718ceb 12-Dec-2014 Kenny Guy <kennyguy@google.com> Merge "Don't show last used and profile button at same time." into lmp-mr1-dev
9a0799cf6b7289b8127ffcb22291f5baf21b4035 12-Dec-2014 Adam Powell <adamp@google.com> Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
250a141cbeb2b3ef560de3814cfc5338df476182 12-Dec-2014 Christoph Studer <chstuder@google.com> Fix MediaStyle docs mentioning 2 max actions in compact view

Bug: 18729304
Change-Id: Ica6b8ac47d7d38b1de62d64830256f66cbbdb225
ndroid/app/Notification.java
b8a2df10c938f1120f5c4a3c0d06aae4ed3f2281 12-Dec-2014 Kenny Guy <kennyguy@google.com> Don't show last used and profile button at same time.

UI for ResolverActivity doesn't support last used
activity and work/personal profile button at the
same time. So if work/personal button is present
disable last used.

Bug: 18730438
Change-Id: I7ae7319bbdeb9bcaab9d6d03f97dea17d07c6d7f
om/android/internal/app/ResolverActivity.java
c28fa2cdd4692faafc520972b71ddbac1feec4d3 12-Dec-2014 Esteban Talavera <etalavera@google.com> Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
6de72663fa7cba3aeac3968b9f892335c93a9457 11-Dec-2014 Esteban Talavera <etalavera@google.com> Take into account other profiles when deciding whether to show ResolverActivity

Show ResolverActivity even if there is only one target
on the current profile that listens to that intent,
if other profiles can also handle it.
Also, fix crash while trying to access out of bounds
element on the list.

BUG: 18701336,18713763
Change-Id: I3a5e9cc5c0eedb2792b8f6d8a5d4aa8ee9e1256b
om/android/internal/app/ResolverActivity.java
fde6f4d745dd3c00c8b9f6c363a2fd331fb61ba6 12-Dec-2014 Christoph Studer <chstuder@google.com> Fix MediaStyle docs mentioning 2 max actions in compact view

Bug: 18729304
Change-Id: Ica6b8ac47d7d38b1de62d64830256f66cbbdb225
ndroid/app/Notification.java
9fc96c5371c1ce62db40aee9b93482504b79769b 12-Dec-2014 Svet Ganov <svetoslavganov@google.com> Fix an edge case in computing click location in accessibility mode.

In accessibility mode to click a view we computed a point where to send
down and up touch events. The logic that computes where to send the
events was not clipping the bounds of the child to these of the parent.
As a result we wrongly computed we can send the events in a location
of the child that is outside of its parent, thus the click having no
effect or clicking the wrong thing.

bug:18672945

Change-Id: If9c452e7e5b196f699db33d37dbc6775d5d1622a
ndroid/view/ViewGroup.java
ff44188309fca037892d0ded64cfee04a3a71c42 11-Dec-2014 Alan Viverette <alanv@google.com> Merge "Improve time picker accessibility" into lmp-mr1-dev
f6ed526b3a02bac9c5912a9655e5890f332cefc6 11-Dec-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
433e715cc0040ce22a31964c71bff71b1fe1a14f 11-Dec-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix LEGACY YUV production and orientation.

Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
ndroid/hardware/camera2/legacy/SurfaceTextureRenderer.java
bde00a2b5c8c506b79e0724021a0711bde207c25 11-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Add toString in NetworkFactory." into lmp-mr1-dev
2122e14cca3edc5099b90d8768b34d7a0e9fe148 11-Dec-2014 Paul Jensen <pauljensen@google.com> Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
6b746b5e142a26629f8cbe3f6e637be1ab775e81 10-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Add toString in NetworkFactory.

Needed some additional logging to track down this bug
so add toString to capture the state.

bug:18569575
Change-Id: I4047b8f8797bac09bcff31e99d9cb117abb04df4
ndroid/net/NetworkFactory.java
35da41e6c35e1c6af3afe29d6ec41609ab07ca33 11-Dec-2014 Adam Powell <adamp@google.com> Have ViewGroups without a parent clip child visible rects to bounds

getChildVisibleRect was enhanced to obey the official contracts for
clipping children and clip to padding. Unfortunately this meant that
ViewGroups with no parent have no way of checking if they will be
clipped to their own bounds and therefore should clip a child rect.

Treat orphaned view subtrees as entities that clip to the root view
bounds to preserve prior CTS guarantees.

Bug 18642973

Change-Id: I9fcbeb0e92cd6715cd9184183d36889614ed0bed
ndroid/view/ViewGroup.java
1353df5655a551cbbf403d4f1f88b72761fe9e6b 11-Dec-2014 Dianne Hackborn <hackbod@google.com> Fix issue #18706195: Improve label names of memory types

Change-Id: Ia11153300e04aecd56baca9d4316ac362688d594
ndroid/os/Debug.java
e0bef71662d81caaaa0d7214fb0bef5d39996a69 10-Dec-2014 Paul Jensen <pauljensen@google.com> Fix several HTTP proxy issues with multinetworking.

1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
not just the default network.
2. When a process is bound to a particular Network, update the proxy
system properties to those for the bound Network, and keep them
updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.

bug:17905627
bug:17420465
bug:18144582

(cherry-pick of https://android-review.googlesource.com/#/c/115170)

Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
ndroid/app/ActivityThread.java
ndroid/net/ConnectivityManager.java
ndroid/net/IConnectivityManager.aidl
ndroid/net/Network.java
ndroid/net/ProxyInfo.java
e6ec07fc5d7ce7732f63b6da73d3cc9e207df69f 10-Dec-2014 Alan Viverette <alanv@google.com> Always call onDateChanged() when the date picker selection changes

BUG: 18703635
Change-Id: I2f71aa2e3e053cc8afd1bb84641a9fb29de89c72
ndroid/widget/DatePickerCalendarDelegate.java
3fc00e3139706c2c90f8e7261eef48086887dc11 10-Dec-2014 Alan Viverette <alanv@google.com> Improve time picker accessibility

Overrides click action description for TimePicker hour/minute selectors
and manually specifies traversal order for radial time picker nodes.

BUG: 17468036
Change-Id: I4472b42a95d762085d7a4d382feb2b9216c0d41c
ndroid/widget/RadialTimePickerView.java
ndroid/widget/TimePickerClockDelegate.java
6bdbae07cf9b3929dca471072bea7001f7996efb 10-Dec-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
7a17e0b601c7f65a2ae0b53d8494ae1722c7a28b 10-Dec-2014 Craig Mautner <cmautner@google.com> Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
33cd463bbbbe47010ed44815fbfd0ab5e8fbf825 10-Dec-2014 Erik Kline <ek@google.com> Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev
e37030505ee3d461508611e1a291aff7b9e82a43 09-Dec-2014 Patrick Tjin <pattjin@google.com> Add recovery kmsg to dropbox

Bug: 18642766

Change-Id: I10e4532904a3a8cac43bec7630b9a7a90c2424ba
Signed-off-by: Patrick Tjin <pattjin@google.com>
om/android/server/BootReceiver.java
80b1c5608ec9cbb43c696d772eb69a2e220ef819 10-Dec-2014 Dianne Hackborn <hackbod@google.com> Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...

...testCallActivityOnNewIntent test fails with LMP-MR1 Release.

Check for null.

Also fix some small issues with converting intents to/from intents.

Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14
ndroid/app/Instrumentation.java
ndroid/content/Intent.java
73bdf9761be2abdd85efc5fce165f3fa80fcfa65 10-Dec-2014 Craig Mautner <cmautner@google.com> Add put/getBoolean/Array to PersistableBundle

Due to popular demand the methods putBoolean(), getBoolean(),
putBooleanArray() and getBooleanArray() have been added to
PersistableBundle.

Fixes bug 18390436.

Change-Id: Id133ba902aca774f98529e36ce560e873b88ad5b
ndroid/os/BaseBundle.java
ndroid/os/Bundle.java
ndroid/os/PersistableBundle.java
om/android/internal/util/XmlUtils.java
0fd06a19bdc56fec8eb736d248abb56fe5a2727d 10-Dec-2014 Andre Eisenbach <eisenbach@google.com> Prevent NullPointerException in getStringValue if no value is set

Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
ndroid/bluetooth/BluetoothGattCharacteristic.java
4f1942d999c60fd91cb826651b6d978d47a74321 10-Dec-2014 John Reck <jreck@google.com> Merge "Teach AssetAtlas about more drawables" into lmp-mr1-dev
3ef5033cdacbc44702d0b6ba687e81383348e2fd 10-Dec-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev
dad7d84c04c5954b63ea8bb58c52b2291f44b4df 09-Dec-2014 John Reck <jreck@google.com> Teach AssetAtlas about more drawables

Bug: 18317479

Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
ndroid/view/ThreadedRenderer.java
0aac16bbf1fd122302f8e58b7d4d5ee9d6afebc5 09-Dec-2014 Elliott Hughes <enh@google.com> am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs

* commit 'b034de7eefc82a951bbf36a65b304f9475e1b44c':
Fix typo.
14c436897ca56800a3758008f0631c559a898967 09-Dec-2014 John Reck <jreck@google.com> Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev
c47c98be04d602f331e0ea9704d2c11f8c53852d 09-Dec-2014 John Reck <jreck@google.com> Fix issue with RNA destruction mid-animation

Bug: 18521508

Fix an issue where an RNA's native object was destroyed
before the java-side object was started

Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
ndroid/view/RenderNodeAnimator.java
f4a637d0be2e028d1e78c8bf90ad17ec3f84b5f3 21-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.

Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
ndroid/hardware/camera2/legacy/GLThreadManager.java
ndroid/hardware/camera2/legacy/LegacyCameraDevice.java
ndroid/hardware/camera2/legacy/RequestThreadManager.java
ndroid/hardware/camera2/legacy/SurfaceTextureRenderer.java
b034de7eefc82a951bbf36a65b304f9475e1b44c 09-Dec-2014 Elliott Hughes <enh@google.com> am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs

* commit '12f100def9e34a554df07f47badc259028ac4c68':
Fix typo.
12f100def9e34a554df07f47badc259028ac4c68 09-Dec-2014 Elliott Hughes <enh@google.com> am e8f6cb06: Merge "Fix typo." into lmp-docs

* commit 'e8f6cb065c33c21dfefe0039739dc38fde5cff6d':
Fix typo.
c3642ef5c8582193f26b3875cebd902253709d5e 09-Dec-2014 Adrian Roos <roosa@google.com> Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev
2ae3805efb920ee032535aad6599049e49525048 09-Dec-2014 Adrian Roos <roosa@google.com> Revert "Add overscan insets to surface frame dimensions in WallpaperService."

This reverts commit a2838dfc2c1c49b6638a59e82cd8758624efd660.

Bug: 18630625
Bug: 18659737
Change-Id: Ic02930e0200498289b781436cda1da6e4e1752bb
ndroid/service/wallpaper/WallpaperService.java
547b0acae14981581d050c2c3d674cc06f1c3cf5 09-Dec-2014 Elliott Hughes <enh@google.com> Fix typo.

Bug: https://code.google.com/p/android/issues/detail?id=78422

(cherry picked from commit 0adcf15ad8b41559b50b3cbde6a103582f8c95b8)

Change-Id: I62746a0690e9845b20b23b91f2a50d85214e8aa1
ndroid/net/LocalServerSocket.java
15b29ac7faf3b8b7845e6623f68ae7a7391dab78 09-Dec-2014 Wink Saville <wink@google.com> Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6 09-Dec-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev
1a4b5a4f02e7d8ff8ff645377d97e6062d36aeaa 09-Dec-2014 Dianne Hackborn <hackbod@google.com> Work on issue #18640385: Add procstats test mode

You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
ndroid/os/Debug.java
25c5e2b12d5d5d06739e3f70a0da968d97935b46 09-Dec-2014 Mathieu Chartier <mathieuc@google.com> Add more -d dalvik details to dumpsys

Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
Dalvik Details
.Heap 2264 2264 0 0
.LOS 80 80 0 0
.GC 144 144 0 0
.Zygote 331 196 0 2428
.NonMoving 540 540 0 0
.IndirectRef 20 20 0 0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
ndroid/os/Debug.java
7781647aa90d7d7a070ecd79e52c2d8a11b59b5c 09-Dec-2014 Alan Viverette <alanv@google.com> Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev
11a68e18039b6bb2b67c5f7a82fa13d60583b2c3 09-Dec-2014 Alan Viverette <alanv@google.com> Fix auto-advance regression in radial time picker

If autoAdvance is set, we need to always fire the listener. We should
create a separate callback for auto-advance, but this is a minimal fix.

BUG: 18654878
Change-Id: Ie7b8a3ff91761325a508f580b27fa3b08f7b4e16
ndroid/widget/RadialTimePickerView.java
4df65bf1eb454814954421403da9f8b5fcb82180 09-Dec-2014 Jeff Sharkey <jsharkey@android.com> Merge "Direct notification of network interface changes." into lmp-mr1-dev
6973634ce61ab7d4c1d51c70be6d51725b89e7b9 08-Dec-2014 Jeff Sharkey <jsharkey@android.com> Direct notification of network interface changes.

Connectivity broadcasts recently changed and are no longer sent for
certain types of network changes. For example, when stacked network
interfaces change for a mobile network. To ensure that we pick up
all these details, directly wire the two services together.

Also remove some unused code for split network types.

Bug: 18666753
Change-Id: I0467bd5b330c0e0cb51af2306d821b41ad16337a
ndroid/net/INetworkStatsService.aidl
ndroid/net/NetworkIdentity.java
ndroid/net/NetworkTemplate.java
882a1e89742607a3f1fdaa8f5bbd0eb894fc0150 08-Dec-2014 Alan Viverette <alanv@google.com> Merge "Let host view handle long-press when using drag-to-open" into lmp-mr1-dev
db82c9e00ee9eefab68f6b8fff5db60736583490 08-Dec-2014 Alan Viverette <alanv@google.com> Merge "Fix regression, don't NPE if Switch doesn't have a thumb set" into lmp-mr1-dev
381a423634a293d53f972a0ce4abd7fe7cf7d703 08-Dec-2014 Svet Ganov <svetoslavganov@google.com> Merge "When accessibility on cannot click on a view covered by a HorizontalScrollView" into lmp-mr1-dev
e232d4a6aadbd32cb80ffd0da9a5d164910b1b79 08-Dec-2014 Svet Ganov <svetoslavganov@google.com> Merge "Clear clicked nodes from the accessibiliy cache." into lmp-mr1-dev
01a09630060eccc471ba3d8d83b34a602871d5c1 08-Dec-2014 Alan Viverette <alanv@google.com> Fix regression, don't NPE if Switch doesn't have a thumb set

BUG: 18670202
Change-Id: Iecb3498032c121c007ec87740ddebadb8e71c7a3
ndroid/widget/Switch.java
298536b1a0873de211f8ab4588ec2acfb75f29f9 04-Dec-2014 Alan Viverette <alanv@google.com> Let host view handle long-press when using drag-to-open

BUG: 18605860
Change-Id: I75850138614f17cf728d4411c142a07bdf15d085
ndroid/widget/ListPopupWindow.java
f1792c4219fb341a59c4b90c0ce5dd6e0e7b87f0 08-Dec-2014 Alan Viverette <alanv@google.com> Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev
b942b6f15c51c2ff48c59d8f620ee6156d00f67e 08-Dec-2014 Alan Viverette <alanv@google.com> Fix hotspot coordinate propagation in ViewGroup and AbsListView

There was a weird disconnect between setPressed() and hotspot propagation
behavior. This makes hotspot propagation work like setPressed(). Also
fixes ripple animation during drag-to-open.

BUG: 18631557
BUG: 18593243
Change-Id: Id4adf5d815e4d426b4182aac4d0c780f04472ae4
ndroid/view/View.java
ndroid/view/ViewGroup.java
ndroid/widget/AbsListView.java
a8fb580379b83b7fc76ee5b99149bbc8a2ce44ab 08-Dec-2014 Jeff Sharkey <jsharkey@android.com> Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
3256601f5e4d94713f59e97b9d4912875c1bdcaf 03-Dec-2014 Jeff Sharkey <jsharkey@android.com> Offer to "merge" subscribers for data usage.

There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective. This is done by extending the template used for
matching purposes to support multiple subscribers.

Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included. When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.

This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface. Also correctly create default policies for multi-SIM
devices. This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent. (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)

Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
ndroid/net/IConnectivityManager.aidl
ndroid/net/NetworkIdentity.java
ndroid/net/NetworkMisc.java
ndroid/net/NetworkPolicy.java
ndroid/net/NetworkState.java
ndroid/net/NetworkTemplate.java
om/android/internal/util/ArrayUtils.java
530052a2fe3b6a6a4246ce28ab0ced647fe7f470 30-Nov-2014 John Spurlock <jspurlock@google.com> Zen: New behavior for built-in downtime + nextalarm conditions.

- Downtime: Allow user to enter downtime early, offer as an end
condition four hours before downtime starts. Available in
either none or priority, regardless of settings configuration.
- Downtime: Always exit before next alarm if zen=none.
- Downtime: Make more like any other condition provider, remove
special status (mostly).
- Downtime: New auto-triggering rules, allow triggering after a
manual condition ends, once.
- Decouple NextAlarm + Downtime providers, allow them to offer
their conditions at the same time.
- Downtime/NextAlarm: Update conditions if they change while being
requested, even if unsubscribed.
- Make all three built-in condition providers optional, via config.
- New internal helper for runtime config.
- Don't follow changes to next alarm, consider the condition false.
- Isolate downtime calendar logic into separate class (for testing).
- Allow a:bb -> a:bb as a valid downtime range (all day).
- Volume dialog: configuration establishes maximum number of visible
conditions, including built-ins.
- Zen mode panel: avoid widget updates during layout transition.
- Zen mode panel: move controller callers to background thread.
- Zen mode panel: hide/show/rebind rows instead of adding/removing.
- ZenLog: Add downtime autotrigger results.
- Volume panel: Smarter refresh on ringer/zen changes.

Bug: 16373455

Change-Id: I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
ndroid/app/INotificationManager.aidl
ndroid/app/NotificationManager.java
ndroid/service/notification/ZenModeConfig.java
8f29dcfb53350cf687112ac79a806e4d34dfa22b 08-Dec-2014 Erik Kline <ek@google.com> Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.

Since optimistic addresses are useable upon kernel notification
there is no need for this extra connectivity delay.

---

This functionality was originally submitted in ag/572619. Owing
to issues with bind()ing to optimistic addresses (see b/18609055)
this was reverted in ag/598673.

This reverts the revert. :-)

Bug: 17769720
Change-Id: Ibee490b2af72050693b6bd748193f51e312ca527
ndroid/net/ConnectivityManager.java
ndroid/provider/Settings.java
1edc73aa5dc24db39ec685f1950c5110699e301e 06-Dec-2014 Jeremy Joslin <jjoslin@google.com> Merge "Don't send the same PendingIntent more than once." into lmp-mr1-dev
0322100598e3afae207bb98202b9ce53604bdb28 06-Dec-2014 Svet Ganov <svetoslavganov@google.com> Clear clicked nodes from the accessibiliy cache.

Nodes that are clicked can change state as a result of a click,
e.g. a check box. The accessibility service may decide to get the
source node from the click event to probe its state and get a
cached state since the window content changed event is after the
click one. Therefore, we have to clear the state of the click
event's source from the cache to ensure the client can query the
latest state of that source.

bug:18625975

Change-Id: I9e339c2fdcf74f260bb8ad86b9b873f7ddd75f19
ndroid/view/accessibility/AccessibilityCache.java
7929484dbf0f6eda75641f8b965d3ed5fa1fed52 04-Dec-2014 Jeremy Joslin <jjoslin@google.com> Don't send the same PendingIntent more than once.

Fixing a bug where a NetworkRequest's PendingIntent can be sent more
than once when networks are rematched before the intent completes.

Added a small delay before removing the request to give the receiving
client an opportunity to put in its own request. The delay value is
configurable via Settings.Secure.

Bug: 18614074
Change-Id: Iac7c5e5a04f42f2b6794e9e22349cc631bebeab7
ndroid/provider/Settings.java
0029f0ac36c28b60d59d3d70d148ba3136971b95 05-Dec-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev
1e01d16982e6b22ec4c0e2d6dc1e261eb6f92c8e 05-Dec-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17323751: Additional items in aggregated battery stats

- Now aggregate number of times each process has crashed and ANRed.
- Now aggregate total number of connectivity changes.
- Now record connectivity changes in the history.

Crash and ANR counts are new entries at the end of "pr" in checkin.

Connectivity change counts is a new entry at the end of "m" in checkin.

Connectivity changes in the history checkin are Ecn and include the
type of connection and its state.

Change-Id: I0c01186446034cf6c3fb97d45f5e3b5c69a0438a
ndroid/os/BatteryStats.java
ndroid/util/Log.java
ndroid/util/Slog.java
om/android/internal/app/IBatteryStats.aidl
om/android/internal/os/BatteryStatsImpl.java
b3fa2787eabd2be6d7780e215db0d9a5904ba47c 05-Dec-2014 Svet Ganov <svetoslavganov@google.com> When accessibility on cannot click on a view covered by a HorizontalScrollView

In accessibility mode we send down and up events activate a view. We will later
switch to accessibility actions but for now as a bridge-gap we compute a point on
the screen where to click for activating the view. The heuristic we use has edge
cases such as a view that handles all touch events but does not have any listeners.
In this case we do not ignore the target view's area covered by a view that handles
all touch events. As a result we click on the wrong target. While we cannot solve
this generically, in the case of standard components such as HorizontalScrollView
we can.

bug:18612258

Change-Id: If8482aac0d0ea53c5c90367d099d1b8d3a4559ed
ndroid/view/View.java
ndroid/view/ViewGroup.java
ndroid/widget/HorizontalScrollView.java
2ff214b603939af60cae11727e189eb350b34c39 05-Dec-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev
0aaf843c8cdcbcce9f491bf8734a4b75fec2ad6b 05-Dec-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Fix docs build" into lmp-mr1-dev
b81ce34af33ce940846e71878279f9482037cb39 05-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
4a9cecb1f0bb6f5f949f33c5f07be6d995f4cf24 05-Dec-2014 Justin Harrison <astyrrian@google.com> Merge "Add UUID for Pbap client" into lmp-mr1-dev
f4eac129545fd583d33d9e7ab05cc87f61079bb9 05-Dec-2014 Eino-Ville Talvala <etalvala@google.com> Camera2: Add HDR scene mode for backwards compatibility.

To maximize backwards compatibility, support the HDR scene mode fully,
as it was supported on Camera HAL1 / Camera API1.

Bug: 18639933
Change-Id: I35c164563379f7f820b42c674bd91f706061170c
ndroid/hardware/camera2/CameraMetadata.java
ndroid/hardware/camera2/CaptureRequest.java
ndroid/hardware/camera2/CaptureResult.java
22afe6261aab343070b63c60a1f4c7ce6f4383f9 05-Dec-2014 Fyodor Kupolov <fkupolov@google.com> Merge "Added isRemovingAdmin method" into lmp-mr1-dev
5a5afe010d2f8fb7e8f00858b8a305b4745c0469 05-Dec-2014 Eino-Ville Talvala <etalvala@google.com> Fix docs build

Change-Id: I9947d53aeb155d98f5194c9789f19aba1f01e4be
ndroid/animation/ValueAnimator.java
36ffb0494dd1045c164b7479b68165e206f8c759 05-Dec-2014 Wink Saville <wink@google.com> Add subId as parameter for get/setDataEnabled.

Bug: 18279333
Change-Id: I2496a2fd92b154e5e6981cbf6b5b5939cda59122
ndroid/net/ConnectivityManager.java
e660e27603e93579b645544ceb9606ded81cea82 05-Dec-2014 Erik Kline <ek@google.com> Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"

This is the revert of ag/572619.

This reverts commit 9261d9d64548f0221de50eb99f3675488a4176a4, reversing
changes made to 32b61ab28f54e5b00f472b2166f9b1100375e4ff.

Bug: 18609055
Bug: 17769720
Change-Id: I122eba200f2071d4e5777ec34c1d04fb567345a8
ndroid/net/ConnectivityManager.java
ndroid/provider/Settings.java
fb967585cc43937a88b0ed9a5e434a50b0a498b9 05-Dec-2014 Benjamin Franz <bfranz@google.com> Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
26af8c197c17487ac0400a7a3310037e57eda2a0 05-Dec-2014 Filip Gruszczynski <gruszczy@google.com> am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev

* commit '26b187711fdf6224e14df465a58f30f510011b49':
Private Window flag to disable touch events in WallpaperService.
238efad04bfd144942b363c8589004ba831f3c63 05-Dec-2014 Raph Levien <raph@google.com> Merge "Change Linkify leniency to VALID" into lmp-mr1-dev
96fb932666539e2b3be26ef91eb248a9ace5678e 02-Dec-2014 Fyodor Kupolov <fkupolov@google.com> Added isRemovingAdmin method

Added isRemovingAdmin method, so that clients can query if device
admin is currently being removed.

Bug: 17609838
Change-Id: I82547a9eeb228fcf8ac2a6e639ca1a75fa41d161
ndroid/app/admin/DevicePolicyManager.java
ndroid/app/admin/IDevicePolicyManager.aidl
3a0d878ab56475276c61d574af7651820a5cea5a 04-Dec-2014 Svetoslav <svetoslavganov@google.com> Ensure all events from a showing window are dispatched.

Accessibility services may opt-in to introspect the interactive
windows on the screen. If window introspection is enabled there
is a case where some events from a showing window are received
before the updated window state from the window manager. Now the
window manager sends over the windows before notifying the app
for the focus change.

bug:18625996

Change-Id: Ic481e01efbe12dc92f090f799feeb236672fc7b3
ndroid/view/Window.java
0a77897bb6671220fe9d53964ccd2651216dc7ba 05-Dec-2014 Chet Haase <chet@google.com> Merge "Fix seeking behavior" into lmp-mr1-dev
f4e3bab9253bba2c0086c35f4e5a1f7e41324876 03-Dec-2014 Chet Haase <chet@google.com> Fix seeking behavior

A recent fix to seeking behavior injected a couple of issues that need
to be addressed:
- the start time should be updated when seeking so that future calculations
that depend on it (such as the next animation frame) will use the updated
start time based on this seek request. This allows, for example, seeking
into a running animator so that that animator will update its current fraction
to the new seeked value.
- calling reverse() on an unstarted animation would incorrectly set the initial
frame of the animation to the end value for one frame before the reverse animation
actually began.

Issue #18567716 No icons in folders in battery saving mode
Issue #18511989 Search bar flashes when icon is picked up and dropped

Change-Id: Ie30b7e797468c6ccb3d17d4fb3aba6b9849436b0
ndroid/animation/ValueAnimator.java
b8c0694ae883b0e14beab97c947a7c121c64dda6 05-Dec-2014 Filip Gruszczynski <gruszczy@google.com> Private Window flag to disable touch events in WallpaperService.

Change-Id: I18b46340f89cbea0b6daeb1efe9c31656f4e1a5d
ndroid/view/WindowManager.java
8485098fa22a61f845cb2abbc5bc856b15835a9e 04-Dec-2014 Zhentao Sun <robinvane@google.com> Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
9dfe86d4102b93885b947917fccee35053cfc9f2 04-Dec-2014 Raph Levien <raph@google.com> Change Linkify leniency to VALID

The linkify logic used POSSIBLE as its leniency setting, which resulted
in false positives such as 4-digit years being interpreted as phone
numbers. Changing to VALID as per recommendation of libphonenumber
people, which fixes this problem.

Bug: 18489494
Change-Id: I77d330285de46de2fdda22daed41392106ec6ddd
ndroid/text/util/Linkify.java
2f0e6f0c7f52427ff542ebb9a28aa489a0f1f909 04-Dec-2014 Raph Levien <raph@google.com> Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev
0e3c5e827235911d33312e431975533f046421e7 04-Dec-2014 Raph Levien <raph@google.com> Fix off-by-one error in computeEllipsis

In the Truncate.MIDDLE case, when the line is less than half the layout
width, the computeEllipsis logic could go past the left edge of the
string. This patch fixes the off-by-one and avoids the resulting index
out of bounds crash, and also changes the behavior so that when
ellipsizing at the middle, the string to the end of the paragraph is
taken into account.

Bug: 18508627
Change-Id: I24be09c23a5aa158791a9717419307613b8a22e8
ndroid/text/StaticLayout.java
6b54d38a2c859f1c2cc176d1d9a33837cfc351db 04-Dec-2014 Wale Ogunwale <ogunwale@google.com> Merge "Add support from restoring recent's backup." into lmp-mr1-dev
93d47b4c05585c37117ac5ac44d810de63f9d008 04-Dec-2014 Craig Mautner <cmautner@google.com> Merge "Avoid system server crash due to package removed" into lmp-mr1-dev
18795a2299fefd88ee16393f22324b999ace6ce4 03-Dec-2014 Wale Ogunwale <ogunwale@google.com> Add support from restoring recent's backup.

Bug: 15986349
Change-Id: I899f81d317fcd5277a75db7ba50ecca14112df26
ndroid/app/ActivityManagerNative.java
ndroid/app/IActivityManager.java
om/android/server/backup/SystemBackupAgent.java
ff5e5db319785d23d672af95ac2dff3f37827cfd 04-Dec-2014 Prerepa Viswanadham <dham@google.com> Fix BT crash due to unset value for BluetoothGattDescriptor from API user

Validate writeDescriptor and writeCharacteristic methods at API invocation
for non null initialisation.

Bug 18395071

Change-Id: I411a57b77981310d8db1f98c67e03b4327c93339
ndroid/bluetooth/BluetoothGatt.java
e8b98925d08f720c4d22b626d0650de536840a9a 12-Nov-2014 Benjamin Franz <bfranz@google.com> Change the routing path of bluetooth headset connections.

The HeadsetService is now bound directly by the BluetoothManagerService.
The IBinder object related to the HeadsetService is then given back to
the BluetoothHeadset and to the client app. This change makes the
HeadsetService available for managed profile clients.

Bug: 16968338
Change-Id: I016d1837e4f987c0fab1fc2c64cb06eb91b24d87
ndroid/bluetooth/BluetoothHeadset.java
ndroid/bluetooth/IBluetoothManager.aidl
ndroid/bluetooth/IBluetoothProfileServiceConnection.aidl
4d9da135caf8d4f38bb728343c1aabbf45f81d5b 04-Dec-2014 Derek Sollenberger <djsollen@google.com> Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev
9261d9d64548f0221de50eb99f3675488a4176a4 04-Dec-2014 Erik Kline <ek@google.com> Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
dfa34cd517dfb794e31598211ed0fc8a419ddc28 31-Jul-2014 louis_chang <louis_chang@htc.com> Avoid system server crash due to package removed

Cherry-picked from aosp.

Fixes bug 18593178.

Symptom:
When application is not responding, an ANR dialog will shown.
In certain timing, user uninstall the application when the ANR
occurs, but before ANR dialog shown. The system server will crash
when looking up the errorReportReceiver because the package is removed.

Here shows how the exception occurs.
java.lang.IllegalArgumentException: Unknown package: app.package.name
at com.android.server.pm.Settings.getInstallerPackageNameLPr
at com.android.server.pm.PackageManagerService.getInstallerPackageName
at android.app.ApplicationPackageManager.getInstallerPackageName
at android.app.ApplicationErrorReport.getErrorReportReceiver
at com.android.server.am.ActivityManagerService.startAppProblemLocked
at com.android.server.am.ActivityManagerService.makeAppNotRespondingLocked
at com.android.server.am.ActivityManagerService.appNotResponding

Change-Id: Iced4287bd44dc25b1db2c1e3a583892eb6c041a2
ndroid/app/ApplicationErrorReport.java
109ec376da86de1275f73fa432d6344431a457e9 04-Dec-2014 Cheuksan Wang <edwang@google.com> Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c 04-Dec-2014 John Reck <jreck@google.com> Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
758f45217d9b7d257258ea41aa53f6364ac13918 04-Dec-2014 Christopher Tate <ctate@google.com> Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
4cc80a758c3e4f044c2e53b6210df0e515536a1b 03-Dec-2014 Zhentao Sun <robinvane@google.com> Fixed a leak in GeofenceHardwareImpl.java.

Bug: 18542685.
This CL includes two changes:
* Fixed a leak of DeathRecipient when geofences are removed from the
hardware.
* Avoid creating more DeathRecipient than needed. Use the underlying
binder object instead of the callback object to tell if they are the
same. So if the client passes the same callback instance to
GeofenceHardwareImpl, only one DeathRecipient is created.

Change-Id: I7809e4bc04df4f9e3590de98a03178b276c821ea
ndroid/hardware/location/GeofenceHardwareImpl.java
d23f8b44d575dcdc00965aae5fffd97f0336df43 03-Dec-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev
f696efa206089bde1274d972239ffb5a8185f613 03-Dec-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev
31f25696d950dd54e8b339074b98ad6335738f2f 03-Dec-2014 Christopher Tate <ctate@google.com> Adjust wallpaper-restore acceptance criteria

Previously the dimension check had implicit orientation sensitivity.
We now make sure to compare the candidate image's width to the smallest
screen dimension for acceptance purposes; this fixes cases when we would
e.g. get a restored image of (1680x2560) but believe that we needed it
to have a max width of 2048, even though it had originated on that same
device -- due to current-orientation issues.

Bug 18448052

Change-Id: I64ca6a4ed91ce1ccc04f5a9a6851e5cfe511b7c7
ndroid/app/backup/WallpaperBackupHelper.java
01a5ea35fbba4c5bb1d7790ae1677a2fa752e042 03-Dec-2014 John Reck <jreck@google.com> Resume RT-animations after a pauseSurface

Bug: 18203577

The issue occurs as a result of performTraversals() both doing
a window relayout call *and* early-returning because it's not dirty.

To fix this pauseSurface() returns whether or not the RT-side is
"dirty" to force ViewRootImpl to do a draw even if mDirty is
otherwise empty.

Change-Id: I534f367e75d18d273ebf14df3927f5c464ef6bef
ndroid/view/HardwareRenderer.java
ndroid/view/ThreadedRenderer.java
ndroid/view/ViewRootImpl.java
381343088f964b6428c483f741424a50ef41cb49 03-Dec-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera: update antibanding spec" into lmp-mr1-dev
932c33214729fe2d2b09f82ef60a72871f182654 03-Dec-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Fix docs per API review." into lmp-mr1-dev
08a125562c9af620e83e9f96c7810eae871d6067 03-Dec-2014 Eino-Ville Talvala <etalvala@google.com> Revert "Camera: Add new capability flags as system features as well"

This reverts commit 6aee1d2ba52cf7f44c9355f279844b8a937903da.
But leaves in some of the improved documentation.

Bug: 18281970
Bug: 18573576
Change-Id: I320f2229456ac039bc8f3cd8bc8b4ea6cf0e80eb
ndroid/content/pm/PackageManager.java
7ab0ad1ffe858dbf82d5c3b540c02488f31c51f0 24-Nov-2014 Etan Cohen <etancohen@google.com> Add a global override for VoLTE calls (which leaves user setting in place)

Bug: 18446228
Change-Id: I7d07f066e5933c2aeecf9222bb54da69975099bc
ndroid/provider/Settings.java
9e956e9b9aefa3eb30dd2268f7fd347c42e43bce 03-Dec-2014 Sreeram Ramachandran <sreeram@google.com> Fix docs per API review.

Bug: 18573918
Change-Id: I639fe2ce40cdef57d904b9ad1ebb28db7d057144
ndroid/net/VpnService.java
f29d5a5b211786248d0557157c304c5fff428bd4 03-Dec-2014 Derek Sollenberger <djsollen@google.com> Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.

bug:18306529
Change-Id: I1ea94df1dcaf4fcf248b63dc8b0a13f36412570a
ndroid/view/GLES20Canvas.java
1bc177c58550514c6e48d74061392b4247a9bf6a 03-Dec-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17948584: Application crash and phone restart when app...

...is installed with <provider> with empty string.

Don't allow empty authorities, just like we don't allow null authorities.

Change-Id: I5c64592a639efe4dba848bd6f0efe4257f1565a2
ndroid/content/pm/PackageParser.java
de9848c641e1b1e0f73e5655c3f8c0c3b34a011c 03-Dec-2014 Winson Chung <winsonc@google.com> Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev
ef44c0514d497a789dca4731da61a2cf49bb3289 03-Dec-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev
7b7c58b3842d47c4c8df4876e2e2248c58477d97 03-Dec-2014 Dianne Hackborn <hackbod@google.com> Work on issue #18572506: AppOps in-memory state is invalid after...

...uninstalling updates to a system app

Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.

Also introduce more features to the appops command, which are useful
for testing this.

Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
ndroid/app/AppOpsManager.java
om/android/internal/app/IAppOpsService.aidl
dc99c50427ec700fa4b4191b92f0132cf7238c4b 03-Dec-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Make StatusBar display all default networks." into lmp-mr1-dev
f675cad8f5f5781a29ccd733570d90bae3fe8d84 03-Dec-2014 Filip Gruszczynski <gruszczy@google.com> am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev

* commit '6e854ce5728086b3bd293cb37bd83ebeef52aca8':
Add overscan insets to surface frame dimensions in WallpaperService.
6e854ce5728086b3bd293cb37bd83ebeef52aca8 03-Dec-2014 Filip Gruszczynski <gruszczy@google.com> Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev
a2838dfc2c1c49b6638a59e82cd8758624efd660 03-Dec-2014 Filip Gruszczynski <gruszczy@google.com> Add overscan insets to surface frame dimensions in WallpaperService.

Bug: 18595832
Change-Id: Ia5a03cc5e059153d76907627ee0811b0851e35ed
ndroid/service/wallpaper/WallpaperService.java
4eb2e04f4d3eafdf56840a0988dd730dc433478d 03-Dec-2014 Alan Viverette <alanv@google.com> Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev
9752428dc1829450e90417ca3e46d077e915ae90 03-Dec-2014 Alan Viverette <alanv@google.com> Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

Using CURRENT isn't always safe.

BUG: 18557273
Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2
ndroid/inputmethodservice/KeyboardView.java
ndroid/widget/TextView.java
561261d4442fb78b314c00f6b836fe7b1c387977 03-Dec-2014 George Mount <mount@google.com> Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev
740c3ac782675d190941b2ab1905e56f246c1b11 13-Nov-2014 Winson Chung <winsonc@google.com> Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)

Add a listener to listen for changes in the Task stacks to preload thumbnails from the
system. In addition, reduce the amount of synchronous work done in activity creation
and first measure/layout passes.

Change-Id: I8bd9155d7a05e89c190a20429acff69a17808208
ndroid/app/ActivityManagerNative.java
ndroid/app/IActivityManager.java
ndroid/app/ITaskStackListener.aidl
a6f8b2ce552debde1f8a1ea673d689f96c56d67b 03-Dec-2014 Alan Viverette <alanv@google.com> Deprecate one-arg getDrawableForDensity, update currents.txt

BUG: 18579576
Change-Id: I7df6ec2952ab121e2be8ae0a016ccf36f6fba2ff
ndroid/content/res/Resources.java
c10e3960d9107f8663daa842ac57dedded4736e3 02-Dec-2014 Alan Viverette <alanv@google.com> Deprecate Resources.getDrawable(int) in favor of the two-arg version

This is a landmine for developers. If they need to obtain an unthemed
drawable, they should be using an explicit null theme.

BUG: 18579576
Change-Id: Ibca6b4c3e8e50dca144571244e035caec6fa91f8
ndroid/content/res/Resources.java
92692c0284c2249e9a5381f7f19ec97f6b76d12f 02-Dec-2014 George Mount <mount@google.com> Keep snapshot order matching the shared elements.

Bug 18578796

When no snapshot was created, we weren't adding anything to
the snapshot list. When a snapshot is not created, we should
add an null snapshot to the snapshot list to keep them in
order.

Change-Id: I522e485163229230037dcdd635b83cff800df28f
ndroid/app/ActivityTransitionCoordinator.java
221b545cdaba2522fbb299428ac048641410c284 02-Dec-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev
d537987b173f6b48f5196a2ae7d445af1a49e2bb 25-Nov-2014 Kweku Adams <kwekua@google.com> Changing AUDIO_TURNED_ON constant.

Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.

Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a
ndroid/os/BatteryStats.java
om/android/internal/os/BatteryStatsImpl.java
d5412e35801243e14123f2a0f03759073eb20fb6 02-Dec-2014 Ricardo Cervera-Navarro <rcervera@google.com> am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit '0ac703fc8f4569338acc823221089c62480f0d7c':
Sensor documentation fixes.
27ef018846fc88122bcb2c30ba86e99a5b3039d6 02-Dec-2014 Christoph Studer <chstuder@google.com> Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev
0ac703fc8f4569338acc823221089c62480f0d7c 02-Dec-2014 Ricardo Cervera-Navarro <rcervera@google.com> am 1108b845: Merge "Sensor documentation fixes." into lmp-docs

* commit '1108b845f940debde0c1959a9293cafdc264afcc':
Sensor documentation fixes.
1108b845f940debde0c1959a9293cafdc264afcc 02-Dec-2014 Ricardo Cervera-Navarro <rcervera@google.com> Merge "Sensor documentation fixes." into lmp-docs
a01a0faebfbe6a8bd2ae52c54268ecedd280509b 02-Dec-2014 Dianne Hackborn <hackbod@google.com> Fix issue #18510117: Returning from an activity started with...

...startActivityForResult causes SecurityExpcetion

The ReferrerIntent hack was becoming visible to apps, which caused
a mismatch between marshalling/unmarshalling of the IPC call.

Change-Id: Ibcb788327b5bae4426efc826551799fa87d1cbaa
ndroid/app/ActivityThread.java
ndroid/app/Instrumentation.java
403aa2684e0e93b4792aabc0bbe1f32ac5e417af 28-Nov-2014 Lorenzo Colitti <lorenzo@google.com> Make StatusBar display all default networks.

The basic principle is: if an app's traffic could possibly go
over a network without the app using the multinetwork APIs (hence
"by default"), then the status bar should show that network's
connectivity.

In the normal case, app traffic only goes over the system's default
network connection, so that's the only network returned.

With a VPN in force, some app traffic may go into the VPN, and thus over
whatever underlying networks the VPN specifies, while other app traffic
may go over the system default network (e.g.: a split-tunnel VPN, or an
app disallowed by the VPN), so the set of networks returned includes the
VPN's underlying networks and the system default.

Specifically:

1. Add a NETWORK_CAPABILITY_VALIDATED bit to NetworkCapabilities.
2. Add a hidden API to retrieve the NetworkCapabilities of
all default networks for a given macro-user.
3. Modify the status bar code that used getActiveNetworkInfo to
determine which network was active, and make it consider all
validated networks instead.
4. Because the set of active networks depends on which VPN app
the user is running, make the status bar re-evaluate the
networking situation when the active user changes.

Bug: 17460017
Change-Id: Ie4965f35fb5936b088e6060ee06e362c22297ab2
ndroid/net/ConnectivityManager.java
ndroid/net/IConnectivityManager.aidl
ndroid/net/NetworkCapabilities.java
81defc6a840367dcf9591d14b827f2d8d756ef00 02-Dec-2014 Chris Craik <ccraik@google.com> Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev
1f32c65697c22f423c2888cf4c53da1c95d602c1 26-Nov-2014 Christoph Studer <chstuder@google.com> NoMan/SysUI: Clear LEDs only when entering the shade

Don't clear notification LEDs when seeing notifications on the
lockscreen.

Also fix a bug where the LED didn't continue flashing after
the screen turned off.

For devices with doze capability, ensure that the LED continuing
to flash after screen off doesn't cause an immediate pulses, but
delay the first pulse by 10s.

Bug: 15449039
Change-Id: Id34d51a2c91ceaf069e49add1ab690bb855f9638
om/android/internal/statusbar/IStatusBarService.aidl
fbeeac8266c190afba084cfc1164385ff5020fce 02-Dec-2014 Paul Crowley <paulcrowley@google.com> Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev
2934b266e507ddda7d64201be7850af4589b9c9e 02-Dec-2014 Paul Crowley <paulcrowley@google.com> Add a tag to separate paragraphs in Javadoc

Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
ndroid/app/admin/DevicePolicyManager.java
a1a6c300afffebfb46e84dc1941f6bddca145a8f 02-Dec-2014 Andre Eisenbach <eisenbach@google.com> Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev
f27b52aaa75884a41ea687116ff3758125b94e39 02-Dec-2014 Erik Kline <ek@google.com> Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev
b72eb97e4bca1e4fd68e79f9d04e9a6a15aebd21 22-Nov-2014 Cheuksan Wang <edwang@google.com> new SMS/MMS carrier app API

Changes based on api council review

BUG: 18005911
Change-Id: I23bd207ce70f7fa201d6d964c1700cfc44cb009b
ndroid/service/carrier/CarrierMessagingService.java
ndroid/service/carrier/ICarrierMessagingCallback.aidl
ndroid/service/carrier/ICarrierMessagingService.aidl
ndroid/service/carrier/MessagePdu.aidl
ndroid/service/carrier/MessagePdu.java
ndroid/service/carriermessaging/CarrierMessagingService.aidl
ndroid/service/carriermessaging/CarrierMessagingService.java
ndroid/service/carriermessaging/CarrierMessagingServiceManager.java
ndroid/service/carriermessaging/ICarrierMessagingCallback.aidl
ndroid/service/carriermessaging/ICarrierMessagingService.aidl
ndroid/service/carriermessaging/MessagePdu.aidl
ndroid/service/carriermessaging/MessagePdu.java
498c84e7366cc0b4355f034bd03534a14beaf166 02-Dec-2014 Yigit Boyar <yboyar@google.com> Merge "Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev
4515f785878cb150bef467d40abc9d5b172570fe 02-Dec-2014 Alan Viverette <alanv@google.com> Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev
2180ba7abd7edbd5b3a880d15f828b58ab34e578 02-Dec-2014 Chris Craik <ccraik@google.com> Sync ViewOverlay size init with RenderNode

bug:18381202

Setting mRight/mBottom must be accompanied by updating the RenderNode.

Change-Id: I4dae06a5ca43247b0b3642d85808e2724e486692
ndroid/view/ViewOverlay.java
4cd577f0ac1df92ffbf196d1fb31a7124bbe2f51 02-Dec-2014 Adam Powell <adamp@google.com> Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev
88831a2a6f4c7dd47d6479ba107ce1a8045d3fa5 21-Nov-2014 Adam Powell <adamp@google.com> Make work profile apps easier to pick in ResolverActivity

Pull the "Work" profile item up out of the main list and into the
header of the resolver drawer, making it easier to discover and access
without disrupting the sort order of the list.

Bug 17935301

Change-Id: Id2d081b61828352c998e517127132f883a20b7ef
om/android/internal/app/ResolverActivity.java
002f918ceae416ba5c382de499ccff12e642c7b5 02-Dec-2014 Alan Viverette <alanv@google.com> Only send haptic events from time picker when time changes

BUG: 18572841
Change-Id: Iaa26e2f0804e301f8754e19a1d03dbd2142bf044
ndroid/widget/RadialTimePickerView.java
f17024873b10dabed069e502030dd85d6257c0c4 27-Nov-2014 Yuncheol Heo <ycheo@google.com> CEC: make it sure to send vendor commands when changing a setting.

- Remove 'oneway' from IHdmiVendorCommandListener.
- Add flush() method to HdmiCecController.
- Use IoThread for HdmiCecController.

Bug: 18495592
Change-Id: I497f7b49e94dd4402058ecc89cb5b7a3d58bf1e1
ndroid/hardware/hdmi/IHdmiVendorCommandListener.aidl
e6bd61d5bbea012b6b80c8bff915042f615630bc 01-Dec-2014 Alan Viverette <alanv@google.com> Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
997e632f59b070dabf71d9e807847c0643da92ac 01-Dec-2014 Wale Ogunwale <ogunwale@google.com> Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
015b9e56d4ad528dd406672ef6264c85e41a20fd 01-Dec-2014 Alan Viverette <alanv@google.com> Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
0cce5355b45d835f95a8918b8b803fd977d374e4 26-Nov-2014 Jeff Sharkey <jsharkey@android.com> Sanitize display names, keep extensions intact.

When creating or renaming files on external storage, sanitize the
requested display names to be valid FAT filenames. This also fixes
a handful of directory traversal bugs.

Also relax logic around generating display names to allow any
extension which maps to the requested MIME type. Tests to verify.

Bug: 18512473, 18504132
Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
ndroid/os/FileUtils.java
21d68f4808db02aa3252ba5dec8b0220d053cab3 01-Dec-2014 John Spurlock <jspurlock@google.com> Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
2187144408dbdb5322a2212fa2e68a5891ea60ca 01-Dec-2014 Chet Haase <chet@google.com> Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
e3f8b31466f45eb4d5c9971049b71215a9f2c8a4 01-Dec-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
5a25e5bae223bbee56dab75e36d1d947c8c3cb11 01-Dec-2014 Chet Haase <chet@google.com> Zero duration animations snap to end value when started

A recent change to seeking behavior altered the logic of
setCurrentPlayTime() (which is called when animations are first
started) to set the current animated fraction to 0 for 0-duration
animations. This fix ensures that 0-duration animations snap to
their end value (fraction == 1) instead, matching the behavior
prior to the seeking fix.

Issue #18542543 Animations with 0 duration stay in initial state when calling setCurrentPlayTime(0)

Change-Id: I9916d962cf46453a9e3e1207f58baf16f4a5830a
ndroid/animation/ValueAnimator.java
3e0770163686c1be83959d681976dafaf25272e1 29-Nov-2014 John Spurlock <jspurlock@google.com> Zen: Improve zen mode panel condition selection.

- Decouple condition requests from expansion, now
pre-request when zen panel unhidden.
- Animate zen mode panel expansion.
- Improve default selection logic, ensure something
is selected as soon as we are in the expanded state.
- Tweak visual spacing.
- Map null condition to Indef properly when we start
out in zen.
- Avoid unnecessary condition teardown when the conditions
are updated but unchanged from current.
- Cap number of optional conditions to display, default=3.

Bug: 18335618

Change-Id: I007b7c3b2e75e2b42805af240684aa8581e9951a
ndroid/service/notification/Condition.java
bcc1087af40a0e1bb35dbe8a39c830ecdea8280b 28-Nov-2014 John Spurlock <jspurlock@google.com> Volume: Improve inline volume controls used in settings.

- Make the system internal ringer mode change signal available to
other system components via a standard intent, instead of a
volume-controller-only binder call.
- Update sysui to use new intent for icon policy.
- Add proper muting state to the volumizer, to look more like
the associated volume panel slider.
- Add basic ringer mode state tracking for the notification-ring
slider setting.

Bug: 17899613
Change-Id: Ie2df52edb070055ef59c74039162a0e785d2fdbb
ndroid/preference/SeekBarVolumizer.java
ndroid/preference/VolumePreference.java
1d184acefa7105592134edebf7de4d77843d5791 27-Nov-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 7377998d to lmp-mr1-dev

Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
9b35b801fb90e31c1dff5535715e505f3a1e26fb 27-Nov-2014 Eino-Ville Talvala <etalvala@google.com> Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
d26276d9e39ed9d96102d41977de972d884bb7cd 27-Nov-2014 Alan Viverette <alanv@google.com> Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked

BUG: 18541882
Change-Id: I2ba4611e08ba08667ef5ee4fb556d1c9075ca6d2
ndroid/app/TimePickerDialog.java
ab2cf6dafe1dbc9e7533562f146087901e79f389 26-Nov-2014 Alan Viverette <alanv@google.com> Fix visible rect computation for views with padding

Previously, the computation was double-counting the left and top padding
because it was treating the third and fourth Rect.intersect() arguments
as width and height rather than right and bottom.

BUG: 18418091
Change-Id: I2ab669ee5060372ae11cfe804dcc05c7426be1ec
ndroid/view/ViewGroup.java
4c9c7a58837d0ea9622b2e7b8397eb2f795675b6 22-Oct-2014 Eino-Ville Talvala <etalvala@google.com> CameraManager: Separate service listener into a singleton

Currently, every CameraManager instance adds itself as a camera service
listener, which has the unfortunate side effect of keeping them all alive
indefinitely.

This is doubly unfortunate since every CameraManager keeps the Context it
was constructed with, and therefore may be leaking whole Activities along
with the CameraManager itself.

Break out a global per-process CameraManager which handles service
connection keepalive and availability listeners, so that local camera
manager instances can go out of scope as expected.

Bug: 18077200

Change-Id: I1be5fb8d3492131e98bb4a84121400d4abb2b9e1
ndroid/hardware/camera2/CameraManager.java
361ca21acc0831a9f8bbb259bb30218c252a2aa0 20-Nov-2014 Wale Ogunwale <ogunwale@google.com> Added unique id to display devices and their settings.

The display setting saved to disk were using a localized name for
the key. This is an issue if the user changes languages after the
display settings have been saved. We now use the non-localized
name for the display to access the settings if it is available,
else we fall back on the localized name.

Bug: 18190800
Change-Id: I837c06a8935df10727229a1aa2bb6eeb3953707f
ndroid/view/DisplayInfo.java
16bf846990293e1f19f042eed8e2ce5e7348ac5a 18-Nov-2014 Andre Eisenbach <eisenbach@google.com> Add server-side callback for change in MTU (4/4)

When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.

Bug: 18388114
Change-Id: I515bfc2cc9846490d57de71860f41ea9a61fa243
ndroid/bluetooth/BluetoothGattServer.java
ndroid/bluetooth/BluetoothGattServerCallback.java
ndroid/bluetooth/IBluetoothGattServerCallback.aidl
803a6dc080f883f95cc02f5c9ad850e73f8e76a8 26-Nov-2014 Jorim Jaggi <jjaggi@google.com> Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev
7377998dac67ce8d486e11b9bd2f159fe0ca501d 26-Nov-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of a42f7c1d to lmp-sprout-dev

Change-Id: I8e53c9d7e0014b4ffc621c561b737aa2dae5460c
0a310c99ee3217567f66578de2d2051e611d39aa 26-Nov-2014 Alan Viverette <alanv@google.com> Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev
8a45126a2986fd408dec7c531ee1cadb690aaffd 26-Nov-2014 Alan Viverette <alanv@google.com> Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev
5ce0ec0efd541362359bfead8e62ade80a0425ca 25-Nov-2014 Alan Viverette <alanv@google.com> Revert "Animates AbsSeekBar progress movement from key presses."

Incorrect implementation that broke the Brightness dialog slider. Reverting
to the previous behavior.

This reverts commit c5c9d0af764f590ae0031b5470192a0a08ca42d1.

BUG: 18510040
Change-Id: I201b1da46be964fcf6f041bb92ef79c335c2d23d
ndroid/widget/AbsSeekBar.java
ndroid/widget/ProgressBar.java
ndroid/widget/RatingBar.java
7265abe77a76f848a316640b5da106e882bdbc8a 21-Nov-2014 Christopher Tate <ctate@google.com> Be increasingly aggressive about fstrim if it isn't being run

The current heuristics depend on devices being alive at midnight+ in
order to run periodic background fstrim operations. This unfortunately
means that people who routinely turn their devices off overnight wind
up with their devices *never* running fstrim, and this causes major
performance and disk-life problems.

We now backstop this very-friendly schedule with an increasingly
aggressive one. If the device goes a defined time without a background
fstrim, we then force the fstrim at the next reboot. Once the
device hits the midnight+ idle fstrim request time, then we already
aggressively attempt to fstrim at the first available moment
thereafter, even if it's days/weeks later without a reboot.

'Available' here means charging + device idle. If the device never
becomes idle then we can't do much without rendering an in-use device
inoperable for some number of minutes -- but we have no evidence of
devices ever failing to run fstrim due to this usage pattern.

A new Settings.Global element (type 'long', called
"fstrim_mandatory_interval") is the source of the backstop time. If
this element is zero or negative, no mandatory boot-time fstrim will
ever be performed. If the element is not supplied on a given device,
the default backstop is 3 days.

Adds a new string to display in the upgrading dialog when doing
the fstrim. Note it is too late for this to be localized, but since
this operation can take a long time it is probably better to have
it show *something* even if not localized, rather than just sit there.

Bug 18486922

Change-Id: I5b265ca0a65570fb8931251aa1ac37b530635a2c
ndroid/os/storage/IMountService.java
ndroid/provider/Settings.java
b6e0cb97b7d8e4acf345efc8066f1587408b83e0 25-Nov-2014 Alan Viverette <alanv@google.com> Load SPEAK_PASSWORD from currently active user rather than self

Also fixes a typo in UserHandle's docs.

BUG: 18295054
Change-Id: I1f5384f84062b9ea7dcbebe1e5f64af331028d41
ndroid/inputmethodservice/KeyboardView.java
ndroid/os/UserHandle.java
ndroid/widget/TextView.java
b567aa893851161f7bc87ba3472904e6d53e2bd2 25-Nov-2014 Erik Kline <ek@google.com> Revert some verbose logging from ag/489226

Bug: 18171889
Change-Id: I582a17b2272746e04717ac8da1d6984ff187ddf6
ndroid/net/ConnectivityManager.java
ab954546dc49e1070ed8513efbddc8954b529c23 11-Oct-2014 Jim Miller <jaggies@google.com> Make IKeyguardService interface asynchronous

Add a state callback so lockscreen reports back whenever its state
relevant for PhoneWindowManager changed, instead of synchronously
calling into SysUI which can lead to deadlocks. Directly use
LockPatternUtils for isSecure, and optimize the number of calls to
this method to optimize layout performance.

Bug: 17677097
Change-Id: I5d491fc8884d4f84d9562626b9ea0d5eaa5166fc
om/android/internal/policy/IKeyguardService.aidl
om/android/internal/policy/IKeyguardServiceConstants.java
om/android/internal/policy/IKeyguardStateCallback.aidl
a7e87acb2416d4212c84fb9c45353dbf6ee15e6a 18-Nov-2014 Paul Crowley <paulcrowley@google.com> Add flag for wiping factory reset protection data.

Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
ndroid/app/admin/DevicePolicyManager.java
7b2cae6ceca680f6034a9fe43df2446cbae2f090 25-Nov-2014 Yin-Chia Yeh <yinchiayeh@google.com> Camera: update antibanding spec

Codegened doc change.

Bug: 18503791
Change-Id: I0e8c6ec5d4949923c0091222affdef8bbba59d58
ndroid/hardware/camera2/CameraCharacteristics.java
ndroid/hardware/camera2/CameraMetadata.java
ndroid/hardware/camera2/CaptureRequest.java
ndroid/hardware/camera2/CaptureResult.java
9be305d146fb422a0e65e5284af2ce081cdc6a69 25-Nov-2014 Adam Lesinski <adamlesinski@google.com> Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev
27fbf67644bed5d0d590458ad89cee38d8fddeaa 25-Nov-2014 Alan Viverette <alanv@google.com> Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev
8791a1e81a5a07b10b2be05fc6f3d94a71139c96 25-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev
d25eb9fbb9d659aab5e8ea25d16cb8bcb458a1a9 24-Nov-2014 Alan Viverette <alanv@google.com> Update documentation for DatePicker to reflect the new mode

BUG: 18508605
Change-Id: I23d45bf1cd7783fa6f397c15f0ba6802e4069d6b
ndroid/widget/DatePicker.java
760cfb02de1e547b2823bf2b9621ef5b953cc5bd 24-Nov-2014 Alan Viverette <alanv@google.com> Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev
aa6076701d1026cb5de0ed9a16b2b5a79a0f9d1b 24-Nov-2014 Adam Lesinski <adamlesinski@google.com> Make the Context service constant for UsageStats public

This was an oversight in L, where we did not make this
service constant public.

Change-Id: I42e38cb5ef8420cadc1a4a6705821189d911ccfe
ndroid/content/Context.java
88d2a3c0e1b4a8c53a489db5d627beb80b1b9957 23-Nov-2014 Jeff Sharkey <jsharkey@android.com> Introduce revision codes for split APKs.

Apps delivered as multiple split APKs must have identical package
names, version code, and signatures. However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.

This change introduces "revision codes" which can vary between
split APKs belonging to the same app. An install is valid as long
as the normal version code is identical across all splits. Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.

Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version. Also fix bug to enable inheriting from system apps
when adding splits.

Bug: 18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
ndroid/content/pm/PackageInfo.java
ndroid/content/pm/PackageInfoLite.java
ndroid/content/pm/PackageParser.java
ndroid/net/VpnService.java
7e0aaae3db11e0f23dca8c4cddff261f0132266c 24-Nov-2014 Alan Viverette <alanv@google.com> Check for null drawable in theme-less getDrawable()

BUG: 18507509
Change-Id: I64e2950dc3a30f3979ec179789a6f6e055c9f86d
ndroid/content/res/Resources.java
2b36a86b8ee4e8c0952494dd17b5e96ded22f2ee 14-Nov-2014 John Reck <jreck@google.com> Wire up surface width/height to lockHardwareCanvas DO NOT MERGE

Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
(cherry picked from commit b35c9602cf5c628c621e4fe102a461505f302bfe)
ndroid/view/Surface.java
5bbb1af74a40f60d6609c2b1c580cb91ffb12c54 24-Nov-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev
b5686d55963e76c801ca0581a1012c5f4aa8d009 24-Nov-2014 Jeff Brown <jeffbrown@google.com> am 3d110b23: Make WallpaperService watch the actual display state.

* commit '3d110b239153a6c7423a99f02ef859201205eee2':
Make WallpaperService watch the actual display state.
6d0e8711d0612cfc9d9db2def57541076c0f7a40 24-Nov-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Delete unused/non-working code." into lmp-mr1-dev
45e27327178be9d5524cfcbdde9bb83502668e46 24-Nov-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev
aaea7e81141f4feb6cf5804b815567247b9c1f3a 24-Nov-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev
702d9e31b1bcacff975a2b8e0d04160bbd6811ed 24-Nov-2014 Adrian Roos <roosa@google.com> Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
671424951dcd2a0d1059c6d899a8649cbc8b5e26 24-Nov-2014 Christoph Studer <chstuder@google.com> Merge "Fix MediaStyle API comments" into lmp-mr1-dev
e935fe918ed3f93fe6634d09652d4eb1c9d36aae 24-Nov-2014 Christoph Studer <chstuder@google.com> Fix MediaStyle API comments

Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
ndroid/app/Notification.java
962b06f9a02f08392b6f87225a314ebf39dd7a07 24-Nov-2014 Selim Cinek <cinek@google.com> Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
12c2136e556b54a717624d8479ec4650f363ce45 22-Nov-2014 Wink Saville <wink@google.com> Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
d09c4cad65c708f2c4810d24295456708a2000d2 22-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
ndroid/app/ContextImpl.java
ndroid/content/Context.java
ndroid/provider/CallLog.java
dfa99f63677c238453293f48b62b4fffcc101262 22-Nov-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
3d110b239153a6c7423a99f02ef859201205eee2 22-Nov-2014 Jeff Brown <jeffbrown@google.com> Make WallpaperService watch the actual display state.

Bug: 18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
ndroid/service/wallpaper/WallpaperService.java
om/android/internal/os/HandlerCaller.java
418c8549dca8bff8c38c67ed7f7d7fbbaccd4e71 22-Nov-2014 John Reck <jreck@google.com> Merge "It's super critical to call nStart" into lmp-mr1-dev
d052a9416ae3f7e42fc1e7de0740021df385ee48 22-Nov-2014 Dianne Hackborn <hackbod@google.com> Work on issue #18486438: Reduce size of bugreport output

Reduce how much stuff ProcessStats spews, and do collapsing of
repeated intent filter targets when dumping IntentResolvers.

Also add to pm's checkout output to include shared user ids,
and fix output formatting in a few places.

Change-Id: Ic9fc6731f0439101ba9343535e66cdbbad47e291
ndroid/service/wallpaper/WallpaperService.java
om/android/internal/app/ProcessStats.java
24c2a7e736611b257d077f7ce1c0a28563bc8c06 22-Nov-2014 Yigit Boyar <yboyar@google.com> Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar

Bug: 18440924
Change-Id: I7221532d003fd0208cf91a5ffd9be24a7695bd3d
om/android/internal/widget/ToolbarWidgetWrapper.java
72d6e4facb1abd81809fdaddbe42f41ad885189c 21-Nov-2014 John Reck <jreck@google.com> It's super critical to call nStart

Bug: 18204974

Even if we are canceling or ending an animation
nStart() *must* be called, otherwise the native-side listener
is not attached (lazy-attached for JNI cyclic reference reasons),
and then Animator::callOnFinishedListener() no-ops as there's
no listener set

Add a lifecycle verifier to ensure that nStart is always
called on animators that are attached and get finished

Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
ndroid/view/RenderNodeAnimator.java
efb2df698a4c2ed3d3371656cab199e5e3737fa9 21-Nov-2014 Amith Yamasani <yamasani@google.com> Merge "Different messages when wiping user and not device" into lmp-mr1-dev
29dc496a42d49a37dcd99c0465f3cec18a47e6ff 21-Nov-2014 Chris Craik <ccraik@google.com> Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
69e65019b0a6204f0ed9487d8fd7b3564eba6df8 21-Nov-2014 Chris Craik <ccraik@google.com> Revert "Add a way to override Xfermode DO NOT MERGE"

Feature no longer needed.

bug:18448377

This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
ndroid/view/GLES20Canvas.java
c0491a2e2d30eb4bc3e03fccee89d57e9bd575e4 21-Nov-2014 Jeff Sharkey <jsharkey@android.com> Merge "Lightweight checkin output for network stats." into lmp-mr1-dev
3a3d212a51974ccec6100c1e117225291edc83cc 29-Oct-2014 Amith Yamasani <yamasani@google.com> Different messages when wiping user and not device

There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed

Show different messages for almost wipe and wipe in each
of these 3 cases.

Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
ndroid/app/admin/DevicePolicyManager.java
ndroid/app/admin/IDevicePolicyManager.aidl
9ef94019386183cb88ad090965418ef294bbb79a 21-Nov-2014 Jeff Brown <jeffbrown@google.com> resolved conflicts for merge of 694c1d2b to lmp-mr1-dev

Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
ace33655bff514698b322253c211f0af5a3edd37 21-Nov-2014 Yigit Boyar <yboyar@google.com> Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev
d45cedd6f5efd141be08ce4ffcecf478fbedb056 21-Nov-2014 Bryce Lee <brycelee@google.com> Merge "Make default windows features configurable." into lmp-mr1-dev
d6e6e7235a7e5c82d64beada54ac89c2b1dec201 21-Nov-2014 Bryce Lee <brycelee@google.com> Make default windows features configurable.

Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
ndroid/view/Window.java
55a442e58262e253df965d652bd8219c8d1e72d3 19-Nov-2014 Jeff Sharkey <jsharkey@android.com> Lightweight checkin output for network stats.

Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag. Defaults to last 24 hours,
but included data can be tweaked with various flags.

Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."

Bug: 18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
ndroid/net/NetworkIdentity.java
ndroid/net/NetworkStats.java
ndroid/net/NetworkStatsHistory.java
ndroid/net/NetworkTemplate.java
5d3d53aa1361c094f05aa70129e49a04875ab5a6 21-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
c2c0beab79a907f63e109eefe2a5aabcf2e3fd8f 12-Nov-2014 Sreeram Ramachandran <sreeram@google.com> Allow VPNs to specify their underlying networks.

These are used when responding to getActiveNetworkInfo() (and cousins)
when an app is subject to the VPN.

Bug: 17460017
Change-Id: Ief7a840c760777a41d3358aa6b8e4cdd99c29f24
ndroid/net/IConnectivityManager.aidl
ndroid/net/VpnService.java
om/android/internal/net/VpnConfig.java
9c4a707912da2c954b2d3d1311b8a691ded8aa16 21-Nov-2014 Selim Cinek <cinek@google.com> Fixed several time related states for secondary users

The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.

Bug: 16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
ndroid/service/notification/ZenModeConfig.java
ndroid/text/format/DateFormat.java
ndroid/widget/TextClock.java
75f018e6a7c2280c62e686440000a1dcdf5179cf 19-Nov-2014 Sreeram Ramachandran <sreeram@google.com> Delete unused/non-working code.

Change-Id: I2cba9ffdb4ed547cb922d0ac08abf81e49ffa66b
ndroid/net/ConnectivityManager.java
ndroid/net/IConnectivityManager.aidl
21b5ee3f0e39be4a79bcfb2b79b0529f75f5cb58 13-Nov-2014 Sreeram Ramachandran <sreeram@google.com> Eliminate race conditions in UID-based network filtering.

The previous code retrieved information from the legacy tracker multiple
times for each user query, leading to race conditions where the info
could've changed between the calls.

Refactors the handling of legacy data types in ConnectivityService and
unifies call paths so that APIs that deal with legacy data types
(NetworkInfo and int/networkType) and newer types (such as Network) go
through common code paths, using NetworkState to hold all the necessary
data pieces. This enables follow-on bug fixes to getActiveNetworkInfo().

The changes are limited to public "query" APIs (those that retrieve some
network information or the other). More details about the specific
changes and their rationale can be found in the code review thread.

Bug: 17460017
Change-Id: I656ee7eddf2b8cace5627036452bb5748043406c
ndroid/net/NetworkState.java
07334334aab3863408325653ceccee47f9e1788d 21-Nov-2014 Zoltan Szatmary-Ban <szatmz@google.com> Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev
f8f56bce428bb2b89d1d572ccd2d604761dbbce8 20-Nov-2014 Adrian Roos <roosa@google.com> Fix DPM.resetPassword("")

While we're at it, also fix some multi-user issues in
LockPatternUtils.

Bug: 17496766
Change-Id: I8e557ea640fa589817c8f8f818c91463585d5ea7
ndroid/app/admin/DevicePolicyManager.java
om/android/internal/widget/LockPatternUtils.java
a83c5806ded083f51549ba4bf70e0c1f6a17fc61 21-Nov-2014 Filip Gruszczynski <gruszczy@google.com> Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
automerge: 96c5d37

* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
SwipeDismissLayout makes activity opaque only after entry animation ends.
6862361b506aa2301a0049067447199631b50410 21-Nov-2014 Matthew Xie <mattx@google.com> Add UUID for Pbap client

Bug: 18140961
Change-Id: I9cbeb7129b1d30aa7a195ed83821d4a5634283ed
ndroid/bluetooth/BluetoothUuid.java
ad064d48adcfac71bd04d9f3bb5ea9d607d132a7 21-Nov-2014 Christopher Tate <ctate@google.com> Merge "Recents backup helper" into lmp-mr1-dev
000973a163d7400a8f37b7b472acfa6144b0621b 21-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Camera2: Ignore unsupported face detection results in LEGACY.

Bug: 18261420
Change-Id: Ia50744326d7ade9c42292952c406c78d7f274769
ndroid/hardware/camera2/legacy/ParameterUtils.java
8ae8500365e71c59cbe96f600371391ac8d245b8 21-Nov-2014 Alan Viverette <alanv@google.com> Merge "Update scrollbars to match Material spec" into lmp-mr1-dev
69fe1e8e5fef5ceac9aa476995623fe80424019d 21-Nov-2014 Alan Viverette <alanv@google.com> Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev
28096c49d81ddcdde51627e9d396947efdc4f508 21-Nov-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev
24b1c23c62b3d8ca1d762a76b2f1ef6360fc683e 21-Nov-2014 Dianne Hackborn <hackbod@google.com> Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION

You now need to set a flag if you want this unsafe behavior.

Change-Id: I185e9a04e005e42a887c3d58a2818616790b060a
ndroid/content/Intent.java
199ea8c0c759d5993b23467f22f2bff120c93d38 21-Nov-2014 Alan Viverette <alanv@google.com> Update overflow menu alignment to match spec

BUG: 18417348
Change-Id: I5e4b1ca366c554bca33eac8e5403be6de72370f9
ndroid/widget/ActionMenuPresenter.java
694c1d2b2d9290d06607500e03851805e8b8e6d7 21-Nov-2014 Jeff Brown <jeffbrown@google.com> Merge "Support keeping activities resumed while dozing." into lmp-sprout-dev
fbe96706bb9754f9ea3f6345f32e058a45ad10b4 20-Nov-2014 Jeff Brown <jeffbrown@google.com> Support keeping activities resumed while dozing.

If the lock screen is not shown, then let activities keep running
while dozing. This is important to support ambient mode on watches
since it allows the home app to keep running.

To make this possible, we need to inform the activity manager about
the exact wakefulness state, not just the overall boolean
interactive state.

Bug: 18284212
Change-Id: Ia35c99127ce51ffc178f3a2f51fca67d24061c71
ndroid/app/ActivityManagerInternal.java
ndroid/os/PowerManagerInternal.java
7d5bcd7990704dd89c596a85429be661607b6dbc 21-Nov-2014 Alan Viverette <alanv@google.com> Update scrollbars to match Material spec

Adds a minimum touch target size to the fast scroller so that we can
edge-align an 8dp thumb but still maintain a 48dp touch target.

BUG: 18467743
Change-Id: I31e9cf1948856f5fce7d75383b84a9359684ebe5
ndroid/widget/FastScroller.java
4e9ea5e9aef8e35eaa5a876e726544277c80dec5 21-Nov-2014 Erik Kline <ek@google.com> Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev
83fb64e8ec4c6bc0930f50b24bd1c36a81f6a1c2 21-Nov-2014 John Reck <jreck@google.com> Merge "If the surface is lost, release it" into lmp-mr1-dev
6aee1d2ba52cf7f44c9355f279844b8a937903da 20-Nov-2014 Eino-Ville Talvala <etalvala@google.com> Camera: Add new capability flags as system features as well

Also add all the L and L MR1 new system features to the uses-feature documentation.

Bug: 18281970
Change-Id: I116ca3fd04cd90eb53cc696b6fa62488687e7740
ndroid/content/pm/PackageManager.java
0b2dac3452a58e76be7379b85e7505c531842b57 21-Nov-2014 John Reck <jreck@google.com> Merge "Rename callDrawGLFunction" into lmp-mr1-dev
18ab5c216c62d90a4b86f37a4c993c1c8b56835d 21-Nov-2014 Jaewan Kim <jaewan@google.com> Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev
680df8d60e3445bd14df902796079d730c283c46 20-Nov-2014 John Reck <jreck@google.com> Rename callDrawGLFunction

Bug: 18471503
Change-Id: I00cb356ff2338da7fd07b9ba30b5b3dcbdffdb2e
ndroid/view/GLES20Canvas.java
ndroid/view/HardwareCanvas.java
ndroid/webkit/WebViewDelegate.java
df84cb90df6f4a98c853dd61e858f62a584cdac5 20-Nov-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev
4e312d81c18b286170c904659e78cab4fdf27200 20-Nov-2014 Adrian Roos <roosa@google.com> Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev
af6e657ab873623ed0e94bc8bcf8ed03f6bbe167 20-Nov-2014 Adrian Roos <roosa@google.com> Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev
481a6df99fea124bc4354da34ff668750cdc9041 20-Nov-2014 Adrian Roos <roosa@google.com> Add device locked API for TrustAgentService

Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
ndroid/app/trust/ITrustManager.aidl
ndroid/app/trust/TrustManager.java
ndroid/service/trust/ITrustAgentService.aidl
ndroid/service/trust/TrustAgentService.java
ac6a3a5e9d90edb533e5b377a4a14ef514be955a 18-Nov-2014 Christopher Tate <ctate@google.com> Recents backup helper

Handles backup/restore of recent tasks for the system. Currently the
thumbnails are not saved.

At restore time the historical task records are placed in a designated
separate location rather than directly in the live bookkeeping; this
avoids ID duplication issues and makes it easier to deal with lazy
adoption of the historical task state as apps are installed on the
device post-restore.

Bug 17303286
Bug 15986349

Change-Id: Ie156c1e2ab9c9a7e7ac0447b27016fdcef55dded
ndroid/app/backup/RecentsBackupHelper.java
om/android/server/backup/SystemBackupAgent.java
50bfeec868157106e8b60abf8964cb24462af182 20-Nov-2014 Adrian Roos <roosa@google.com> Update KeyguardManager.isDeviceLocked API

Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
ndroid/app/KeyguardManager.java
ndroid/app/trust/ITrustManager.aidl
om/android/internal/widget/LockPatternUtils.java
816e19eb6d5795f98f072494c763b20fe3412c30 20-Nov-2014 Wink Saville <wink@google.com> Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
2d1ee982276f5dbd0e035778b731b48e4ef34515 20-Nov-2014 Wink Saville <wink@google.com> Revert "Additional changes to SubscriptionManager API as per API council."

This reverts commit baf21da1e17ef358632c078128d381b3be218a08.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
ndroid/app/ContextImpl.java
ndroid/content/Context.java
ndroid/provider/CallLog.java
4a57e908177c86819ade1ebb813677698f1a526a 20-Nov-2014 Wink Saville <wink@google.com> Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
825e0da22a672ada95da2175bb2d48579bf88a0d 20-Nov-2014 Adam Lesinski <adamlesinski@google.com> Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev
23d40c40aa70866e12ccba640a71bbbf8d492a87 20-Nov-2014 Adam Lesinski <adamlesinski@google.com> Fix race when cleaning up receivers/services in Context

Bug:18135575
Change-Id: I2c69c8189d9ebd297c8a83fe84658b26cbb0528f
ndroid/app/LoadedApk.java
f721ba0463a99364bd24d9ad29461007c803c412 20-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Camera2: Doc updates for aeExposureCompensation.

Bug: 18467471

Change-Id: I3c270c535fa5e7f3eb40bd699898a759c07d986b
ndroid/hardware/camera2/CameraCharacteristics.java
8ccf071ab83510c8ef7b4d311d894d5c4a352f6c 20-Nov-2014 Alan Viverette <alanv@google.com> Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev
d9968438bcf439e7a8c6058a95b85286a632dc1c 20-Nov-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue with call backs from media process." into lmp-mr1-dev
2bf6529bf8f81d1b9f0ff103f12d004937d0f59f 20-Nov-2014 Martijn Coenen <maco@google.com> Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev
3b2ba44be3699a4e133d7a09cb4ed182405d7ff9 20-Nov-2014 Chris Craik <ccraik@google.com> Merge "Improve logging around performance critical events" into lmp-mr1-dev
96c5d37fb5139465cdd3d882b5deba830497557a 20-Nov-2014 Filip Gruszczynski <gruszczy@google.com> Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
b13de07f0b26953115f4315bc7417ca87c70594b 20-Nov-2014 John Reck <jreck@google.com> If the surface is lost, release it

Bug: 18403246

Surface#isValid() is used throughout ViewRootImpl to
determine Surface validity. However, this will return true
until Surface#release() is called, even if the underlying
BufferQueue is abandoned. We have a very strong signal
from EGL that the Surface is now dead, so use that signal
to call Surface#release() so ViewRootImpl's isValid() usage
will be valid.

Change-Id: Ib355560ef4ca7625c3c784174863d2d55267d93d
ndroid/view/ThreadedRenderer.java
ndroid/view/ViewRootImpl.java
419754545ea0768a7fa715daddedef75b7b31bfa 20-Nov-2014 George Mount <mount@google.com> Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev
485ac7782ed7605507bf2186246f59c537f8b578 20-Nov-2014 George Mount <mount@google.com> Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev
90e9307e8fa713081aeccd8f5f212c0f1255bd07 18-Nov-2014 Erik Kline <ek@google.com> Rename EXTRA_NETWORK ConnectivityManager constants.

Per b/18414703:

s/\<EXTRA_NETWORK_REQUEST_NETWORK\>/EXTRA_NETWORK/g
s/\<EXTRA_NETWORK_REQUEST_NETWORK_REQUEST\>/EXTRA_NETWORK_REQUEST/g

Additionally, associated string values updated to:

android.net.extra.NETWORK
android.net.extra.NETWORK_REQUEST

Bug: 18414703
Change-Id: I7aeed2161829742affc666e835a97ce2c28356fe
ndroid/net/ConnectivityManager.java
d109a7cf695b1d208bd69ddb013b9fbdd5658255 19-Oct-2014 Jaewan Kim <jaewan@google.com> Add an API to check availability of Ethernet interface.

Bug: 18045481
Change-Id: I95358241b431cfe4435ce70c23c9a639b9dc4d58
ndroid/net/EthernetManager.java
ndroid/net/IEthernetManager.aidl
ndroid/net/IEthernetServiceListener.aidl
70850ea258cbf91477efa57a1f1a23cc0044cc93 18-Nov-2014 Chris Craik <ccraik@google.com> Improve logging around performance critical events

bug:17702227

Add details useful to developers (such as layer size/View name), and
switch away from logging implementation names/details, since they
are generally not relevant to developers.

Change-Id: Iee605d182f241450f7e75a6d0c283d51fa1312f5
ndroid/view/ThreadedRenderer.java
ndroid/view/View.java
7c9746d4ef8ab3c500b501ab32933c5172a856ab 20-Nov-2014 Alan Viverette <alanv@google.com> Move default token handling into WindowManagerImpl

BUG: 18451795
Change-Id: I1fc6db988ad879fded5318f33d08a4f09da38907
ndroid/accessibilityservice/AccessibilityService.java
ndroid/view/WindowManagerGlobal.java
ndroid/view/WindowManagerImpl.java
6c211ff43e1e8055ecd08d30fa8d7fdde04942ae 20-Nov-2014 George Mount <mount@google.com> Reset the transitionAlpha after the transition completes.

Bug 18423893

Change-Id: I2ea30c3b7c45eca70d1518e73f814b827f519fa0
ndroid/transition/ChangeTransform.java
baf21da1e17ef358632c078128d381b3be218a08 20-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
ndroid/app/ContextImpl.java
ndroid/content/Context.java
ndroid/provider/CallLog.java
85603a7faf0a8067803ae6424bc590f6e2a17e07 20-Nov-2014 Chet Haase <chet@google.com> Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev
b130d5961cb154e8821cfa42fdd820d67497d84d 20-Nov-2014 Alan Viverette <alanv@google.com> Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev
552eca1a713ab8f6c60d6ec0d350ef33813cd25b 20-Nov-2014 Alan Viverette <alanv@google.com> Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev
0d1c27a713cb49de8f6f4fd0a129baa883153921 03-Nov-2014 Chet Haase <chet@google.com> Fix seeking and scaled duration behavior

The animation scaled was not being factored in early enough in the
activity lifecycle. Also, setCurrentPlaytTime() was not accounting for
the scaled duration correctly. Finally, added setCurrentFraction() as
a more general-purpose seeking facility.

Issue #18222006 Animator duration scale ignored in some situations
Issue #17951668 add ability to seek fraction, not just time

Change-Id: Idad401f5ff5026d7046c36eee09d78a4793215dc
ndroid/animation/TimeAnimator.java
ndroid/animation/ValueAnimator.java
ndroid/app/ActivityThread.java
ndroid/content/Intent.java
ndroid/view/WindowManagerGlobal.java
a0bc2e7e3c2f075a23449df00659c96d0cddb417 20-Nov-2014 Deepanshu Gupta <deepanshu@google.com> am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev

* commit '455654cffdaebcbbd4fa33de5bb18fa2752d6c9a':
LayoutLib: Stub AM/PM keycodes in Time Picker.
455654cffdaebcbbd4fa33de5bb18fa2752d6c9a 19-Nov-2014 Deepanshu Gupta <deepanshu@google.com> Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev
ff17024e583b170312d82089fd358d278ce16c9a 19-Nov-2014 Dianne Hackborn <hackbod@google.com> Fix issue with call backs from media process.

All but a few lines of this is for issue #16013164, which allowed
apps to do some operations as the media uid by having it call
back to them to open a file. The problem here is with the tempory
identity stuff in the activity manager, allowing us to make the open
call as the original caller... ideally we should figure out a way
to just get rid of all of that, but the solution here is actually
easier (even though it doesn't look it) -- we now hand a token over
to the openFile() call that it can use when doing permission checks
to say "yes I would like the check to be against whoever is responsible
for the open". This allows us to do the uid remapping for only this
one specific set of permission checks, and nothing else.

Also fix issue #17487348: Isolated services can access system services
they shouldn't be able to. Don't send any system service IBinder objects
down for the first initialization of an isolated process.

Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
ndroid/app/ActivityManagerNative.java
ndroid/app/ContextImpl.java
ndroid/app/IActivityManager.java
ndroid/content/ContentProvider.java
ndroid/content/ContentProviderClient.java
ndroid/content/ContentProviderNative.java
ndroid/content/Context.java
ndroid/content/ContextWrapper.java
ndroid/content/IContentProvider.java
ndroid/provider/DocumentsProvider.java
2db3bf5c49ebcd56f02f10145aa40b2445f6be06 19-Nov-2014 George Mount <mount@google.com> Slide supports Gravity.START and Gravity.END.

Bug 18444396

Change-Id: Id7b82b44948e4501c2b4fb5302d22672fa20cd00
ndroid/transition/SidePropagation.java
ndroid/transition/Slide.java
6eafa902cbc15fa35f8f0dfb5e559673fa67f637 14-Nov-2014 Filip Gruszczynski <gruszczy@google.com> SwipeDismissLayout makes activity opaque only after entry animation ends.

Bug: 18340863
Change-Id: Ic60fa2463618f86b1ae23fc4a0c06cd348f28334
ndroid/app/Activity.java
ndroid/app/ActivityThread.java
ndroid/view/ViewTreeObserver.java
om/android/internal/widget/SwipeDismissLayout.java
b22462c57f35404f5b39680a9fb76165968d8faf 19-Nov-2014 Amit Mahajan <amitmahajan@google.com> Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev
76ea69b35e45f4b23dfb7b39c6cd790b00576526 19-Nov-2014 Nicolas Prevot <nprevot@google.com> Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev
98d5f04f91580bf8b517c17132eeb8d42008b61d 19-Nov-2014 Yigit Boyar <yboyar@google.com> Improve GridLayout's weight calculations

This CL improves the method by which excess space is distributed in GridLayout.
Previously, GridLayout would assume weights were arranged in a 'line' and
sum the weights in the assumed line to figure out the proportional allocation
to each view. The system involved running GridLayout's internal constraint
solver twice.

Behavior was unspecified (and surprising) when weights appeared in views
that were not linked together linearly, typically leaving the last view
in each axis with more space than expected (in GridLayout's Bellman-Ford
constraint solver, remaining space goes to the last span of the axis).

This CL changes the weight distribution mechanism to effectively integrate it
with the Bellman-Ford constraint resolution algorithm. It does this
by returning a boolean value from the constraint solver saying whether or
not the constraints could be solved and then using a binary chop to find
a maximum amount of space that can be distributed without violating the
constraints.

This implementation runs the solver log(<axis size> * <number of Views>)
times until finding the maximum amount of space that can be distributed according
to the weights without causing a contradiction. We expect the cost of this
variation to be around a factor of 10 worse than the previous implementation
but to provide a simple and general definition of space distribution via
weights that will be open to many future optimizations.

As a side effect, this CL also fixes a bug in GridLayout where remaining space
was distributed only along the major axis.

Bug: 17485996
Change-Id: I120f39e95e90b5b35072ef8a6c348ec541aae42a
ndroid/widget/GridLayout.java
a489f0b3d9007d94ba514bf4ce71ce9957147e33 19-Nov-2014 Alan Viverette <alanv@google.com> Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev
448ff718a0bb92c5b760668c12d2449a00f9aa2a 19-Nov-2014 Alan Viverette <alanv@google.com> Re-initialize data when changing time picker 24-hour mode

BUG: 18381313
Change-Id: Ie1fa9fbbf8edadfda71cf0ad4f1c39395e56ecc7
ndroid/widget/RadialTimePickerView.java
4fea0923be8d961312908aded2f72011a044903c 18-Nov-2014 Amit Mahajan <amitmahajan@google.com> Adding new setting LTE_SERVICE_FORCED.

Bug: 18328639
Change-Id: Icbf9d7987d27af34cbe4ee1b4e9df19e139c2fc7
ndroid/provider/Settings.java
cb8ed3705cd8f50d43ff4a0c5d91d545f28add7a 19-Nov-2014 Alan Viverette <alanv@google.com> Remove underline and search icon from ActionBar search view

BUG: 17396265
Change-Id: I751bc79538f1ea412192172035920e59351270f1
ndroid/widget/SearchView.java
735f22850edcb5c2447c37cb96f048de8a742907 19-Nov-2014 Rubin Xu <rubinxu@google.com> Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev
0455174d347bf451e830584bc3f6f35c3c560282 19-Nov-2014 Chris Craik <ccraik@google.com> Merge "Update clipToPadding docs" into lmp-mr1-dev
bde9ffbd56cb420b51f11ca05b5225c1953f048d 18-Nov-2014 Chris Craik <ccraik@google.com> Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev
6807e5f0feac3cfc85e9fe74378b94bc32a141c5 18-Nov-2014 Abhijith Shastry <ashastry@google.com> Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev
12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a 18-Nov-2014 Deepanshu Gupta <deepanshu@google.com> LayoutLib: Stub AM/PM keycodes in Time Picker.

TimePickerSpinnerDelegate doesn't need to deal with input when running
inside LayoutLib. So, we just return the keycodes as if it's running in
English locale.

Bug: http://b.android.com/79189
Change-Id: Ife0ae91a1e34a8dac379bc1dda1c1c8ed461c164
ndroid/widget/TimePickerSpinnerDelegate.java
37cdc191e380cca8edcc58f116b9b319bea1c140 18-Nov-2014 John Reck <jreck@google.com> Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev
3cf61d4b79a22f89b8fb839ef9ee2146fac4e703 18-Nov-2014 John Reck <jreck@google.com> Merge "Fix invalidateOutline" into lmp-mr1-dev
0925db87150300a679090a41f6eec26aad5c75e5 18-Nov-2014 Sander Alewijnse <salewijnse@google.com> Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev
ad6a99b32a0d062c967019e5cd9858071a9c6617 18-Nov-2014 Dianne Hackborn <hackbod@google.com> Add time estimates to batterystats dump.

Also fix some java docs.

Change-Id: Ie705f236db6f06e34fa5581c20852e5c8f7c2c17
ndroid/os/BatteryStats.java
ndroid/provider/Settings.java
a97855b784243c00b99dfcb6595164ab4a88d05c 07-Nov-2014 Rubin Xu <rubinxu@google.com> Remove permission check in DevicePolicyManager.isUninstallBlocked()

This is to allow Play to use this API to find out whether a package
is uninstallable due to profile or device owner policy's restriction.

Bug: 17914630
Change-Id: I4ce2963884ecdf3306805f36db80ed1ebf04d88f
ndroid/app/admin/DevicePolicyManager.java
68235e4dbca1a51fa7df7ca5d2a68c8e4b3d541c 18-Nov-2014 Alan Viverette <alanv@google.com> Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev
6cb51968c205e84d6ba730d73c3aaf00ccf8c649 18-Nov-2014 George Mount <mount@google.com> Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev
34b6e35ba67a1dd4b770fbf80fe8f3dc1e1e01e3 18-Nov-2014 Nicolas Prevot <nprevot@google.com> Fix javadoc in UserManager mentioning application restrictions.

The java doc of UserManager.KEY_RESTRICTIONS_PENDING contains mistakes.

BUG: 18414603
Change-Id: I9584dad545dcbef1eb2ee0e4f5df117486435e8a
ndroid/os/UserManager.java
5a1442589f3fd3e1eca74e70ca666eb7b3a0f9b2 18-Nov-2014 Sander Alewijnse <salewijnse@google.com> Rename the dont_disable_system_apps constant.

Bug:18414080
Change-Id: Ief9c6ac4346ab0588514f89a659fcb09d10d6574
ndroid/app/admin/DevicePolicyManager.java
9c5be4eddd1607846c189e403fd74fd288ce7976 18-Nov-2014 Griff Hazen <griff@google.com> Improve doc for {get,set}HintAvoidBackgroundClipping

Bug: 18414403
Change-Id: I4cc069ca8f13d7521aa94e3c18f776de69280e2f
ndroid/app/Notification.java
9029e5ecd09759cf566f34429a57b69af70c335f 18-Nov-2014 John Reck <jreck@google.com> Don't invalidate() on setClipBounds

Bug: 17510133

This is a RenderNode property now, so use
the faster invalidateViewProperty() shortcut
since a re-record isn't necessary

Change-Id: If3999bce9a1fb9b60e42f0ee624bb554361f96ac
ndroid/view/View.java
5aadd5b6fa8ee9f09cd4870c8f104c1e611aebcd 17-Nov-2014 Andres Morales <anmorales@google.com> Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev
9a1da68bf7980449a5ee5d6fa9d9686b04d667ff 11-Nov-2014 Jeff Davidson <jpd@google.com> Expose a SystemApi method to prepare a VPN without consent.

This is NOT designed to be called normally. Most apps (even
system-privileged ones) should request user consent before launching a
VPN. However, it is needed to support flows where consent can be
obtained through other means external to the VPN flow itself.

The API requires a system-privileged permission, CONTROL_VPN.

Bug: 18327583
Change-Id: I1bcdcf0fb5707faeb861ec4535e7ccffea369ae7
ndroid/net/VpnService.java
c99d3c99f86be8cace507379c0d4f4b7a26fd1e1 17-Nov-2014 John Reck <jreck@google.com> Fix invalidateOutline

Bug: 18175261

invalidateOutline was switched to a lazy-method, but this doesn't
work because invalidateViewProperty intentionally does not
do a traversal, therefore the invalidate was never consumed.

However it was attempting to be lazy about work that is cheap to
do, so nuke the lazy aspect and restore invalidateOutline's previous,
correct behavior. rebuildOutline is kept to avoid triggering
traversals in places they are not needed

Change-Id: I70f8cbacd54a607c0bf0bc7fe6eea78554cb2ea3
ndroid/view/View.java
396879f3f88e6384588c421c7e57ceef932aad59 17-Nov-2014 Raph Levien <raph@google.com> Fix missing ellipsis when just one character is truncated

The "moreChars" test in StaticLayout's generate method would evaluate to
false when the last character in a word caused the break. This in turn
suppressed the ellipsis in this case. The proposed fix is always to set
moreChars true in the code path where the line is broken because more
text wouldn't fit.

Bug: 17738112
Change-Id: Ifa1a69841ca952da4d1937dc8326778179b026b3
ndroid/text/StaticLayout.java
94d963381d7bd75e60da1c3038c7970e47d2ac35 17-Nov-2014 Christopher Tate <ctate@google.com> Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev
8d709f3d5381795cdad942f64b9441d54e48d774 17-Nov-2014 Eino-Ville Talvala <etalvala@google.com> Camera: Add one more requirement to BURST_CAPTURE

To enable full-AUTO bursts, also need to ensure a fast enough
AE target FPS range is available.

Bug: 18281970
Change-Id: I73f7747dfe16380a2cd277a56a002ecc1279154e
ndroid/hardware/camera2/CameraMetadata.java
bad677f3c2230612acbabf6c7233d9a3f24a7dc3 17-Nov-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev
867a0de0b4632984b7a73ee3489e4d1f66c19dd7 17-Nov-2014 Ying Wang <wangying@google.com> Merge "Move preloaded-classes out of framework.jar." into lmp-mr1-dev
126a7468c2b86f27779443f5f2578a03f3ad78e8 05-Nov-2014 Eino-Ville Talvala <etalvala@google.com> Camera2: Add BURST_CAPTURE capability flag

This capability (a subset of FULL) indicates that a camera device
can capture high-rate (>= 20fps) bursts of images at full device
resolution, in at least the YUV_420_888 format.

It also guarantees that the synchronization latency for a device is
relatively small, so that fixed-setting bursts can be captured quickly.

Bug: 18281970
Change-Id: Ifc8fc43252a77097d804429d1c9f6fa71a95aa4f
ndroid/hardware/camera2/CameraCharacteristics.java
ndroid/hardware/camera2/CameraDevice.java
ndroid/hardware/camera2/CameraMetadata.java
9c76a7b3e85ce7056071ac8627c8d675cc5c1599 17-Nov-2014 Jeff Sharkey <jsharkey@android.com> Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev

* changes:
Prevent user ID reuse until after reboot.
Warn user when build fingerprints differ.
b3ec64e1005c82d41b6d1a1d86b6933fd25d87d2 17-Nov-2014 John Reck <jreck@google.com> Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev
0de36e51c5990b1c25c3d0fad3fea7d10aaecce5 14-Nov-2014 Ying Wang <wangying@google.com> Move preloaded-classes out of framework.jar.

Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.

Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
om/android/internal/os/ZygoteInit.java
824392bdbdd0d593c4bd2d26f197bb0009ff75c9 15-Nov-2014 Christopher Tate <ctate@google.com> Don't crash just because invalid datasets were offered for restore

In practice, recognize that the current transport state may not yet
incorporate a valid restore data stream object, so don't go making
assumptions that it's usable / closeable / etc.

Bug 18379004

Change-Id: I221e04b5b83438e37455e025d67f412d3abb8c50
om/android/internal/backup/LocalTransport.java
29230ceab9ea7b6913f0a898411b213f199e18c2 13-Nov-2014 Tom Turney <tturney@google.com> Feature request: Increasing advertise data size on
non-connectable adv.
When the advertisement is non-connectable, give back the
bytes to the advertiser where the adv flags would have been.
This increases the non-connectable advertisement's advertise
data from 24 to 27 bytes.

Bug:18359570
Change-Id: Ia3cc48dca50cc3c51095ee92a489f143f6d350b1
ndroid/bluetooth/le/BluetoothLeAdvertiser.java
bba231d7a63b58a8c2b174722ed1487b0f7d8270 15-Nov-2014 Jeff Brown <jeffbrown@google.com> Explicitly bind AsyncTask to main looper.

It seems we were sort of trying to do this by forcing the AsyncTask
static initializer to run at certain times but it was not sufficiently
reliable. In particular, this resulted in occasional system
server crashes.

Bug: 18192406
Change-Id: Ief73210c60e7680fbed6df74e3e58809b7ec7e4d
ndroid/app/ActivityThread.java
ndroid/content/ContentProvider.java
ndroid/os/AsyncTask.java
4d2d97763f0963d7011d04290dc87b2940aefb33 15-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
b165296a9c6e998541ea18c72ffb2de7ba03d596 15-Nov-2014 Chris Craik <ccraik@google.com> Update clipToPadding docs

Clarify that it doesn't clip anything but children,
and only if padding is non-zero.

Change-Id: I3e3ae31f52fc22304eb13d88765f9f4fc6e43e66
ndroid/view/ViewGroup.java
d7a305bd43f6188b40ddea644a70c4685ae48fcf 14-Nov-2014 Abhijith Shastry <ashastry@google.com> Adding more javadocs to Carrier messaging API.

Change-Id: If0b476813c6cf02eef22bbca4e78726a038d2bfc
ndroid/service/carriermessaging/CarrierMessagingService.java
ndroid/service/carriermessaging/MessagePdu.java
2cffc7dafd390f6fe24a9fbb3ef3bc8226f5b385 14-Nov-2014 Jeff Sharkey <jsharkey@android.com> Warn user when build fingerprints differ.

We're now shipping devices with several partitions which may end up
mismatched, causing subtle runtime issues. To help manufacturers and
users catch this case, show wanring when we detected mismatched
fingerprints.

Bug: 18357469
Change-Id: I897d7ee8cbf3b8042d3d7d282afab277d242ed3f
ndroid/os/Build.java
8f5839be21f028885b6171e75cba479a020a3a0c 14-Nov-2014 John Reck <jreck@google.com> Merge "Document that circular reveal is async" into lmp-mr1-dev
a3b35907de9a8cd5e9f8fdf1700974f9c39a3df6 14-Nov-2014 John Reck <jreck@google.com> Document that circular reveal is async

Bug: 18058966
Change-Id: I64b35441f12bec433f633580319ec73c1e11e7a2
ndroid/view/ViewAnimationUtils.java
8977c1dab572cb61ebff1f844a549f7fb2e4e590 14-Nov-2014 Yuncheol Heo <ycheo@google.com> Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev
20559079ab05aa5e976bb0f7aa63fd9e6868f02e 13-Nov-2014 George Mount <mount@google.com> Fix Visibility transitions canceling when nothing has changed.

Bug 18377719

Change-Id: I4ba282bba928781e7b8a62e813cb83f8bf78b58c
ndroid/transition/Visibility.java
505ffe3633f45778e493e23ad8c163f09ed1dbb5 14-Nov-2014 Raph Levien <raph@google.com> Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev
25f7c4b99284cd1e118f50bd585e6534acfad7c4 14-Nov-2014 Raph Levien <raph@google.com> Merge "Update hint text color even when text present" into lmp-mr1-dev
cda81f2ded39b53dd813071760ad235363292d52 14-Nov-2014 Raph Levien <raph@google.com> Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
27936ad3a677509fab1174c7b6655c894f018143 14-Nov-2014 Jeff Sharkey <jsharkey@android.com> Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
85844916b8a7cc7f6aabc6c37af7380a4c000bcb 14-Nov-2014 Jeff Sharkey <jsharkey@android.com> Block loading WebView in privileged processes.

WebView is very powerful, but it also has a large attack area. To
improve security, refuse to load WebView components when running as
the root or system UIDs.

Bug: 18376908
Change-Id: I515b819033586076b1a9668023bb43ee0295d003
ndroid/webkit/WebViewFactory.java
d8bcfbadf7037dd2574312a3bfa04dd70d967166 14-Nov-2014 Martijn Coenen <maco@google.com> Verify NFC permission immediately on API calls.

Bug: 18358968
Change-Id: I648494e6435e107337e0c5bc4c6328774f9a54be
ndroid/nfc/INfcAdapter.aidl
ndroid/nfc/NfcActivityManager.java
cb6eae0e2eda2a9383ba2682b739b3616a9eaefc 14-Nov-2014 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera: doc update for independent 3A" into lmp-mr1-dev
22dc3b7ba111e27bce99a7cce966598e7873508c 31-Oct-2014 Esteban Talavera <etalavera@google.com> New AccountManager method to copy accounts between users.

Adding the copyAccountToUser method which copies an account
along with its credentials to a different user.

Also an extra in the public api to identify the account to migrate
during provisioning.

Bug: 17716971
Change-Id: I2f29f1765ba0d360a3894b13ef86253b7c7d3284
ndroid/accounts/AccountManager.java
ndroid/accounts/IAccountManager.aidl
f39cec0b068abcf306eb91c304ed2eb76e60f8c0 14-Nov-2014 Sander Alewijnse <salewijnse@google.com> Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
0224d25db2f897ddfc29a722ad91d67dcf2500a9 14-Nov-2014 Alan Viverette <alanv@google.com> Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
b35c9602cf5c628c621e4fe102a461505f302bfe 14-Nov-2014 John Reck <jreck@google.com> Wire up surface width/height to lockHardwareCanvas

Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
ndroid/view/Surface.java
0c22e6919ab56e85f02b3255493d0009d711a807 11-Nov-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Add READ_SETTINGS capability.

Bug: 18281970
Change-Id: I28be92a85f0a843c690f9ff49263440cd871e40d
ndroid/hardware/camera2/CameraCharacteristics.java
ndroid/hardware/camera2/CameraMetadata.java
24859ba016f740c16113e04271ebe6b3eb61a241 13-Nov-2014 Alan Viverette <alanv@google.com> Merge "Don't dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
475569e98a7d8d42b981df54c70974ad99336328 13-Nov-2014 ztenghui <ztenghui@google.com> Merge "Fix the starting pen's position when a path close." into lmp-mr1-dev
fb8db1c84b7fd59f596a6c090a8035fab08ef2f5 13-Nov-2014 Abhijith Shastry <ashastry@google.com> Merge "new sms/mms carrier app API" into lmp-mr1-dev
417a95685eaad8790d4639ef6fa1bf6d61ce5ac6 13-Nov-2014 Yuncheol Heo <ycheo@google.com> CEC: Fix a bug in HdmiPortInfo.createFromParcel().

- Added equals() for the testing.

Bug: 18376178
Change-Id: Icc7d5fe78b3132bf51754fc3bb0d5a40e0d3b20a
ndroid/hardware/hdmi/HdmiPortInfo.java
df68999dc7de3893ca80e4c736704dcc9ed94e35 13-Nov-2014 Alan Viverette <alanv@google.com> Don't dismiss AutoCompleteTextView on focus change while temp detached

This is consistent with how TextView handles focus changes while
temporarily detached and prevents the suggestion popup from being
dismissed during layout when the AutoCompleteTextView is used
within a ListView.

BUG: 18364277
Change-Id: I8ca6fb9dba63b49a84a60a606bc441446c083cee
ndroid/widget/AutoCompleteTextView.java
ndroid/widget/TextView.java
5e7a29f6774f0672a51761297e5c6dbdbc8f794d 13-Nov-2014 ztenghui <ztenghui@google.com> Fix the starting pen's position when a path close.

We have to cache the starting point for the latest "move", then apply it after
we close the path.

b/18214929

Change-Id: I8e8e5c810d720a1c194b8f59d74867a0efbb7662
ndroid/util/PathParser.java
44cb2432e90c7a9e0ee59b959d781ba8834c1736 13-Nov-2014 Raph Levien <raph@google.com> Fudge clipRect in TextView for extra cursor width

There are a number of cases (most commonly cursor at start of line in
RTL direction) where the cursor extends past the right edge of the
clipRect. This patch adds approximately 1dp on the right side of the
clip, so that the cursor doesn't get clipped.

Bug: 18035274
Change-Id: I489825a91750742c28e445f54f9d27000accbcfb
ndroid/widget/TextView.java
7144b5d2cf445ed245cfd9b09c7897966d01b5ff 12-Nov-2014 Yin-Chia Yeh <yinchiayeh@google.com> Camera: doc update for independent 3A

Bug: 18281970
Change-Id: I12f8b4fcbabe473b076464eaf9b7617a5ec586d3
ndroid/hardware/camera2/CameraMetadata.java
ndroid/hardware/camera2/CaptureRequest.java
ndroid/hardware/camera2/CaptureResult.java
fdcdb7429e3f150818e8df561a62328444b102c5 13-Nov-2014 Simranjit Singh Kohli <simranjit@google.com> Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
28d3c245a1dde4aa5294192bec9980d8a93b0489 13-Nov-2014 Wale Ogunwale <ogunwale@google.com> Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
4612740ddc76b3518dc6d189d5f8b5b7f60e9d64 13-Nov-2014 Alan Viverette <alanv@google.com> Implement Material-style delegate for CalendarView

BUG: 18266649
Change-Id: Ifd749328754b82dc43259ca7dadb472e449bdfff
ndroid/widget/CalendarView.java
ndroid/widget/CalendarViewLegacyDelegate.java
ndroid/widget/CalendarViewMaterialDelegate.java
ndroid/widget/DatePickerCalendarDelegate.java
ndroid/widget/DayPickerView.java
ndroid/widget/SimpleMonthAdapter.java
827015edb3037cc44c5133188684da0ec56f4027 13-Nov-2014 Alan Viverette <alanv@google.com> Prevent NPE when computing FastScroller position with no visible items

BUG: 18371212
Change-Id: I90b1f540cdc6095e18242b879c50e8060de662ee
ndroid/widget/FastScroller.java
8c4115617833e83253a53fe855ea96bdb39fbe1d 12-Nov-2014 Sander Alewijnse <salewijnse@google.com> Add extra to enable device admins to skip removal of system apps.

Bug:17369849
Change-Id: Ibc1c0f480c436c7075725f79ffaaf92832c1154a
ndroid/app/admin/DevicePolicyManager.java
87bc2acfd3e874ff94fd3da948c329d2547a2bfc 13-Nov-2014 Adam Powell <adamp@google.com> Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
bf79cbaba915dbbf419e5f59ca1ab258f64c88b4 13-Nov-2014 Ignacio Solla <igsolla@google.com> Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
6e33f0fbb57a8afc2184bd9a1798db8bd29e680a 13-Nov-2014 Alexandra Gherghina <alexgherghina@google.com> Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
aaf2f3e8954d3d5d01953ceb7c8f631db7412e13 13-Nov-2014 Alexandra Gherghina <alexgherghina@google.com> Add extra for account migration in the DevicePolicyMamager

This is in preparation for the implementation CL

Bug: 17716971
Change-Id: I3042b0781f48f3d9e84bfff899507b4b5ca156eb
ndroid/app/admin/DevicePolicyManager.java
eed1fba6b54b3305af811b4dd9e367eab01a241b 13-Nov-2014 Narayan Kamath <narayan@google.com> Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev
fef1e0e7f0a6a8d3564031ca4ecf14ab070468ff 13-Nov-2014 Jeff Brown <jeffbrown@google.com> Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev
db3d76ab685955aae4a3e363238a2931d89c6f03 13-Nov-2014 Adam Lesinski <adamlesinski@google.com> Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev
377d80ba53d4eda31d131f4f2bd899668cad426b 13-Nov-2014 Dianne Hackborn <hackbod@google.com> Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev
201caf57f9a9699e04620eac9b1fcdaf4338d2f0 12-Nov-2014 Zoltan Szatmary-Ban <szatmz@google.com> Adding method to query backup manager service activity status

Bug: 17367491
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
ndroid/app/backup/IBackupManager.aidl
f9c50c45c615338bf9bfe57cd1ecff490051c997 22-Oct-2014 Cheuksan Wang <edwang@google.com> new sms/mms carrier app API

BUG: 18005911

Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
ndroid/service/carriermessaging/CarrierMessagingService.aidl
ndroid/service/carriermessaging/CarrierMessagingService.java
ndroid/service/carriermessaging/CarrierMessagingServiceManager.java
ndroid/service/carriermessaging/ICarrierMessagingCallback.aidl
ndroid/service/carriermessaging/ICarrierMessagingService.aidl
ndroid/service/carriermessaging/MessagePdu.aidl
ndroid/service/carriermessaging/MessagePdu.java
fa781f8c2cdbd176d8ab8c9c82fcd6496e73e3be 13-Nov-2014 George Mount <mount@google.com> Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev
d82f8a9a3869448e6d7d4b3fc962e34e33a1ba0e 13-Nov-2014 Raph Levien <raph@google.com> Check bounds on CharSequence drawText methods

The canvas drawText() methods on CharSequence arguments didn't check
whether the start and end offsets were within bounds, which triggered
native crashes. This patch checks the bounds and throws
IndexOutOfBoundsException when invalid.

Bug: 18282500
Change-Id: I1935bf21f828b960c817b40ebce6affd4ce8bb99
ndroid/view/GLES20Canvas.java
451e338c51e8c45efc0d21536dfae6f78f6d5e06 10-Nov-2014 Ignacio Solla <igsolla@google.com> [WebView] Allow the WebView to be compiled against the system SDK.

BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
ndroid/net/WebAddress.java
ndroid/webkit/CookieManager.java
ndroid/webkit/DebugFlags.java
ndroid/webkit/FindActionModeCallback.java
ndroid/webkit/GeolocationPermissions.java
ndroid/webkit/HttpAuthHandler.java
ndroid/webkit/JsDialogHelper.java
ndroid/webkit/JsPromptResult.java
ndroid/webkit/JsResult.java
ndroid/webkit/MustOverrideException.java
ndroid/webkit/SslErrorHandler.java
ndroid/webkit/URLUtil.java
ndroid/webkit/WebBackForwardList.java
ndroid/webkit/WebChromeClient.java
ndroid/webkit/WebHistoryItem.java
ndroid/webkit/WebIconDatabase.java
ndroid/webkit/WebSettings.java
ndroid/webkit/WebStorage.java
ndroid/webkit/WebView.java
ndroid/webkit/WebViewDatabase.java
ndroid/webkit/WebViewDelegate.java
ndroid/webkit/WebViewFactory.java
ndroid/webkit/WebViewFactoryProvider.java
ndroid/webkit/WebViewProvider.java
4acd0ecc7b2351cadafc02986f8165f811e00cb1 12-Nov-2014 Alan Viverette <alanv@google.com> Account for window bounds in accessibility view click point computation

BUG: 18177402
Change-Id: If591d1b9e5a8a7c4cade3ef4f3ec5e42d623b53c
ndroid/view/View.java
521ca5f8fba355f526e82dc3a8fc6520e4379874 12-Nov-2014 Jeff Sharkey <jsharkey@android.com> am 2e700004: am d68b87cd: Recover apps with malformed certificates.

* commit '2e7000040e3d836bb591e29515974817afc49488':
Recover apps with malformed certificates.
2e7000040e3d836bb591e29515974817afc49488 12-Nov-2014 Jeff Sharkey <jsharkey@android.com> am d68b87cd: Recover apps with malformed certificates.

* commit 'd68b87cdd402d46013170d9316a31c82be4e4816':
Recover apps with malformed certificates.
70cb4f3e7131cda1e58c1f6d422e296c4935289d 12-Nov-2014 George Mount <mount@google.com> Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev
c3631b985f51fcce97b0111cdd8297a58c44a5ec 12-Nov-2014 Ignacio Solla <igsolla@google.com> Merge "Fix docs build breakage" into lmp-mr1-dev
fabb70b2efbd125f74923d19ab12bc8e1371ed1f 11-Nov-2014 Dianne Hackborn <hackbod@google.com> Add reporting of Parcel memory/count.

Also fix issue #18340771: Dumpsys Procstats missing a newline

Change-Id: I0c612187a3fb4d7eeafbf97d373efdef732c477e
ndroid/app/ActivityThread.java
ndroid/os/Parcel.java
om/android/internal/app/ProcessStats.java
53f256948724b8d4009d8a8a47da96a06402f9a2 12-Nov-2014 Ignacio Solla <igsolla@google.com> Fix docs build breakage

Change-Id: Id20a54d8da2b80f277e31c342fffbb3b7d0dc854
ndroid/webkit/WebViewDelegate.java
41a8043b30a289bdba55a2469e598b3fe67c3bf1 12-Nov-2014 Rob Tsuk <robtsuk@google.com> Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev
10ece9c9d5c2134a6ea04bf593a2b76d167dbd7a 12-Nov-2014 Ignacio Solla <igsolla@google.com> Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev
d68b87cdd402d46013170d9316a31c82be4e4816 12-Nov-2014 Jeff Sharkey <jsharkey@android.com> Recover apps with malformed certificates.

There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle. The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.

A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.

This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.

Bug: 18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
ndroid/content/pm/Signature.java
c1bf285966f95a52cfa7843efb2b8e37b5b752c9 12-Nov-2014 Raph Levien <raph@google.com> Update hint text color even when text present

When text is present (so the hint doesn't show), updating the hint color
was suppressed. This patch updates the hint color in all cases, but
still skips the invalidate when the hint text is not showing.

Bug: 17454233
Change-Id: I3887908fb184a10f7a1d7e64f1d92b4955323227
ndroid/widget/TextView.java
4678dcc5524258908eadc5fe1e5e1874768967eb 12-Nov-2014 Rob Tsuk <robtsuk@google.com> Add a way to override Xfermode DO NOT MERGE

Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
ndroid/view/GLES20Canvas.java
05f35127e322552b04633f38d45b6a6f6ca78f66 11-Nov-2014 Adam Powell <adamp@google.com> Optimize setting padding and backgrounds for views

Don't reset the entire chain of child views whenever we set our own
padding or background; clear our own bidi resolution bits only. This
prevents doing a lot of extra recursive work when changing properties
of a parent view that cannot affect children.

Bug 18159214

Change-Id: I94300402785c79c3199e768ad7b6d7027d8d5d5f
ndroid/view/View.java
ndroid/view/ViewGroup.java
45c00b5877e908f44853783b42deb437cfd30d94 17-Oct-2014 Sandeep Siddhartha <sansid@google.com> Don't unload the sound model on stopRecognition

This helps us in majority of the scenarios where the sound model doesn't
change across start/stop calls.

Bug: 17954633
Change-Id: Ibff817bb69bc69d2bb3a2603460fed596688b892
ndroid/hardware/soundtrigger/SoundTrigger.java
4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea 12-Nov-2014 Alan Viverette <alanv@google.com> Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
d9f3fdf45bd3e3b5b02f2d21b6df6598cbaf1c70 12-Nov-2014 Alan Viverette <alanv@google.com> Ensure time picker dialog fits on small screens

Also fixes dialog padding in landscape mode and a bug in the
ColorStateList method used to apply a selected color.

BUG: 18251582
Change-Id: Id5b8c7893ec42fd4d5f4a7520e6ac170839d3143
ndroid/content/res/ColorStateList.java
ndroid/widget/TimePickerClockDelegate.java
c3672cd3f7e2bd87d6de9dada499de82b62fae84 06-Nov-2014 Wale Ogunwale <ogunwale@google.com> Cancel or drop key events if activity is stopped.

After an activity instance state is saved due to onStop()/onPause(),
there is a small window where it can still get key events like the
back button since we still allow the ActivityThread to handle
pending messages (like memory trim request) before informing the
activity manager that we are done. If the activity is stopped,
we will now drop non-terminal input events and set the cancel
flag on terminal events.

Bug: 18151331
Change-Id: I370d7c871530eea4b16fa42428d0248f1a87abb6
ndroid/view/InputEvent.java
ndroid/view/KeyEvent.java
ndroid/view/MotionEvent.java
ndroid/view/ViewRootImpl.java
3ae0d3157d5fdeee851f3e72b80f4ed57add0ff8 07-Nov-2014 Wale Ogunwale <ogunwale@google.com> Fixed constant window switching on lock screen with Swype KB.

We allow TYPE_INPUT_METHOD windows to show on the lock screen.
These windows can attached other types of windows (For this
case the Swype KB was attaching a PopupWinow which will be
of TYPE_APPLICATION). This causes the popup window app token
to be added to the list of apps to be hidden on the lock
screen, thereby preventing the lock screen from been hidden,
which then causes a layout cycle(s). Now, we remove app
tokens for non-app windows from the hidden list in case it
was added by any attached widow they migth have.

Also, when we are updating window animations, set the
hideWhenLocked flag for windows that are IME tragets so
they don't go through unneeded cycles of having their
visibility policy set to hide/show/hide/show/...

Bug: 18021493
Change-Id: I3680256d41793f62def42fda00e26db1dcc990cc
ndroid/view/WindowManagerPolicy.java
002d43d29b84e8a4e55c995a350783e80132d61a 11-Nov-2014 George Mount <mount@google.com> Fix getChildVisibleRect to clip correctly.

Bug 18292516

getClipVisibleRect now takes into account clipChildren,
clipBounds, and clipToPadding.

Change-Id: I181cd68354e70767868e9edd56bf82a58357391d
ndroid/view/ViewGroup.java
13b27810f990ea57decfcde98ddd461b8c0b9936 12-Nov-2014 George Mount <mount@google.com> Merge "Remove unnecessary reflection lookup in Animators." into lmp-mr1-dev
11bce123b91cee70380bffa3fffa3c9d19ef3ebd 12-Nov-2014 Narayan Kamath <narayan@google.com> Add detailed javadoc for AssetManager.getLocales.

bug: 18218661
Change-Id: Idcbd8678b6dd1b28f993c4dab000e284db76edc0
ndroid/content/res/AssetManager.java
222722ee73c38dea5544118df6bd349e630d1c26 12-Nov-2014 Narayan Kamath <narayan@google.com> Merge "Tell installd when boot completes." into lmp-mr1-dev
138b83347b8da29166ee2eb09fa8126686bda3c7 11-Nov-2014 Adrian Roos <roosa@google.com> Obliterate LockPatternUtilsCache

It is disabled dead code already and not useful anymore
with the new caching in LockSettingsService.

Bug: 18163444
Change-Id: Icc184e923e0fbeab31ed128336c01f835b24c6f2
om/android/internal/widget/ILockSettings.aidl
om/android/internal/widget/ILockSettingsObserver.aidl
om/android/internal/widget/LockPatternUtils.java
om/android/internal/widget/LockPatternUtilsCache.java
9840c07667bb0363c93fb8459e6c08f7e30d5df1 12-Nov-2014 Jeff Brown <jeffbrown@google.com> Make Message.setAsynchronous() public.

There are many cases in real world applications where it is desirable
to continue processing messages on the Looper even when most other
messages have been suspended by a synchronization barrier pending
completion of the next drawing frame on vsync.

Internally the framework is able to mark certain messages as being
independent of these higher level synchronization invariants by
flagging them as asynchronous.

This change exposes the existing function and improves on the
documentation so that it is clearer what is meant by asynchronous.

Bug: 18283959
Change-Id: I775e4c95938123a364b21a9f2c39019bf37e1afd
ndroid/os/Handler.java
ndroid/os/Message.java
3df1c38ee098872352086e03d6f1adb16796ee29 07-Nov-2014 Adam Lesinski <adamlesinski@google.com> Fix ParceledListSlice to enforce the same concrete types among its elements.

Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
ndroid/content/pm/ParceledListSlice.java
ec452d9ff590725f57bc474b79f4c2731035372d 12-Nov-2014 Dianne Hackborn <hackbod@google.com> Put native apps above browser in resolver activity.

Add a special case for situations where we have some activities
that are matching a URI host/path, so that these are ordered
above others. This only happens when dealing with http or https
intents, for ordering native apps above the browser.

Change-Id: I21f3361229bc7a1ebefda66373d31b6b1fd19973
om/android/internal/app/ResolverActivity.java
1375d3744c41ab1d240909c69207354150befd71 17-Sep-2014 Aravind Akella <aakella@google.com> Sensor documentation fixes.

Bug: 17526079
Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1
(cherry picked from commit 1f9b32f006f7c506d9df5bf73294710665746397)
ndroid/hardware/Sensor.java
ndroid/hardware/SensorEventListener2.java
ndroid/hardware/SensorManager.java
93ffd5dc0a243af87f8ba106fe98df7a7ed2c484 12-Nov-2014 Amith Yamasani <yamasani@google.com> Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev
2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4 12-Nov-2014 Junda Liu <junda@google.com> Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev
52c39a16db077f5017ab20214e60a205e075f2d7 21-Oct-2014 Amith Yamasani <yamasani@google.com> Allow profile owners to set the unknown source setting

This allows work profile MDM to enable unknown sources
even if the user doesn't have UI for it. Installing an
app from an unknown source will still prompt the user
with the package installer dialog, so it's not like the
MDM can now quietly install apps from non-market sources.

Bug: 18316350

Change-Id: Ia8f4fe36f12a258aa888e085acc0b358925f4817
ndroid/app/admin/DevicePolicyManager.java
32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9 11-Nov-2014 Jeff Brown <jeffbrown@google.com> Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev
264d3a21a02cdf56857689d822396e3079e63f38 11-Nov-2014 George Mount <mount@google.com> Update GhostView properly when underlying view changes.

Bug 18308803

Change-Id: Iad1366ea8fe3ba488dfb82ff1f9e170cafb4b2ec
ndroid/view/View.java
691487d2c370dc2c7dbf360a25244b99651c18af 11-Nov-2014 George Mount <mount@google.com> Remove unnecessary reflection lookup in Animators.

Bug 17978210

When Properties are used with PropertyValuesHolders or
ObjectAnimators, the reflection lookup for getters and
setters is unnecessary.

Fixed problem in which static maps were being protected
by instance locks.

Fixed problem where we were repeatedly doing a
reflection lookup on methods that don't exist.

Change-Id: Ic0a1b62357f3aaaa4c900fef6087583ad0e964b6
ndroid/animation/PropertyValuesHolder.java
12403b242f86c0572a99a963fd1e71eda680192b 11-Nov-2014 George Mount <mount@google.com> Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev
76a748e62f354c799342044f724e1f4b80121837 10-Nov-2014 Narayan Kamath <narayan@google.com> Tell installd when boot completes.

installd can then clear the ".booting" marker from the dalvik-cache
(owned by root). This marker is used to detect boot loops.

bug: 18280671

Change-Id: I878f1463c7f523892605c17b980a51ac3b6645e2
ndroid/os/Process.java
85d558cd486d195aabfc4b43cff8f338126f60a5 04-Nov-2014 Dianne Hackborn <hackbod@google.com> Add Activity API to get referrer information.

This expands the use of EXTRA_REFERRER to be relevant anywhere,
allowing apps to supply referrer information if they want. However,
if they don't explicitly supply it, then the platform now keeps
track of package names that go with Intents when delivering them
to apps, which it can be returned as the default value.

The new method Activity.getReferrer() is used to retrieve this
referrer information. It knows about EXTRA_REFERRER, it can return
the default package name tracked internally, and it also can return
a new EXTRA_REFERRER_NAME if that exists. The latter is needed
because we can't use EXTRA_REFERRER in some cases since it is a Uri,
and things like #Intent; URI extras can only generate primitive type
extras. We really need to support this syntax for referrers, so we
need to have this additional extra field as an option.

When a referrer is to a native app, we are adopting the android-app
scheme. Since we are doing this, Intent's URI creation and parsing
now supports this scheme, and we improve its syntax to be able to build
intents with custom actions and stuff, instead of being all hung up
on custom schemes.

While doing this, fixed a problem when parsing both intent: and new
android-app: schemes with a selector portion, where we were not
respecting any scheme that was specified.

Change-Id: I06e55221e21a8156c1d6ac755a254fea386917a2
ndroid/app/Activity.java
ndroid/app/ActivityThread.java
ndroid/app/ApplicationThreadNative.java
ndroid/app/IApplicationThread.java
ndroid/app/Instrumentation.java
ndroid/app/LocalActivityManager.java
ndroid/content/Intent.java
ndroid/content/pm/LabeledIntent.aidl
om/android/internal/content/ReferrerIntent.aidl
om/android/internal/content/ReferrerIntent.java
993e3d2d40cbd95d78cd3d2a76c77af2f4ab0e88 11-Nov-2014 Alan Viverette <alanv@google.com> Merge "Call OnTimeChangedListener when new TimePicker values are selected" into lmp-mr1-dev
19c1cbda5a00b92e4e8c31b820b652c75a6c0a06 11-Nov-2014 George Mount <mount@google.com> Merge "Only modify add Transition targets when they aren't targeted." into lmp-mr1-dev
a0ecc714c3aeaaa05649e0ab1f054cc8efbb126f 10-Nov-2014 Adrian Roos <roosa@google.com> Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev
c0bf068bbff3080b930c9bb50bd6cc935b135536 10-Nov-2014 Alan Viverette <alanv@google.com> Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev
450ce9fc8a1522819aec151433e6f509dfe60690 29-Oct-2014 Adrian Roos <roosa@google.com> Disable LockPatternUtilsCache

Also fix a bug where hasPattern and hasPassword were
not invalidated properly.

Bug: 18163444
Change-Id: I5bd8cc4e7c0d00497ee7a42f3c34449aa3f95a6c
om/android/internal/widget/ILockSettingsObserver.aidl
om/android/internal/widget/LockPatternUtils.java
om/android/internal/widget/LockPatternUtilsCache.java
04a1557c497d2ef0ab4011136b0945b20f291bb1 10-Nov-2014 Dan Sandler <dsandler@android.com> Merge "Fix inset hinting when adding window" into lmp-mr1-dev
82aaf332b62c5a276c4046d1339441d68d817371 10-Nov-2014 Alan Viverette <alanv@google.com> Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev
cc8d56f66c64a66002b90ed014bbd2fb46125f63 10-Nov-2014 Andres Morales <anmorales@google.com> Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
37d7a68de7e353c31a3a4736054cd86f0e002eaf 06-Nov-2014 Adrian Roos <roosa@google.com> Fix inset hinting when adding window

Windows with FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS were
getting an incorrect content inset hint, because the
hinting didn't see the adjusted systemUiVisibility.

Also adds hinting for the stable insets.

Bug: 17508238
Change-Id: If9647277feb6811b15665b801accd896c51dbd12
ndroid/service/wallpaper/WallpaperService.java
ndroid/view/IWindowSession.aidl
ndroid/view/SurfaceView.java
ndroid/view/ViewRootImpl.java
ndroid/view/WindowManagerPolicy.java
705c9c131a6df977a2e9430cacb84788ef0cecbf 10-Nov-2014 Pete Gast <pgast@google.com> Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
8f7d3715c5b26069a55464b1d3e517c6ecc600c7 10-Nov-2014 George Mount <mount@google.com> Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev
94ef789f0cf0387df20c2c602857ada1e5abfdd6 29-Oct-2014 Ignacio Solla <igsolla@google.com> [WebView] Interface to access hidden APIs.

The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
ndroid/webkit/WebViewDelegate.java
ndroid/webkit/WebViewFactory.java
541afcd0b761769cc519bcb99c9cd4ebd7c0c42d 07-Nov-2014 Alexandra Gherghina <alexgherghina@google.com> Clarify documentation for DevicePolicyManager

Bug: 17634106
Change-Id: I93e4c10cb942bc8452043f81f460a5db6c3bd0a4
ndroid/app/admin/DevicePolicyManager.java
e5a6f821399bf354520f08f77819af4a846ae5f1 09-Nov-2014 Adam Powell <adamp@google.com> Merge "Don't register more receivers and observers for every DateTimeView" into lmp-mr1-dev
8778f993aeb7ec3df88aa0b244381253257bafe2 06-Nov-2014 Simranjit Singh Kohli <simranjit@google.com> [RemoveAccount API]: Adding support for intent.

Adding support for intent handling provided by authenticators.

Bug: 18292092

Change-Id: I1e94422bc28e5fd54c454ee6542ff2d30f82849f
ndroid/accounts/AccountManager.java
ndroid/accounts/IAccountManager.aidl
529206907f178d394cf1643d39f86c9dbc40e310 08-Nov-2014 Jim Miller <jaggies@google.com> Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev
95c05a590f97d81a5d4e5d86540833cc1637ffdc 08-Nov-2014 Mike Lockwood <lockwood@google.com> Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev
395b519f4bfec6e1c171aaca2c62a75a5c07de07 08-Nov-2014 Amith Yamasani <yamasani@google.com> Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev
0814d41c73fe3ebc2d1269f1a4fc73d0cf4cb230 07-Nov-2014 Jim Miller <jaggies@google.com> Change Configure structure to List<PersistableBundle>

Adding the new structure was making it difficult for
LMP devices to have common source with upcoming API version.

Fixes bug 17008504

Change-Id: I704503cf0ebff113874c87ab11e37735dbe7b8d7
ndroid/service/trust/TrustAgentService.java
73c3068b0ef9c14bfbe7b056905621cc147b9c38 08-Nov-2014 Alan Viverette <alanv@google.com> Call OnTimeChangedListener when new TimePicker values are selected

BUG: 18295303
Change-Id: Ib5922db3a16c1975554072e2af241bbd6cf807c4
ndroid/widget/TimePickerClockDelegate.java
83b6ef01a07d2e7f06dfee7fd698b27bd62ca9a0 08-Nov-2014 Amith Yamasani <yamasani@google.com> Inform PendingIntent sender if broadcast was not queued.

If the broadcast could not be queued due to a stopped user, the
party trying to send a PendingIntent should be notified right away.
Otherwise, for instance, AlarmManager could be waiting forever to
be called back after the broadcast is delivered.

This is a potential fix for:
Bug: 18290018

Change-Id: I07c0751e80f11e69dfa2be5c96a033aecb298b81
ndroid/app/ActivityManager.java
001b2e93030b06774e6af304157637c1acb94226 08-Nov-2014 Jeff Sharkey <jsharkey@android.com> Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev
48a7c3b522625ffbecb0cce7b95be6d41631577b 08-Nov-2014 Christopher Tate <ctate@google.com> Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev
740da4753a878bfa2103ca3d4f487bdbfa75f445 07-Nov-2014 Adam Powell <adamp@google.com> Don't register more receivers and observers for every DateTimeView

SystemUI uses several of these per notification, so be a little more
conservative and track individual views to update per process instead.

Bug 16902706

Change-Id: Ib77a8e7727d027cae39d5e6f431cac1d1ff8a121
ndroid/widget/DateTimeView.java
ccce016fb18b7c42d69edf9b1ade9a05e749eb4e 07-Nov-2014 Jeff Sharkey <jsharkey@android.com> ProcessCpuTracker touching proc is fine.

Otherwise we spew hundreds of StrictMode violations.

Bug: 18261125
Change-Id: I2e5ff697b99f55bb73e806f04dba8384e6f1b935
om/android/internal/os/ProcessCpuTracker.java
ca93f69c96df85bd6bc72a2a47dae6c0d5336ab2 07-Nov-2014 John Reck <jreck@google.com> Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev
3eed90f39301089a1c16d6e2c0d027b187567cf0 07-Nov-2014 Sander Alewijnse <salewijnse@google.com> Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
53d63dcd04da3c1d5187b29f6530c2dcac9d516c 07-Nov-2014 Sander Alewijnse <salewijnse@google.com> Added the restrictions pending application restrictions key.

Bug:17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
ndroid/app/admin/DevicePolicyManager.java
ndroid/os/UserManager.java
050a8a050de04bd0098cde8fdf665a7202929ee0 07-Nov-2014 John Reck <jreck@google.com> DO NOT MERGE Fix finalizer ordering/double-free issue

Bug: 18289984

If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer

Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
(cherry picked from commit c298f9c9170b9e8721cfb616f784ec22734f22f4)
ndroid/view/Surface.java
ce8c358712414e4fa98e4504e6a1b8ad36d37c6c 07-Nov-2014 Alan Viverette <alanv@google.com> Update above/below backgrounds in PopupWindow.setBackground()

BUG: 17718714
Change-Id: I936dfede60bc006a59cd3eb1b18548c7702ae0ee
ndroid/widget/PopupWindow.java
bbdc1c0e044a505d5a200963319a683e4ef1f967 07-Nov-2014 Junda Liu <junda@google.com> Add HIDE_CARRIER_NETWORK_SETTINGS global setting.

Also remove hidden APIs to get/set the preference.

Bug: b/17673255
Change-Id: I8957b0380bf617c953f6665cbfdcc77c3be78411
ndroid/provider/Settings.java
ea4e76f68a60a02e175755d22e88894f11282850 07-Nov-2014 John Reck <jreck@google.com> Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev
aa95a88327d9a3ac8a4a00b065b78ac0f28b3a19 07-Nov-2014 John Reck <jreck@google.com> Have an actual fallback if the surface is lost

Bug: 17516789

This will force a relayout/reinitialize pass if the Surface
is lost mid-render instead of crashing on the next frame

Change-Id: If08bfa16f740728fa7c05904fa11e26f07b81e2e
ndroid/view/ThreadedRenderer.java
2f04d16f16ea935895872efe4dfcff3366070e9c 07-Nov-2014 Jason Monk <jmonk@google.com> Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev
bbe23b31dcd0eec8af5b5198970de7ff2a9ef79a 30-Oct-2014 Christopher Tate <ctate@google.com> Enable runtime turndown of backup/restore services

The heavy implementation of the backup manager service is now sitting
behind a lightweight trampoline that actually provides the binder
call interface. The indirection allows us now to tear down the
implementation on the fly without breaking callers who have cached
binder references to the backup services: these callers will simply
see their future invocations failing benignly.

In addition there is now an API for suitably privileged callers such
as device policy management to effect this turndown.

Finally, there is now a static system property, "ro.backup.disable",
that a product can use to outright remove backup/restore operation
from the system's operation. The public APIs will continue to be
safely usable on such products but no data will be moved to or
from the device.

Bug 17367491

Change-Id: I8108e386ef3b5c967938fae483366d6978fe4e04
ndroid/app/backup/IBackupManager.aidl
4b19b7aaff1d1ff972ebe68101c2107454bbe5de 07-Nov-2014 John Reck <jreck@google.com> Merge "Fix wrong-thread issue" into lmp-mr1-dev
c298f9c9170b9e8721cfb616f784ec22734f22f4 07-Nov-2014 John Reck <jreck@google.com> Fix finalizer ordering/double-free issue

Bug: 18289984

If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer

Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
ndroid/view/Surface.java
12f5e3433226f0a2886a98b0b8da8d5e947c5cde 07-Nov-2014 John Reck <jreck@google.com> Fix wrong-thread issue

Bug: 18259560

Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
ndroid/view/GLES20Canvas.java
ndroid/view/HardwareLayer.java
ea09c7da01c1cd61a2f6d84302fd510c3887db07 07-Nov-2014 Jeff Davidson <jpd@google.com> Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev
803908b0db0139a2bc3eca2868cad67c9a274d97 07-Nov-2014 Ignacio Solla <igsolla@google.com> Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev
5ce1cb240b13db98fbdc21e1ef069b5f9cec8d72 07-Nov-2014 Jeff Brown <jeffbrown@google.com> Move device admin max screen off timeout to internal interface.

The setting was previously exposed in IPowerManager but it
doesn't need to be there.

Bug: 17656076
Change-Id: If3ed0cbe89f67c60aa00376be0c54b1bd9656144
ndroid/os/IPowerManager.aidl
ndroid/os/PowerManagerInternal.java
3ed9f2f903a8e6c38ca9f2ce3819ac063281a020 07-Nov-2014 Winson Chung <winsonc@google.com> Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
df11d588bb26ad0e8b8a6e8551393a0abeec2fef 29-Oct-2014 Andre Eisenbach <eisenbach@google.com> Fix crash during Bluetooth on/off stress test

Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
(cherry picked from commit 178d3b54cd50558be789c5dfd8dad80ffdc65021)
ndroid/bluetooth/BluetoothAdapter.java
50ef3d93adf2614d8394664626b706ab0d7f7de7 07-Nov-2014 Yohei Yukawa <yukawa@google.com> Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev
e763c9bd6ed0ca46daafc21fc4313ebcad4bcafa 07-Nov-2014 Alan Viverette <alanv@google.com> Clean up encapsulation in date picker classes

First step to replacing CalendarView with DayPickerView. Removes
dependencies on the DatePickerController class and adds setters
and listeners needed to hook up to DatePicker or CalendarView.

BUG: 18266649
Change-Id: Ic215f96eaddc0048040ec6bca0d85b776216fd26
ndroid/widget/DatePickerCalendarDelegate.java
ndroid/widget/DatePickerController.java
ndroid/widget/DayPickerView.java
ndroid/widget/SimpleMonthAdapter.java
044d52934e57a337665f707aa4be1d423ee3fb29 06-Nov-2014 Winson Chung <winsonc@google.com> Adding bounce animation for affiliated tasks. (Bug 16656169)

Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
ndroid/app/ActivityManagerNative.java
ndroid/app/ActivityOptions.java
ndroid/app/IActivityManager.java
ndroid/view/IWindowManager.aidl
7ce5d75dc920823d83e2e34fefc3875dc8868411 31-Oct-2014 George Mount <mount@google.com> Only modify add Transition targets when they aren't targeted.

Bug 18191727

Transitions were targeting specific views, but they do this by
adding targets. If there was already a view targeted, now that
transition also targeted a different view. This prevents that
by only targeting views when no target was given.

Change-Id: I50590a81c1c1c55b1624f8df848ab53731f7e8e1
ndroid/app/BackStackRecord.java
5565cb42f2ac07fcdbe3aab2503de07fbeb39504 12-Sep-2014 Jason Monk <jmonk@google.com> Plumbing for screen pinning request from sysui

Removes lock-to-app request dialog from the AM.

Added a showScreenPinningRequest to IStatusBar to handle the
flow from app requesting lock task to showing the dialog.

This CL also allows startLockTaskOnCurrent (system|signature) to
start lock task directly. (Note: this is the less locked version
that always allows exit through back + recents)

Bug: 16957435
Change-Id: I284918dd5989de6cb2767c2a717529eb5e9c6db4
om/android/internal/statusbar/IStatusBar.aidl
1a2b99ea2692a357f68368f7117bc529ef5dab06 06-Nov-2014 Jeremy Joslin <jjoslin@google.com> Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev
775d104db29dc8bdd8922fd7627cf646869d90c8 06-Nov-2014 Amith Yamasani <yamasani@google.com> Merge "Fix singleUser provider grants" into lmp-mr1-dev
2a83226c7585895d08d3320a4bb881f3659ad0d9 06-Nov-2014 Jeff Hao <jeffhao@google.com> Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev
2d42f484494e4183c42114ce5918fc4592a33fb6 06-Nov-2014 Justin Koh <justinkoh@google.com> am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev

* commit 'b8038d58da04456e9e7b6e264af69226bf21592c':
Hide Surface#lockHardwareCanvas DO NOT MERGE
cd3b72e6f9a158ac492a4a8b5629d73b495a7d1e 06-Nov-2014 Andres Morales <anmorales@google.com> Unhide DISALLOW_OUTGOING_BEAM

Bug:17387303
Change-Id: If4410bbfd9f82c84886024a091454ee931d9d930
ndroid/os/UserManager.java
7f38664ea5cda3d5fcd12a50dd0b6b9f4b56050e 06-Nov-2014 Jeff Davidson <jpd@google.com> Let scorers fine-tune scoring heuristics.

Documents Byte#MIN_VALUE as being equivalent to a null score. This
enables scorers to pick a threshold below which a network won't be
used, by setting the score at any RSSI below that threshold to this
value.

Also adds an "RSSI boost" for the active network, so that we avoid
unnecessary switches between two closely-scored networks due to small
fluctuations in signal strength.

Bug: 15432594
Change-Id: I7a8f5f68ef074827d4b1cfbbed0841448498f179
ndroid/net/RssiCurve.java
46e3ac8bbca54b56af1947f64294e2a4c35cfa3c 05-Nov-2014 Jeremy Joslin <jjoslin@google.com> Implemented requestNetwork with a PendingIntent.

ConnectivityManager.requestNetwork(NetworkRequest, PendingIntent)
was unhidden and implemented.

Added ConnectivityManager.removePendingIntentRequest(PendingIntent) as
the companion method.

Bug: 17356414
Change-Id: I656a1e149cc1292c443ebfe9e61ee3eb5a80f143
ndroid/net/ConnectivityManager.java
ndroid/net/IConnectivityManager.aidl
418f4ed077ee0559e7f61b8ea10d53e9784fd631 06-Nov-2014 Adrian Roos <roosa@google.com> Merge "Round charging indication to nearest minute" into lmp-mr1-dev
b21220efae92a56ff7b4b781fa614a6e3a8a3007 01-Nov-2014 Yohei Yukawa <yukawa@google.com> Minimize the number of default enabled IMEs part 4

This is a follow up CL for recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845

It turned out that the changes made in part2 and part3 are
a bit overkill, and users will see no software keyboards
in some particular situations. The problem we missed in
the previous CLs is the fact that
InputMethodInfo#isDefault is indeed a locale-dependent
value, hence it may vary depending on the system locale.
Existing unittests also failed to abstract such
locale-dependent nature.

In order to addresses that regression, the selection logic
is a bit widely reorganized in this CL. Now the logic is
implemented as a series of fallback rules.

Also, unit tests are updated to be able to 1) test the
order of the enabled IMEs, and 2) emulate the
locale-dependent behavior of InputMethodInfo#isDefault
to enrich test cases.

BUG: 17347871
BUG: 18192576
Change-Id: I871ccda787eb0f1099ba3574356c1da4b33681f3
om/android/internal/inputmethod/InputMethodUtils.java
262dc4dafede871712d89f35d630ab2a332ee6cb 06-Nov-2014 Jim Miller <jaggies@google.com> Merge "Update TrustAgentService API after review" into lmp-mr1-dev
e303bf443532c2ad756260133f00747bcff11e69 27-Aug-2014 Jim Miller <jaggies@google.com> Update TrustAgentService API after review

This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
ndroid/app/admin/DevicePolicyManager.java
ndroid/app/admin/IDevicePolicyManager.aidl
ndroid/service/trust/ITrustAgentService.aidl
ndroid/service/trust/ITrustAgentServiceCallback.aidl
ndroid/service/trust/TrustAgentService.java
24f535b87341b8729d6d4235acc51f0e87916d3a 06-Nov-2014 Jeff Davidson <jpd@google.com> Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev
427c64140d1c6e031a128323d14b4b30952e1564 06-Nov-2014 George Mount <mount@google.com> Make setOutlineProvider change transitionGroup.

Bug 18203878

Change-Id: Ia343477b8b37566e0fd8fd1a275b56e805bb18dc
ndroid/view/ViewGroup.java
2e594cfe9848b56ad71a6f7bc4de13df7a36511c 29-Oct-2014 Jeff Hao <jeffhao@google.com> Change boot screen title to "Android is starting" when not upgrading.

Bug: 17565501
Bug: 18247218

(cherry picked from commit 9f60c08a446e38f9e2d5271546ef69ca5941eba9)

Change-Id: I1ec32b318b6221277fc3ffbc19966bf3330c2d93
ndroid/app/ApplicationPackageManager.java
ndroid/content/pm/IPackageManager.aidl
ndroid/content/pm/PackageManager.java
7d2d4fd55ecda623a717e90feb820c1812fb9d6e 06-Nov-2014 Amith Yamasani <yamasani@google.com> Fix singleUser provider grants

Fake the Uri for grant check, if we're checking access to
a singleUser provider. Inject the userId in the authority
so that the grant can be matched properly.

Bug: 18194892
Change-Id: I4a55ce593ac21722f394e89e13350aa205d76336
ndroid/content/ContentProvider.java
7efdb83ceeea3dc916f8a05f59f7b35cb8d13597 06-Nov-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev
06314e4eab4b78d971ff878de3984f2dc673c2d3 29-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Fix Legacy typing of net-specific requests.

We're starting to get network requests for specific SIMs
and the Legacy Type Inference was broken because the incoming
request included a network specifier while the legacy requests
it was compared with did not. Only compare the things we care
about.

bug:18031008
Change-Id: If107042828c152ede51a2497a3859bc1a6c83694
ndroid/net/ConnectivityManager.java
ndroid/net/NetworkCapabilities.java
c838b677749e0c20fc201b0418864be3835711b8 06-Nov-2014 George Mount <mount@google.com> Merge "Cancel animation when target changes." into lmp-mr1-dev
e56f2bb5ecae624e1b6573515f855a26f756aed5 05-Nov-2014 Jeff Davidson <jpd@google.com> Allow apps with SCORE_NETWORKS to set the active scorer.

This allows for a more streamlined UX in the current world, where
scorer apps are trusted (by virtue of being in /system/priv-app).
Trusted apps can continue to use the system dialog for consent, but
they may also set the scorer directly, under the assumption that they
are using their own consent UX to explain the feature to the user.

Bug: 16577529
Change-Id: I2a6edb7f1f688aaacf9b0152fa1da1a88636c3dc
ndroid/net/NetworkScoreManager.java
b42bdef51c5a4de44333ad268f25df1aac5ab880 05-Nov-2014 Jeff Davidson <jpd@google.com> Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev
fa35d14e431dbfc2418fe736b826922fde6503e7 01-Nov-2014 George Mount <mount@google.com> Allow PathMotion to affect translations in ChangeTransform.

Bug 18207599

Change-Id: I813976527de426ba6fbdc89291d2ecde0135c19d
ndroid/transition/ChangeTransform.java
2f9e7f6d8b6716f0fcc7db9ef797667ebda8a813 05-Nov-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev
cc30c8d729c9d846012ac6dd03c1e51262936e8f 05-Nov-2014 John Spurlock <jspurlock@google.com> Zen: Add the ability to enter "None" mode during downtime.

Updates to the shared config structure and the service backend.

Bug: 16373455
Change-Id: I45761690ba6b32eb81c9e2a5c1f2d4adad93e58d
ndroid/service/notification/ZenModeConfig.java
021a95f761e1bc26cc215a9daedb04af818002f5 05-Nov-2014 Paul Jensen <pauljensen@google.com> Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev
92f6a747085b4b5ed692de4bdb0050c096eae393 04-Apr-2014 Ricardo Cervera <rcervera@google.com> docs: Added info on noHistory and onActivityResult(). Bug: 13807256

Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
ndroid/app/Activity.java
ndroid/content/Intent.java
8b26674aa139965005ff3ba7d284d7d557c2de61 05-Nov-2014 George Mount <mount@google.com> Merge "Fix javadoc." into lmp-mr1-dev
874b35b83613eac69d5a9a35bc62e4ac5efc385c 05-Nov-2014 Adrian Roos <roosa@google.com> Round charging indication to nearest minute

Bug: 18177374
Change-Id: I4eb7fcac83398a4d8432bf092d8d91506646b5a1
ndroid/text/format/Formatter.java
0bdefb9953fd51c86f81a6033a00926a63916065 05-Nov-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev
c53113b37f33c7ed19660c8ec5bfd578e8bb5409 05-Nov-2014 Paul Jensen <pauljensen@google.com> 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.

bug:18252947
Change-Id: I8764cb944c293e01d99822bb52b55af7e9d77853
ndroid/net/DhcpResults.java
ndroid/net/StaticIpConfiguration.java
37bc92cc2332eb6f864977381135c19d6a081a92 03-Nov-2014 John Spurlock <jspurlock@google.com> Zen: Create a new exit condition for "next alarm".

- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.

Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148
ndroid/service/notification/ZenModeConfig.java
090354861a92c1cf0c8c2baa438d1b770d67dd9f 05-Nov-2014 Jungshik Jang <jayjang@google.com> Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev
9342b049b9a605b1904e03f904ec3cbf90f7742d 05-Nov-2014 Alan Viverette <alanv@google.com> Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
326aef0c9402742e29c4503c857f93e75cf9a6ec 04-Nov-2014 Jungshik Jang <jayjang@google.com> Add recorder address to all recording listerner apis.

It enables to recognize which recorder reports record status.

Bug: 18248734
Change-Id: I248ad77212ce584dc16863cbe00639e7ac3c184a
ndroid/hardware/hdmi/HdmiRecordListener.java
ndroid/hardware/hdmi/HdmiTvClient.java
ndroid/hardware/hdmi/IHdmiRecordListener.aidl
a446195b0d22659ff402e3b6ac76b1b876e5fe3b 05-Nov-2014 Alan Viverette <alanv@google.com> Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
9c95264e847b02b688e12a3dd75b1e54502b3246 05-Nov-2014 Alan Viverette <alanv@google.com> Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
d2fa5143910c74fd126359f74b08de84b0f7cf2a 05-Nov-2014 Alan Viverette <alanv@google.com> Use default token instead of wrapped window manager

BUG: 18248602
Change-Id: Id7f06c896dc71db3564fa21d3704222557613035
ndroid/accessibilityservice/AccessibilityService.java
ndroid/view/WindowManagerGlobal.java
2cd23e6b9d8fcdf5dfd052fb2ed0cd80f1d278ba 05-Nov-2014 Alan Viverette <alanv@google.com> Fix hasSurfaceInsets check when creating hardware renderer

BUG: 17729606
Change-Id: I8c7092428b790e0ff3bbf84b64ba385ef2b2f521
ndroid/view/ViewRootImpl.java
aa33a487c8bfa0503a4c744a932a8344a96d52e1 05-Nov-2014 Alan Viverette <alanv@google.com> Merge "Always update date picker position after change in range" into lmp-mr1-dev
84feea1185b8f438f9c7153b9e59bb7361b0a17d 05-Nov-2014 Alan Viverette <alanv@google.com> Abort accessibility node prefetch if parent node is null

BUG: 18004444
Change-Id: I80757daeb6b381947c4f3abbd762711cff2a978c
ndroid/view/AccessibilityInteractionController.java
18b055e106d5452ef390716d3ea8d1641a225361 04-Nov-2014 Alan Viverette <alanv@google.com> Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev
93cad8c4d41f2256d0bfaa455686acf8442d97ff 04-Nov-2014 Alan Viverette <alanv@google.com> Pass surface insets from window attributes rather than params

Params only gets set in certain situations, whereas the actual window
attributes always contain the correct surface insets.

BUG: 18214798
Change-Id: Ib5236ccf3f120b26c5abc8671bf29cb3dc269186
ndroid/view/ViewRootImpl.java
7c1ad0cac642dc9a2e84499d7503b7804e0552fe 04-Nov-2014 Justin Koh <justinkoh@google.com> Hide Surface#lockHardwareCanvas DO NOT MERGE

Hide this for now, will be public in a later release.

Change-Id: Ie13438ed10918df8b044103ef04016494aed1d10
ndroid/view/Surface.java
d54b578e47fb410c776bb3a4272c2c523153f657 24-Oct-2014 Wale Ogunwale <ogunwale@google.com> Fix issue #17305377: Don't kill process if it still has tasks.

We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.

Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.

Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
ndroid/app/ActivityManager.java
ndroid/app/ActivityManagerNative.java
ndroid/app/IActivityManager.java
161977998feebf0a855ea56558464470877040cf 04-Nov-2014 Jeff Davidson <jpd@google.com> Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.

This is necessary/desired for two reasons:

1. UX around network scoring shipped with L despite lacking underlying
platform support. We do not want network scoring applications to
trigger this UX on L devices, and therefore we must break the contract
of what defines a network scorer so that apps build against the new
contract don't trigger the old UX.

2. As a start towards generalizing the term "score" for a potentially
broader role in the future, though that role is very much undefined.

Bug: 18160480
Change-Id: If228977513e32e45bc44dbeda24aa18436fdfca6
ndroid/net/NetworkScoreManager.java
ndroid/net/NetworkScorerAppManager.java
e48ef2a3efedebdcc351b60d2f3c35c987811938 31-Oct-2014 George Mount <mount@google.com> Cancel animation when target changes.

Bug 18201083

Change-Id: I2ea15063b18881c4b31ae6cdc287649dbc4a61f7
ndroid/animation/ObjectAnimator.java
9c95015b0ccaa02b97b4c96950e2b07e6a5a7b4e 04-Nov-2014 Griff Hazen <griff@google.com> Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev
8da8ab5cf2a7faae5691d1e7cd84dfacc7e8cf33 04-Nov-2014 Nicolas Prevot <nprevot@google.com> Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev
ac7774e8c13e5e2881a588012b8710ad3947169c 04-Nov-2014 Nicolas Prevot <nprevot@google.com> Merge "Do not fix uris inside the system." into lmp-mr1-dev
47ffc60578caf0caaf703293a3e96883f6ea5db2 04-Nov-2014 Sander Alewijnse <salewijnse@google.com> Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev
78a3b7d5af8ca97cf31e792dcebb9bfd0b750475 04-Nov-2014 Narayan Kamath <narayan@google.com> Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev
5ecbfeb38b6bdcfe8f3561f8cdcb4af9ba30c886 04-Nov-2014 Alan Viverette <alanv@google.com> Always update date picker position after change in range

BUG: 18204507
Change-Id: Id3ae11cdb68f60901a3145ebd93f3acbbccd71d2
ndroid/widget/DayPickerView.java
5ad076396c43b2d26f9c020f0914623972cadd0e 04-Nov-2014 Deepanshu Gupta <deepanshu@google.com> am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed

* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
Use the right layout for inflating Action Bar.
cd5f3bab37ef1dc041489f53f565416d295916d9 04-Nov-2014 Deepanshu Gupta <deepanshu@google.com> Merge "Use the right layout for inflating Action Bar." into lmp-dev
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
Use the right layout for inflating Action Bar.
84a89ed0f56d4c35cde5a1451a22a6edb59db06a 04-Nov-2014 Deepanshu Gupta <deepanshu@google.com> Merge "Use the right layout for inflating Action Bar." into lmp-dev
184293076201ec510898f8d505a8fe50458d9604 03-Nov-2014 Dianne Hackborn <hackbod@google.com> Few more small meminfo improvements.

- Add in category for graphics driver, and knowledge about it
for N5 (more devices will be added later).
- Renaming the labels for the .oat and .art files to be just
that, so it is clear what they are talking about.

Change-Id: I663ca8bd2febce41fcdde74b0d3a96ef9325edf1
ndroid/os/Debug.java
56f299b87a891db38691cc0260f761c3ce8ef9ac 31-Oct-2014 Andres Morales <anmorales@google.com> Add UserHandle to BeamShareData

Allows NfcService to start the beam transfer
process in the correct user.

Bug:17966846
Change-Id: Ie98c98e763f0c2eabf11afda645c421b0332a2f6
ndroid/nfc/BeamShareData.java
ndroid/nfc/NfcActivityManager.java
1787b4ea436f361e16c289755fa1a35c6e1c8845 03-Nov-2014 John Reck <jreck@google.com> Merge "Fix cancel crash" into lmp-mr1-dev
55b46eff394e23cde692e8acdfd7b42676a3f198 03-Nov-2014 John Reck <jreck@google.com> Fix cancel crash

Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
ndroid/view/RenderNodeAnimator.java
5f2edfc12c4f31a54e81c1ce538a276f61439c92 30-Sep-2014 Griff Hazen <griff@google.com> Improve support for the barcode-on-screen use case for wearables.

Add two small developer apis to wearable extender to help developers
show barcodes on different shaped wearable screens.

Bug: 16299175
Bug: 17005635

Change-Id: I05088ffcc405c69f1e8df7bf967ea930548c7d51
ndroid/app/Notification.java
9d68b3c839046d6a0ef505ab020fc4219ea36170 22-Oct-2014 Narayan Kamath <narayan@google.com> Remove deprecated DateFormat APIs.

bug: 18074066
Change-Id: I99cef45105c9f25075c596cf4f52ec5573565596
ndroid/text/format/DateFormat.java
808fe6f99fba753e0ec4c5e90de0ff7a2140e8a6 03-Nov-2014 Adrian Roos <roosa@google.com> Merge "Fix colored status bar panning issues" into lmp-mr1-dev
862d72e2f4e600d6188f5a21a906d5374ab4f123 03-Nov-2014 Adrian Roos <roosa@google.com> Merge "Improve dump of status bar service" into lmp-mr1-dev
0e2b73f6858479ca963bd53c49f8955d98f14869 27-Oct-2014 Nicolas Prevot <nprevot@google.com> An intent forwarded from a chooser intent will be a chooser too.

If a chooser intent is fired:
If the user picks "work" or "personal apps":
send a chooser intent to the other profile instead of sending a normal intent.

Also using a userId instead of a userHandle for the target user.

BUG:16514027

Change-Id: I2e45cd57ad72e9b7280e772b31fc10938642ba59
om/android/internal/app/ChooserActivity.java
om/android/internal/app/IntentForwarderActivity.java
om/android/internal/app/ResolverActivity.java
2e647efe01dcdb82d2d7f8a23540ba6b690a95d6 03-Nov-2014 Jason Monk <jmonk@google.com> Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev
9301eafbcc39f9cf6980f937f78886f35dec9d9f 03-Nov-2014 Narayan Kamath <narayan@google.com> Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev
f654533f2d22ede2103ebdb2119a924399234d59 31-Oct-2014 Sander Alewijnse <salewijnse@google.com> Show message when intent is forwarded across profiles.

In resolver activity. Solution uses the contentUserHint.

Bug:17199630
Change-Id: I208e55a2bb37c7cd147240986c7659fc66f3e228
om/android/internal/app/ResolverActivity.java
0ed053ef537daa11659e70c91974cded7c9bddc6 01-Nov-2014 Jeff Brown <jeffbrown@google.com> am e333e674: Add a function to boost screen brightness temporarily.

* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
Add a function to boost screen brightness temporarily.
2f1c76f074e2299b4d4327f160b5c83ed99e280a 01-Nov-2014 Alex Klyubin <klyubin@google.com> am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs

* commit 'dcf5af38bfd306af77613aa051393bf7d8e8fb44':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
e333e674a758c39885d4d9779a1aad387fb0e6aa 28-Oct-2014 Jeff Brown <jeffbrown@google.com> Add a function to boost screen brightness temporarily.

When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds. This action is
also considered to be user activity.

Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
ndroid/hardware/display/DisplayManagerInternal.java
ndroid/os/IPowerManager.aidl
ndroid/os/PowerManager.java
182f0a136fca2bff1614cee41178d2052e7dcf61 01-Nov-2014 Svet Ganov <svetoslavganov@google.com> Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
b592d845147f051613fb62896b4e893015f8c413 01-Nov-2014 George Mount <mount@google.com> Fix javadoc.

Bug 18183024

Change-Id: Ia29d46e03b0137cc6964dcf488af052486b6898c
ndroid/transition/Transition.java
fce84f035c35606c5707e735f503f7bdcfd5b2a1 01-Nov-2014 Svet Ganov <svetoslavganov@google.com> Crash apps that print malformed or password protected PDFs.

If apps are writing malformed content (typically not a PDF file) or if the
PDF content they provide to the print system is password protected, are now
crashed as both of these are app bugs.

bug:17636435

Change-Id: Ifce6a3199e587448dd38f6a84290a965c24b698b
ndroid/print/IPrintDocumentAdapter.aidl
ndroid/print/PrintManager.java
d8c941ff46a68b91c53b3b1dd26678593787e0f9 01-Nov-2014 Adam Powell <adamp@google.com> Merge "Don't update OverScroller fling state if no time has passed since start" into lmp-mr1-dev
f34fa3e7aa9be9bf24c955a9ebf34022e4b88c25 31-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Improve low on RAM reporting." into lmp-mr1-dev
be36ebc28dd1f86da521401266fd03ca0b59825c 31-Oct-2014 Christopher Lane <lanechr@google.com> Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev
9f357ae9f038b97e4426bf3707ca94624cdf5d75 31-Oct-2014 Christopher Lane <lanechr@google.com> Add convenience method for getting the complex unit type

Bug: 18193912
Change-Id: Ida29c12c6c3f07ac0657e70d2ab07f2fc4f2cb20
ndroid/util/TypedValue.java
fa21e75734878a9718f85c7d3f28c5946f15d01d 31-Oct-2014 George Mount <mount@google.com> Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev
311506afbba83c11b862c1f95a24dea83fab0aad 31-Oct-2014 Adam Powell <adamp@google.com> Don't update OverScroller fling state if no time has passed since start

If no time has passed when we try to update fling state, skip the
update computation since there is nothing to do.

Fixes a bug where we could return NaN from
OverScroller#getCurrentVelocity.

Bug 17700698

Change-Id: I65042d4d26a29593f66781b58456c2d1e85381c6
ndroid/widget/OverScroller.java
b9eabc5c2b54145772cbec1c6cec90360925e174 31-Oct-2014 Adam Powell <adamp@google.com> Merge "Allow swipe down to dismiss for ResolverDrawerLayout" into lmp-mr1-dev
8079a812aabffe0014cd4c8e3e2a3e273a768436 31-Oct-2014 Amith Yamasani <yamasani@google.com> Merge "Backup and restore battery saver trigger level" into lmp-mr1-dev
b1ecf0d776a2dce5d60802f83fb97c893ba42bf1 31-Oct-2014 Svetoslav <svetoslavganov@google.com> Merge "Adding APIs to enable apps to influence accessibility traversal." into lmp-mr1-dev
94cfd9d7c42287c18bde29aa1ae34944eb448f45 31-Oct-2014 Jason Monk <jmonk@google.com> Move LOCK_TO_APP_EXIT_LOCKED from System to Secure

To prepare for controlling from settings.

While here, add lock to app settings to backups.

Bug: 16957435
Change-Id: I059140cd07a7a0d5ceb4e0bfe5e0176cb96629d3
ndroid/provider/Settings.java
94005240ec21792b96e156f12c19a82d09e77e67 31-Oct-2014 Amith Yamasani <yamasani@google.com> Backup and restore battery saver trigger level

Bug: 17836827
Change-Id: Icb6bf071a0966a8fb9a03fadd0f8b3daa5ad11f8
ndroid/provider/Settings.java
6edb5c665dcb024ae7cfb95b9a92e30dcc5777c1 31-Oct-2014 Dianne Hackborn <hackbod@google.com> Improve low on RAM reporting.

- Don't print every little native process.
- Print in different sections, so if one is too long we don't get the
rest truncated in the log.
- Include other info from meminfo -- ksm and free/used/lost summary.

Change-Id: Iea4ec3860212667e195d2b60b3ded23bfec78436
om/android/internal/util/MemInfoReader.java
dcf5af38bfd306af77613aa051393bf7d8e8fb44 31-Oct-2014 Alex Klyubin <klyubin@google.com> am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs

* commit '8129b8b471e782708be945e40fa82d2c20ebceef':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
88cfb428d4e9ad4a45d829795d5bdce3a0d4c62c 31-Oct-2014 Kenny Guy <kennyguy@google.com> Merge "Tidy up unused hidden methods in LauncherApps" into lmp-mr1-dev
c4fc00a58d1a8a2e3bffd15f447c2ada82913bfa 31-Oct-2014 Nicolas Prevot <nprevot@google.com> Do not fix uris inside the system.

When we fix uris by adding the user id they belong to, the extras
of the intent are unpacked and repacked. This must not happen
inside the system process. It happened when ResolverActivity was
handling an activity intent coming from a different user.

BUG:18198630

Change-Id: I869897013bb2e5522584b404e87a8f20e7943b60
ndroid/content/Intent.java
c418f07993d2aa91010f226cede47b9e62a4faa8 31-Oct-2014 Ignacio Solla <igsolla@google.com> [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.

BUG:18152150

Change-Id: Id5c788bc766d7c45c3f9c96837d5b2824a601f9e
ndroid/provider/Settings.java
dd6cb55b0ef324096ff9f04a75864ecc43397c4f 31-Oct-2014 Kenny Guy <kennyguy@google.com> Tidy up unused hidden methods in LauncherApps

Bug: 17483329
Change-Id: Ic4fbb180bafaa4d2c5ba332fe228c3d9baf4761c
ndroid/content/pm/LauncherApps.java
a0edff4e94bcf0f1fd8c7d32bb8747e868ba314a 31-Oct-2014 Sander Alewijnse <salewijnse@google.com> Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
8e3f4fbdf6e562f4f5731b98e327e8af33b75c4c 22-Oct-2014 Erik Kline <ek@google.com> Remove CONNECTIVITY_CHANGE_DELAY and friends.

Once optimistic addresses become useable upon kernel notification
there will be no need for a connectivity delay.

This change requires kernel changes like:
https://android-review.googlesource.com/#/c/109934

Bug: 17769720
Change-Id: I8510c540aa655aad6a82ee322d591331357ee272
ndroid/net/ConnectivityManager.java
ndroid/provider/Settings.java
5dd072d88459ef434ab756e1adcdcd1ce5eb1beb 31-Oct-2014 Adam Powell <adamp@google.com> Allow swipe down to dismiss for ResolverDrawerLayout

Let the user swipe the intent resolver UI off of the screen to get rid
of it. So satisfying!

Also fix a bug where transitioning between touching the area outside
of the drawer to the drawer itself would misbehave or otherwise
dismiss when it shouldn't.

Bug 18026675

Change-Id: I456cc22b9575dc4c65e45154dc81201fe2045adc
om/android/internal/app/ResolverActivity.java
om/android/internal/widget/ResolverDrawerLayout.java
6c70290ff0b20329c8f173d5c3423eb83ddc46f1 10-Oct-2014 Svetoslav <svetoslavganov@google.com> Adding APIs to enable apps to influence accessibility traversal.

Accessibility focus is a token that can be put on any view and is
entirely controlled by accessibility services which decide whether
to put accessibility focus on a given view and what the traversal
strategy is.

Currently accessibility service use the view tree structure for
traversal which does not always reflect the logical order and the
user experience is sub-optimal. In such cases apps should be able
to influence how they are traversed for accessibility.

This change adds the notion of an accessibilty traversal order.
If a view has next in the traversal, an accessibility service has
to traverse the content of this view before traversing the content
next one.

This change will enable accessibility service to move away from
using the view tree and use spatial location of the content while
app developers can also influence the treversal order.

bug:17319923

Change-Id: Ib67ae4577f30b2c96575c71538dc1afdea08bfd3
ndroid/view/View.java
ndroid/view/accessibility/AccessibilityNodeInfo.java
ndroid/widget/RemoteViews.java
0c189ca5c4ee8a61c89d437ff22fd2628b353765 31-Oct-2014 Alan Viverette <alanv@google.com> Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev
57928195a89971e89273c4ef06397d78b0bd0233 31-Oct-2014 George Mount <mount@google.com> Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev
685a8770c018d02080d29f18fcb9e50a182912aa 30-Oct-2014 Alan Viverette <alanv@google.com> Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev
159da3dba8811017c683fcee26c795be1948b0c4 30-Oct-2014 Craig Mautner <cmautner@google.com> Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev
9c79504225f60c72c947220b6aca928f11279e1c 29-Oct-2014 Craig Mautner <cmautner@google.com> Add enter-animation-done callback for system windows

Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.

The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.

Fixes bug 16661752.

Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
ndroid/view/IWindow.aidl
ndroid/view/ViewRootImpl.java
ndroid/view/ViewTreeObserver.java
om/android/internal/view/BaseIWindow.java
8e93f0c3bc8497a7ca1ce97a3bd8948612d52c1e 30-Oct-2014 Alex Klyubin <klyubin@google.com> Mention ECDHE_PSK bug in Javadoc of PskKeyManager.

Bug: 18144779
Change-Id: I50e1bb18456295170ef288ad089a0edad7f00ecf
ndroid/net/PskKeyManager.java
e69bebd5aa8ddc6f2e0c576a58b538b336516879 30-Oct-2014 Mark Renouf <mrenouf@google.com> Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE

BUG: 18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
ndroid/view/WindowInsets.java
35c3cb6a598d2868db064a2dcd6f3b7031fe9f0a 30-Oct-2014 Alan Viverette <alanv@google.com> Remove scroll view from correct parent in AlertController

BUG: 18191700
Change-Id: I37602fc26d103b76021f00c58f03bc32d7a978fe
om/android/internal/app/AlertController.java
1fb941dd4f089fd778d1438fe8588be0eca8848a 30-Oct-2014 George Mount <mount@google.com> Ensure views are attached prior to starting enter transition.

Bug 17964119

Change-Id: Ic4ecd5aa9a3bbe5565381b8d9b3c79dd47720e5d
ndroid/app/EnterTransitionCoordinator.java
3aa1ffbc75e39b8e53b64256775ea917ca0c6bee 30-Oct-2014 Alan Viverette <alanv@google.com> Fix inset check in ThreadedRenderer

BUG: 17729606
Change-Id: I9303a788968b424fd8ca27fe4bb99bab51ec34a7
ndroid/view/ThreadedRenderer.java
ndroid/view/WindowManager.java
ca5094a05ce177c586f873ad556e7afc2656fe12 30-Oct-2014 George Mount <mount@google.com> Fix NPE when snapshot ImageView uses ScaleType.MATRIX.

Bug 18170774

Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
ndroid/app/ActivityTransitionCoordinator.java
0bffc736e1f260724764d31f7499cbc09471a535 27-Oct-2014 Deepanshu Gupta <deepanshu@google.com> Use the right layout for inflating Action Bar.

The choice of Action Bar layout depends on the theme. This also affects
the widget used to render the Action Bar.

Bug: http://b.android.com/77853
Change-Id: I6219a02853b4cd207a6125a5ed96fa5d16699460
ndroid/widget/Toolbar.java
f7dee54b62b02413fc6a0b8dc5666a7cd9758460 30-Oct-2014 Alan Viverette <alanv@google.com> Only draw AbsListView selector when focused or pressed

BUG: 18176135
Change-Id: Ibd9d9c0f439e5daa8eba606abc5ff055a3d8ff0c
ndroid/widget/AbsListView.java
fc2b9039b87afd3067f563a9bf59504a8bdf8a87 30-Oct-2014 John Spurlock <jspurlock@google.com> Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev
734666657f1bb8a74b62cbf13758d8ac5ac98b1d 30-Oct-2014 John Spurlock <jspurlock@google.com> Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.

Bug: 18186862
Change-Id: I685934118a53ba2135eaf0872564e58069de2a30
ndroid/provider/Settings.java
272e2f73bd825aa6b1db0a5b332effe8b84d7b8c 30-Oct-2014 Alan Viverette <alanv@google.com> Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev
7f4a63d1ebc13c6499a48331ecb78c4d27446dbc 30-Oct-2014 Alan Viverette <alanv@google.com> Ensure we don't pass null values in to Theme.resolveAttributes

BUG: 18182274
Change-Id: I08acf877cb81478cc205254edf92a31fcf05991d
ndroid/content/res/Resources.java
112e053b9a07972d5ceddc3ad19c7252f3963071 29-Oct-2014 Sander Alewijnse <salewijnse@google.com> Change javadoc of setAccountManagementDisabled.

Method can also be called by device owner.

Bug:18166033
Change-Id: I38ab17bdfe9f0c4b33f5257d2f335afe16e84031
ndroid/app/admin/DevicePolicyManager.java
bbb2c5b28ad153afef40e27efbb8241988f33583 30-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev
e21a26b3ba78b0238f4ed4a09b43319a2320fbaa 28-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Add support for running 464xlat on wifi as well.

1. Add a command to NetworkManagementService to enable/disable
IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
on a wifi network (which means it detected a NAT64), and
correspondingly re-enable offload when the clatd interface
goes down.

This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.

Bug: 12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8
ndroid/os/INetworkManagementService.aidl
e436cb39da5ebd57b0ca072ba39bfbe52b0a75e7 30-Oct-2014 Chris Banes <chrisbanes@google.com> Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev
33d9dc46cfbe42e508b2c4b97801059964b3476b 30-Oct-2014 Yigit Boyar <yboyar@google.com> Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev
a9ba2cdfc10f8bdeee2bd8fb95432df873003f44 30-Oct-2014 Alan Viverette <alanv@google.com> Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev
674a3a21cba94c129b322b05bbaaf9b1fc8afbd8 30-Oct-2014 Alan Viverette <alanv@google.com> Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev
d739d7bd8aa4dc9f12968f21a8faa3544215092b 30-Oct-2014 Alan Viverette <alanv@google.com> Ensure ImageView.setImageResource() always resolves Drawable

Fixes no-op on method call after configuration change at the expense
of removing a micro-optimization that wasn't really needed.

BUG: 18178233
Change-Id: I36eccf91b138e4bed34be96d9b87200edeb66938
ndroid/widget/ImageView.java
104504053d33d337d52350960c48a1edc5ba1444 30-Oct-2014 Alan Viverette <alanv@google.com> Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
154c2c24dc3b741bcc0d54c46d349478d24472ac 29-Oct-2014 Alan Viverette <alanv@google.com> Show scroll indicators in AlertDialog

BUG: 16353356
Change-Id: I0307283751ccb23b9d85b0c36cb78b01243e70dd
ndroid/view/View.java
om/android/internal/app/AlertController.java
f2969405020a72e282c348a6ea201d56e9f8d4ba 30-Oct-2014 Alan Viverette <alanv@google.com> Distinguish unspecified and explicit null values in resources

BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
ndroid/content/res/TypedArray.java
ndroid/util/TypedValue.java
720a5c51beb5beab442832ea8d169aa5b4edb43f 30-Oct-2014 Adam Lesinski <adamlesinski@google.com> Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev
4e7c562c43e9014c8fb3e75d02ba98fa4edadbde 29-Oct-2014 Alan Viverette <alanv@google.com> Merge "Update drawable state after updating tint list" into lmp-mr1-dev
2d3443fc5a6cf0830edd6a498a87760143dbc570 29-Oct-2014 Alan Viverette <alanv@google.com> Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev
66c0adcfd4351518512df2f3e81526d2d67d6d65 29-Oct-2014 Alan Viverette <alanv@google.com> Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev
8785a56c8f35863b7f02769b6021fba7000f6403 29-Oct-2014 Alan Viverette <alanv@google.com> Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev
b1346d7829b83bcd813bc73506525822f4148429 29-Oct-2014 Jeff Hao <jeffhao@google.com> Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
9f60c08a446e38f9e2d5271546ef69ca5941eba9 29-Oct-2014 Jeff Hao <jeffhao@google.com> Change boot screen title to "Android is starting" when not upgrading.

Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
ndroid/app/ApplicationPackageManager.java
ndroid/content/pm/IPackageManager.aidl
ndroid/content/pm/PackageManager.java
79c067c54a944660438c81ac2caf37ec68eedfa9 29-Oct-2014 Alan Viverette <alanv@google.com> Add setters for window elevation and clipToOutline properties

These are available as XML attributes but were lacking setters. None
of the Window properties have getters, so just adding setters here.

BUG: 16847753
Change-Id: I9c032903e94b7f12125210bd73c911243612df69
ndroid/view/Window.java
d86d7bce78a5f6e70bdac8f6d4bb1a968d440128 29-Oct-2014 Alan Viverette <alanv@google.com> Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev
d5133792391443521dc15f7da7de5d280e6703dd 28-Oct-2014 Alan Viverette <alanv@google.com> Update drawable state after updating tint list

BUG: 18155988
Change-Id: Ic536027a54c10b2082fbc22476530165b76e2c59
ndroid/view/View.java
ndroid/widget/AbsSeekBar.java
ndroid/widget/CheckedTextView.java
ndroid/widget/CompoundButton.java
ndroid/widget/FrameLayout.java
ndroid/widget/ImageView.java
ndroid/widget/ProgressBar.java
178d3b54cd50558be789c5dfd8dad80ffdc65021 29-Oct-2014 Andre Eisenbach <eisenbach@google.com> Fix crash during Bluetooth on/off stress test

Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
ndroid/bluetooth/BluetoothAdapter.java
2b12b58f942e34e8c0cc5095cca71dbaaa029624 29-Oct-2014 Alan Viverette <alanv@google.com> Create translucent hardware renderer if surface insets are non-zero

BUG: 18160604
Change-Id: Ie4483b9841bd91778659d83b154f69e777fa1dfc
ndroid/view/ViewRootImpl.java
3abf5c4bd167547b7e995f1b14ae1bae210c5fec 29-Oct-2014 Alan Viverette <alanv@google.com> Use action mode context for ActionMode menu inflater

BUG: 18078900
Change-Id: Iff837e741dde79a565f1e8c83846ee6155da179e
om/android/internal/app/WindowDecorActionBar.java
cb383183d722a9ef03ab8b8cb0d0e419efd96598 29-Oct-2014 Narayan Kamath <narayan@google.com> Fix getPackageInfo("android") in the system server.

The fix for bug 16555230 attempted to return the same LoadedApk
object between the system context object and the activity thread's
list of opened packaged. This ensured that we used the same classLoader
on both these objects (among other things).

However, the object the Context owns is actually incomplete (and
necessarily so) because it might be created before the package
manager is and we need the package manager to construct a complete
LoadedApk object.

Work around this by manually setting the classloader and aInfo for
"android" contexts created by the system server's activity thread.

bug: 18167468
Change-Id: I623634f912111f89eaf716b8258d1926d2513dcd
ndroid/app/ActivityThread.java
7a0ae7ed31a9e7e296c549dfbf035bf4270be69c 29-Oct-2014 Alan Viverette <alanv@google.com> Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev
fe6d57c366ba78295d3320cb73512f02876eed61 24-Oct-2014 Yigit Boyar <yboyar@google.com> Move all actionbar related methods to DecorToolbar

Bug: 17999561

Change-Id: I36af443cf245aedd64a079726c1a2e6f6068f221
om/android/internal/app/ToolbarActionBar.java
om/android/internal/widget/ActionBarView.java
om/android/internal/widget/DecorToolbar.java
om/android/internal/widget/ToolbarWidgetWrapper.java
53f28eccc546504cb1e894c02176ecce3139264e 29-Oct-2014 Adrian Roos <roosa@google.com> Improve dump of status bar service

Tracks which window caused the disable flags
instead of just blaming PhoneWindowManager.

Bug: 17830264
Change-Id: If6c957120bb2ee8e0083f80e35c71eb21b8672b6
om/android/internal/statusbar/IStatusBarService.aidl
0e7ae4efe8f424fa1ced8f7e5f3d8ae78066592b 01-Oct-2014 Adrian Roos <roosa@google.com> Fix colored status bar panning issues

Bug: 17695293
Change-Id: I6a1267f8dff27e7b78ab312a71648ef16ab9483b
ndroid/view/ViewRootImpl.java
om/android/internal/view/RootViewSurfaceTaker.java
402152d6736839d89a9179cd4371201020074797 29-Oct-2014 Chris Wren <cwren@android.com> Merge "Reveal notification listener settings APIs." into lmp-mr1-dev
1970cfd4ef97a5a1b5dc385b114d615d858c359b 29-Oct-2014 Chris Banes <chrisbanes@google.com> Fix ActionMenuView vertical alignment of items

BUG: 18066203
Change-Id: I2a34f5b8b33e1e0f32c54acf79b281290fc047f1
ndroid/widget/ActionMenuView.java
befe778c73e48417942fc31c06509bac8e5ca0d2 20-Oct-2014 Erik Kline <ek@google.com> Treat optimistic addresses as global preferred.

If the kernel sends notification of an optimistic address then
treat is a useable address (isGlobalPreferred()).

Note that addresses flagged as IFA_F_OPTIMISTIC are
simultaneously flagged as IFA_F_TENTATIVE (when the tentative
state has cleared either DAD has succeeded or failed, and both
flags are cleared regardless).

Additionally: do not consider RFC 4193 ULA addresses sufficient
for "global preffered". They are, by definition, of global scope
but not sufficient for global reachability.

Bug: 17769720
Change-Id: I759623b28fd52758f2d4d76d167f3cafd9319d6a
ndroid/net/LinkAddress.java
def4cd4fa4aa035a5000e6b196130496430d65ff 29-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Support more than one clatd at a time." into lmp-mr1-dev
05b2fedcb8057f31ed078a59a8cffce131449df0 29-Oct-2014 Alan Viverette <alanv@google.com> Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev
f6a36e9cf347a851bc3b717e4c39b484fce4e9c2 29-Oct-2014 Alan Viverette <alanv@google.com> Inflate ActionMode items against the ActionBarContextView theme

BUG: 18078900
Change-Id: I300a0268bacf7e1ebcd64eac3d79548e1c4a9606
om/android/internal/app/WindowDecorActionBar.java
om/android/internal/widget/ActionBarContextView.java
c8787beca679ca593dda05bb151ebe4afdf441c8 29-Oct-2014 Shishir Agrawal <shishir@google.com> Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev
85085343b378f00a34448b69e582226fa584b005 29-Oct-2014 Alan Viverette <alanv@google.com> Add content description to Toolbar collapse button

BUG: 17722111
Change-Id: If6caa8bc61b0d178648952c419591380f4edf4ba
ndroid/widget/Toolbar.java
4bf9edfc1f3a66d6d2f782e7d6f8e9d9002b3971 28-Oct-2014 Alan Viverette <alanv@google.com> Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev
726d4de780dea9afded2e44a010b793f7ac29c23 28-Oct-2014 Mike Lockwood <lockwood@google.com> Add dumpsys support for bluetooth

Bug: 18159457
Change-Id: I8d3f7084a7b089c111fd622ff526630bfdfa7300
ndroid/bluetooth/IBluetooth.aidl
om/android/internal/util/StateMachine.java
632af849240f54f91b2b4fde77d3a51c4d045f74 28-Oct-2014 Alan Viverette <alanv@google.com> Ensure accessibility focus rect is drawn correctly

Reverts previous change that draws it as part of View.draw() and ensures
that the display is always redrawn if a view has accessibility focus.
Correctly removes focus from views with accessibility focused ancestors.

Also reverts the focus indicator to use a solid line since the dotted
line looked janky.

BUG: 17675993
Change-Id: I25718334cc1ae1c2cd19d3c23af1c18c6a67504c
ndroid/view/View.java
ndroid/view/ViewGroup.java
ndroid/view/ViewRootImpl.java
ndroid/widget/AbsListView.java
8326a8a9453be1fa401f187994f7c8fabe68e489 22-Oct-2014 Chris Wren <cwren@android.com> Reveal notification listener settings APIs.

Fix the value of the ACTION_NOTIFICATION_LISTENER_SETTINGS constant
to be the actual value to which the settings app responds.

Bug: 10023397
Change-Id: I80a0ff76406a3b0b893793f9a63ffa563dae103b
ndroid/provider/Settings.java
1ae88e342081b36e3dd791930cebeccb395cedb8 27-Oct-2014 Shishir Agrawal <shishir@google.com> Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37

The change above deleted these lines by mistake.

Bug: 18153840
Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4
ndroid/provider/CallLog.java
ee990413b51b41e4fe8940cba703bdfb56a12018 28-Oct-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev
95d520f160db65f90da56610eee1a047fb60fc4e 28-Oct-2014 George Mount <mount@google.com> Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
45b701085b8507006c07f5eb86d9f29f4ee07457 28-Oct-2014 George Mount <mount@google.com> Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
c90e6fe863bb5ac84612bd777d3b352f69265950 28-Oct-2014 John Spurlock <jspurlock@google.com> Zen: Show "(until 4:56 PM)" in exit conditions.

Implement two-line exit conditions, display the duration + end
time on separate lines.

Bug: 16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
ndroid/service/notification/ZenModeConfig.java
954394653dad05838235f48244a4320893e0f0cf 09-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Support more than one clatd at a time.

1. Make Nat464Xlat a per-network object, one for every network
requiring clat, instead of a ConnectivityService singleton.
2. Make the NetworkManagementService clatd commands take an
interface.
3. When we attempt to start clatd on a network, store its
Nat464Xlat object in the NetworkAgentInfo, so we have an
authoritative way of knowing whether clat is running on a
given network.
4. Rework Nat464Xlat, hopefully simplifying it.

Bug: 12111730
Change-Id: I1fa5508ef020cd1c3d1c7a1f7b06370ac5fc2ae2
ndroid/os/INetworkManagementService.aidl
555f1986f106ccf1ec05f6e4118a19f9a6496dc5 01-Sep-2014 Nicolas Prevot <nprevot@google.com> Replace minimum with maximum in method description.

BUG:18152344

Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
ndroid/os/ConditionVariable.java
dd91fb44743f15ee308a4cfedeca6338b6912fdc 28-Oct-2014 Erik Kline <ek@google.com> Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
111cc9f511dc65006fc2972c9ecbf295619e09b9 28-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
f3cab63ef2248aebf2c931cd1e84d5739791fa50 20-Oct-2014 Lorenzo Colitti <lorenzo@google.com> Change removeStackedLink to take an interface name.

This simplifies callers.

Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.

Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
ndroid/net/BaseNetworkStateTracker.java
ndroid/net/LinkProperties.java
ndroid/net/MobileDataStateTracker.java
ndroid/net/NetworkStateTracker.java
d3b9fd33c69fa4fb844238c90b1fd343052946d9 24-Oct-2014 Erik Kline <ek@google.com> (re)define the definition of "provisioned"

Specifically:

[1] provide a hasIPv4(), and
[2] a hasIPv6()

each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.

Additionally:

[3] redefine isProvisioned() to return the logical OR
of [1] and [2] above.

Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".

Bug: 17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
ndroid/net/LinkProperties.java
e5d27a22a6908026d346e86389cf414b5badeab6 28-Oct-2014 Alan Viverette <alanv@google.com> Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev
d4e7790fee10e21b41a1c387c2734722bda56a0b 28-Oct-2014 Alan Viverette <alanv@google.com> Play CLICK sound effect when compound buttons are clicked

Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.

BUG: 16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5
ndroid/widget/CompoundButton.java
ndroid/widget/Switch.java
99b4e8507309f8e08ecc0baf994ccdc8020d6359 28-Oct-2014 Alan Viverette <alanv@google.com> Update drag-to-open menu close behavior

Menu now closes if the user opens using long-press and then lifts their
finger when touching outside of the menu. This is consistent with the
normal drag-to-open interaction model.

BUG: 16352041
Change-Id: I06aafae7b702ef44000ed19707c46e2bb595095e
ndroid/widget/ListPopupWindow.java
b0aeaad442e6cd4920d75a63d65a91267cf9199a 28-Oct-2014 John Reck <jreck@google.com> Merge "Cleanup debug options" into lmp-mr1-dev
384755230c52f0951820ba496f300959dcc84ead 28-Oct-2014 Alan Viverette <alanv@google.com> Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev
253626b822b3b20fdb9727705593b4b5b55b8553 27-Oct-2014 Alan Viverette <alanv@google.com> Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev
eca1ae5e442bf5f13617ab823343730619512632 27-Oct-2014 George Mount <mount@google.com> Fix NPE in moveSharedElementsToOverlay

Bug 18119532

Change-Id: I334bda2d63427032583a15a483e000412024c150
ndroid/app/ActivityTransitionCoordinator.java
49c1527cd530d880b37c2f0becf57043740b491c 27-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev
4c2e3491ec6cf20bcf95a922f396473e33bc4e98 27-Oct-2014 Dake Gu <dake@google.com> Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
e67b8d28294d9af440d2ea23f1b2c68dfcba8b1b 27-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
23d307c8d88f4a3849163b9e5b7cd11d0d4f372c 27-Oct-2014 John Reck <jreck@google.com> Cleanup debug options

Bug: 18138852
Bug: 18065434
Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00
ndroid/view/ThreadedRenderer.java
e0f76e9a6d352c45a1729b99ea0df59bd4359423 27-Oct-2014 George Mount <mount@google.com> Merge "Fix transition being canceled improperly." into lmp-mr1-dev
03d5c6f55b316a5b0e1aae405077d1083df60b36 27-Oct-2014 George Mount <mount@google.com> Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev
1bb18c435dbf967f3a9bc9d680411471b8bab4ac 18-Aug-2014 Adam Lesinski <adamlesinski@google.com> Add dumpsys output to UsageStatsService, along with --checkin support

Bug:17814138
Change-Id: If414ae5f4b8e4a2838f63f52d80e764915cee934
ndroid/content/res/Configuration.java
b32f04b785306f06d7d07b824fb8dcc1b4a61aa6 25-Oct-2014 Svet Ganov <svetoslavganov@google.com> Merge "Printing from two apps at the same time not working." into lmp-mr1-dev
99a82437ed8e0537d9a355a124d2bb30aea46ad8 25-Oct-2014 Svet Ganov <svetoslavganov@google.com> Printing from two apps at the same time not working.

When printing from two apps at the same time the second print UI is
getting stuck. There were a couple of issues here:

AdapterView was not notifying for item selection if the data changes
after scheduling a dalayed selection notification and the notification
execution. The code assumed that a layout pass will occur and posponed
the notification after the layout pass but it is not guaranteed that
such a layout pass will occur. Now we delay only if a layout pass is
being scheduled.

Also when binding to the PDF rendering service the print spooler was
using the same intent and as a result two print activites were getting
the same renderer instance while they should get separate ones. Now
we use different data in the intent to ensure we get separate renderer
instances.

Change-Id: I6aa7c7b041957804b4273549dd837a6d70064efc
ndroid/widget/AdapterView.java
b7573c2dbaff442a0f9f814bdc05aaa685574870 24-Oct-2014 George Mount <mount@google.com> Add resizeClip attribute to ChangeBounds.

Bug 17765948

Added the XML attribute for the resizeClip property of
ChangeBounds. Also updated support for resizing a view
using its clip bounds and position to fix the TODO.

Change-Id: I358d07d6a28fed4b7f39f9ccb9d89b9325f64239
ndroid/transition/ChangeBounds.java
ndroid/view/View.java
333b8093eaab4b55d91a7a0b3b1484424f8ac975 22-Oct-2014 George Mount <mount@google.com> Fixed: Nested shared elements now transition separately.

Bug 18073470

Shared element ordering was based on the key ordering in an
ArrayMap. This is normally fine, but when shared elements
are nested, the child's layout can be overwritten by the
parent's if it is laid out first. The only way to force the
ordering of shared element layout was the change the transition
name. To fix this, shared elements are now laid out parent
first, then child.

On return, nested shared elements were not transitioning to their
final destination properly because the matrix used to calculate
their position was not correct. This change recalculates the
parent matrices when appropriate.

Change-Id: I62333183cf03519e525587e4ea31fcf14bb83cdc
ndroid/app/ActivityTransitionCoordinator.java
ndroid/app/EnterTransitionCoordinator.java
b71580c34efcc12bf7221c57eccaf80f36cb23bc 25-Oct-2014 George Mount <mount@google.com> Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
83c692efd3c53050fce132dfd2ef21763d3cf010 23-Oct-2014 George Mount <mount@google.com> Fix NPE when rejected snapshots are null.

Bug 18055705

Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864
ndroid/app/EnterTransitionCoordinator.java
9678e34521d7eaa38cd93bee32b1e307956b74bd 25-Oct-2014 Alan Viverette <alanv@google.com> Clean up some javadocs in Window.setFeature...()

Change-Id: I80812f9ce7a746ad9686aa4462f7570dfd9b4c0e
ndroid/view/Window.java
74a4a8d6162dde06297ff6c3ef264e7f9066b88f 24-Oct-2014 Svetoslav <svetoslavganov@google.com> Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev
50eb025c2fea7e364e0be951ce8ba6ca605f901a 24-Oct-2014 Alan Viverette <alanv@google.com> Fix min/max date range in DatePicker calendar mode

Also cleans abstraction of various day/year pickers and adapters.

BUG: 18104457
Change-Id: Ifde664788d8123a3123303940bac63c1350c2cd7
ndroid/widget/DatePickerCalendarDelegate.java
ndroid/widget/DatePickerController.java
ndroid/widget/DayPickerView.java
ndroid/widget/SimpleMonthAdapter.java
ndroid/widget/SimpleMonthView.java
ndroid/widget/YearPickerView.java
1ac52667ee03af090bb13d1ccf45ee6f38ddee3c 24-Oct-2014 Alan Viverette <alanv@google.com> Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev
5274dcc85dc18b524b729ae9a2148c651dc1a654 24-Oct-2014 Jeff Sharkey <jsharkey@android.com> Drop DEV network stats to save RAM.

We migrated to pure XT stats a long time ago, so we no longer need
to keep the DEV stats cached in RAM. This saves ~250KB on a typical
device.

Bug: 18118003
Change-Id: I3d84ba47073fa3500454784afc956c8e53404492
ndroid/provider/Settings.java
9f837a99d48c5bb8ad7fbc133943e5bf622ce065 24-Oct-2014 Jeff Sharkey <jsharkey@android.com> Reduce PackageManager RAM usage: ArrayMap/Set.

Transition PackageManager internals away from heavier HashMap/HashSet
to use drop-in ArrayMap/ArraySet replacements. Saves ~38% RAM and
thousands of objects on a typical device.

Bug: 18115729
Change-Id: Ie107d2fee4b7baa4e3c3923231b4be877d1a5d2f
ndroid/content/pm/PackageParser.java
ndroid/content/pm/PackageUserState.java
ndroid/util/ArraySet.java
ffb46bf2956d89e3190007ccf2ef3ce3eed005fe 24-Oct-2014 Alan Viverette <alanv@google.com> Add support for Explore by Touch to RadialTimePickerView

Also adds IntArray, which is like LongArray for integers, and prevents
the AM/PM label text in the time picker header from wrapping.

BUG: 17468036
Change-Id: I7120089885709f23e20368927e4b3ed9db2e5393
ndroid/util/IntArray.java
ndroid/widget/RadialTimePickerView.java
ndroid/widget/SimpleMonthView.java
ndroid/widget/TimePickerClockDelegate.java
om/android/internal/widget/ExploreByTouchHelper.java
2d87ba630cdcb6695582c655e6fc091115ffea38 24-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "Allow I/O when installing providers." into lmp-mr1-dev
5c1a49651b4e0a15a938560394bffeaeb5718f72 24-Oct-2014 Christoph Studer <chstuder@google.com> Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
104d2484ec605d9673e74cc125d92d41b6968327 24-Oct-2014 Jason Monk <jmonk@google.com> Merge "Show screen pinning toasts on all users" into lmp-mr1-dev
bcd076525ccb8a3dfe7d1002bcae059661c1d111 22-Oct-2014 Adrian Roos <roosa@google.com> Add API for querying trusted state

Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
ndroid/app/KeyguardManager.java
ndroid/app/trust/ITrustManager.aidl
fa36b36c8b66fc89f446a9eb065c31a1b224e662 24-Oct-2014 Narayan Kamath <narayan@google.com> Merge "Deprecate more apache-http." into lmp-mr1-dev
5b062e07c5a647d12cbeb9dace7806b54d459c56 24-Oct-2014 Yuncheol Heo <ycheo@google.com> Merge "CEC: Fix apilint errors." into lmp-mr1-dev
07ff2f72c8ae14415d784ddeb3944c5a9b188a83 24-Oct-2014 Neil Fuller <nfuller@google.com> Merge "Deprecating FloatMath and Time" into lmp-mr1-dev
2b0da5c4c84305f1d391dc78b85e244c9fd92456 22-Oct-2014 Yuncheol Heo <ycheo@google.com> CEC: Fix apilint errors.

- Change 'protected' to 'package private'.
- Change '@hide' to '{@hide}' for methods which should be still hidden
for linting.
- Rename addVendorCommandListener to setVendorCommandListener and make sure to be called once.
- Fix the implementation of removeHotplugEventListener().

Bug: 18063669
Change-Id: I5c032736f17bab9518f21596f7adeac2f88ba4c1
ndroid/hardware/hdmi/HdmiClient.java
ndroid/hardware/hdmi/HdmiControlManager.java
ndroid/hardware/hdmi/HdmiDeviceInfo.java
ndroid/hardware/hdmi/HdmiHotplugEvent.java
ndroid/hardware/hdmi/HdmiPlaybackClient.java
ndroid/hardware/hdmi/HdmiPortInfo.java
ndroid/hardware/hdmi/HdmiRecordListener.java
ndroid/hardware/hdmi/HdmiRecordSources.java
ndroid/hardware/hdmi/HdmiTimerRecordSources.java
ndroid/hardware/hdmi/HdmiTvClient.java
fa7651877ff67b0729ced4fe2c449cba89b62221 24-Oct-2014 Yuncheol Heo <ycheo@google.com> Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev
bd6fabe2ae535cf5d31fc7a1952e43ad6e653e2e 24-Oct-2014 Svetoslav <svetoslavganov@google.com> Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev
5487ab07c77558efa524cfc9b40cbe6fe90fc50e 22-Oct-2014 Yuncheol Heo <ycheo@google.com> CEC: Fix JavaDoc errors.

- Removed the link tag to the non-public objects.

Bug: 18063758
Change-Id: I17c79510c184df8a62cde9a6a1d18109c299c15d
ndroid/hardware/hdmi/HdmiClient.java
82fd842827fcdb3570d0c606bd049f42bf2b3fba 23-Oct-2014 George Mount <mount@google.com> Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev
fa9ed8ca0a08be0b32b2ccc33563a47df1f6d3da 23-Oct-2014 Yigit Boyar <yboyar@google.com> Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev
aca6ccf403a4b861419fae1be64500e3df3a81f7 23-Oct-2014 John Reck <jreck@google.com> Merge "Improve documentation" into lmp-mr1-dev
43a5328c8377aa29acd51098d915503e87f13a9a 23-Oct-2014 John Reck <jreck@google.com> Improve documentation

Bug: 17440886

Change-Id: I3f5c0dab6e08c0097fe60eb269e7fffe7b48b563
ndroid/view/Surface.java
4ad964d98d058d4569925479e1314463b6a8c329 23-Oct-2014 Alan Viverette <alanv@google.com> Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev
523a129ced08a41468f3d52cf16ebb237f280e39 23-Oct-2014 George Mount <mount@google.com> Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev
daf33ed85353ab7d7a7668dd0e3f9a66f0d5583f 23-Oct-2014 Alan Viverette <alanv@google.com> Swap names for clock delegates so they are correct

Change-Id: Ic11affae802f0afe4746f65f0b96979a7c5a9c0a
ndroid/widget/TimePicker.java
ndroid/widget/TimePickerClockDelegate.java
ndroid/widget/TimePickerSpinnerDelegate.java
c8a09d543429e1a937a13e2173c96255579495f7 23-Oct-2014 Pavel Zhamaitsiak <pavelz@google.com> Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev
d359952459f96a9b57f50a7434b8660836c6e987 23-Oct-2014 George Mount <mount@google.com> Use one method to change bounds in ChangeBounds.

Bug 17936593

Instead of calling setLeft(), setTop(), setRight(), setBottom()
separately, make one call that does all at the same time.

Change-Id: I986274f3a98b3136e71204501ffc272986ad31dd
ndroid/transition/ChangeBounds.java
ndroid/view/View.java
b977ade1e40393f661722d8eec636d10c7541588 23-Oct-2014 Filip Gruszczynski <gruszczy@google.com> am 625ec484: Check if context is actually an activity.

* commit '625ec4849118f061a99558ad558b16020435a88d':
Check if context is actually an activity.
e41a9cf9f71785ec3271f11265cffb4438b26f91 22-Oct-2014 Etan Cohen <etancohen@google.com> Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.

Change-Id: I233b003af57a550f2f51b12213700ab0451039e5
ndroid/provider/Settings.java
b1df48e469cae5b0f3888c4d0410b78153503069 23-Oct-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev
d422dc358f0100106dc07d7b903201eb9b043b11 25-Sep-2014 Yigit Boyar <yboyar@google.com> Added a generic configuration and theme based cache

For now, only animators use it but we can consider migrating
drawable cache to it as well.

Bug: 17456416
Change-Id: I571b96856805edb171f0fc52e6bff5a365f46b70
ndroid/animation/Animator.java
ndroid/animation/AnimatorInflater.java
ndroid/animation/AnimatorSet.java
ndroid/animation/FloatKeyframeSet.java
ndroid/animation/IntKeyframeSet.java
ndroid/animation/KeyframeSet.java
ndroid/animation/Keyframes.java
ndroid/animation/PropertyValuesHolder.java
ndroid/animation/StateListAnimator.java
ndroid/animation/ValueAnimator.java
ndroid/content/res/ConfigurationBoundResourceCache.java
ndroid/content/res/ConstantState.java
ndroid/content/res/Resources.java
ndroid/view/animation/AccelerateDecelerateInterpolator.java
ndroid/view/animation/AccelerateInterpolator.java
ndroid/view/animation/AnimationUtils.java
ndroid/view/animation/AnticipateInterpolator.java
ndroid/view/animation/AnticipateOvershootInterpolator.java
ndroid/view/animation/BaseInterpolator.java
ndroid/view/animation/BounceInterpolator.java
ndroid/view/animation/CycleInterpolator.java
ndroid/view/animation/DecelerateInterpolator.java
ndroid/view/animation/LinearInterpolator.java
ndroid/view/animation/OvershootInterpolator.java
ndroid/view/animation/PathInterpolator.java
bb2e2cae5881ec1806576a737e8d554301332f9f 23-Oct-2014 Jeff Sharkey <jsharkey@android.com> Allow I/O when installing providers.

Bug: 17879170
Change-Id: I073d5b56bab6db01290aad5386c53c305669dc5b
ndroid/app/ActivityThread.java
a585268aff94b620b2c22e9ba3ae1163bb5dc8a8 23-Oct-2014 Jason Monk <jmonk@google.com> Show screen pinning toasts on all users

Bug: 17657660
Change-Id: I964a210e7fb105e9494a7ab7f383aa9d141ba136
ndroid/widget/Toast.java
625ec4849118f061a99558ad558b16020435a88d 23-Oct-2014 Filip Gruszczynski <gruszczy@google.com> Check if context is actually an activity.

Bug: 18101409
Change-Id: Iab21338ef4ccaab0ce66d664502e0b5e88ad9c50
om/android/internal/widget/SwipeDismissLayout.java
8c4e97db879eef3b943325a971a145e5223f49f8 23-Oct-2014 Svetoslav <svetoslavganov@google.com> Enhance computation of click point for accessibility.

In explore by touch mode the user performs a double tap to click on
an item. In this case the system sends down and up events at the
location of accessibility focus. The accessibility focused view may
be partially covered. In order to click in this view we compute a
point where to send the down and up events. This clicking strategy
is a bridge-gap and we will switch to accessibility actions in the
future.

When computing the point to click we were taking into account whether
the view was covered by a clickable sibling or a clickable sibling of
a predecessor. Despite our expectation cases in which this is not
enough happen in practice. In particular, the focused view may be
covered by a clickable descendant of a non-clickable sibling of a
predecessor that covers the focused view. This change takes care
of handling this case. Note that computing the click point is a fair
amount of work but this happens very rarely and on demand. Also the
code is short circuiting where possible.

Change-Id: I4d3cd8b67a7baf0bcc12f370ea7ba1b04c42c355
ndroid/view/View.java
ndroid/view/ViewGroup.java
823675fdbb7f974b8e2fa9fbb71774b32487582d 23-Oct-2014 Narayan Kamath <narayan@google.com> Deprecate more apache-http.

bug: 18067888

Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2
ndroid/net/Proxy.java
ndroid/net/ProxyInfo.java
ndroid/net/SSLCertificateSocketFactory.java
ndroid/net/http/AndroidHttpClient.java
om/android/internal/http/multipart/FilePart.java
om/android/internal/http/multipart/MultipartEntity.java
om/android/internal/http/multipart/Part.java
om/android/internal/http/multipart/StringPart.java
e15db7c23d9e99e6f788a69d07a8436c6039bb08 22-Oct-2014 Sreeram Ramachandran <sreeram@google.com> Add an API to select a network for a DatagramSocket.

Mirrors the API that does this for Sockets.

Bug: 18076907
Change-Id: Ifa27b39e23797558546aab751fbfb3aed3b7dbcb
ndroid/net/Network.java
bbf8871e1c7ef762b3f9505cca924568c48e8be5 23-Oct-2014 Neil Fuller <nfuller@google.com> Deprecating FloatMath and Time

Bug: https://code.google.com/p/android/issues/detail?id=36199
Bug: https://code.google.com/p/android/issues/detail?id=37653
Bug: https://code.google.com/p/android/issues/detail?id=42750
Bug: https://code.google.com/p/android/issues/detail?id=61137
Bug: https://code.google.com/p/android/issues/detail?id=74754
Bug: https://code.google.com/p/android/issues/detail?id=76386
Bug: https://code.google.com/p/android/issues/detail?id=76439
Bug: https://code.google.com/p/android/issues/detail?id=77836
Change-Id: Ic9b57d8a575f93b2258a5481df0ed6b3a952f636
ndroid/text/format/Time.java
ndroid/util/FloatMath.java
d8bc6677e5b923cda9e953b60c936815368fb84a 23-Oct-2014 Svet Ganov <svetoslavganov@google.com> Merge "Optimize text rendering in accessibility mode." into lmp-mr1-dev
e8f676c0e580f5ffffbc23befd4b4ffac0d0a332 23-Oct-2014 Alan Viverette <alanv@google.com> Merge "Use correct smooth scroll default duration" into lmp-mr1-dev
e1201e87f4eb83783d8f9f3e46699cc18abb03f6 23-Oct-2014 Alan Viverette <alanv@google.com> Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev
bd266fef814922448a048107e9d13a2a22a5d957 23-Oct-2014 Alan Viverette <alanv@google.com> Lighten action bar on light theme, use secondary color for subtitle

Also cleans up some code in ActionBarView.

BUG: 17987639
Change-Id: I7dcdf18748d6da5792900ab9a78775a0511f982a
om/android/internal/widget/ActionBarView.java
49cb52e296c48613c2177bfcb14fc67e21b9ae03 23-Oct-2014 Bryce Lee <brycelee@google.com> Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev
720f43e4a42ca5cb2544a049d3b60c53174df93a 23-Oct-2014 Alan Viverette <alanv@google.com> Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev
183cef06df00c20df97b6a964dead91c1f7fa0a2 23-Oct-2014 Alan Viverette <alanv@google.com> Merge "Ensure AdapterView doesn't post selection notifications forever" into lmp-mr1-dev
fb1cf36aa739da5dbebc64e61900e9ff96134e26 23-Oct-2014 Bryce Lee <brycelee@google.com> resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev

Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
e38eb4d4ef504c0b72d51dfcc8fcd06cf73c0d50 23-Oct-2014 Alan Viverette <alanv@google.com> Revert "Check MenuItem.isVisible() for keyboard shortcuts"

Just kidding we do want this to work like it used to.

This reverts commit e354a9e4da56da45d7035e1e93301554c5faf32e.

Change-Id: Ia51050a93e25c1ad16144b0da3f6178a98ad971a
om/android/internal/view/menu/MenuBuilder.java
3b415e41cc2be7ede25be203b447143c3f8c046b 23-Oct-2014 Alan Viverette <alanv@google.com> Use correct smooth scroll default duration

BUG: 18092378
Change-Id: I503677129edb647b7970b4e39a175289d5798e1b
ndroid/widget/AbsListView.java
d0aae5a2226c620c547690039fc06dfdf20ea35d 23-Oct-2014 Wale Ogunwale <ogunwale@google.com> Merge "Fix issue #17789629: PopupWindow overlaps with navigation bar." into lmp-mr1-dev
cba01b2310e78fc2114ceed285f4e134469ae62b 22-Oct-2014 George Mount <mount@google.com> Fix transition being canceled improperly.

Bug 18092208

When a transition is determining whether or not it should be
canceled, the old values and new values are compared. Previously,
the if a value was in the old values, but not in the new values
then the value was considered changed. This discounts that
transitions sometimes don't target views and it may be that
no value was populated.

Change-Id: I8210ba1e44921fadedf9ead571d380ad34e73d3f
ndroid/transition/Transition.java
ndroid/transition/Visibility.java
d4a52a6878846ba0a69f6c2f814356ceaa4b8ec6 22-Oct-2014 Filip Gruszczynski <gruszczy@google.com> am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev

* commit 'baecc0b2d111c3bc930b85d5450f1ff8b7b83395':
Disable activity's translucency until it starts being swiped away.
f03ba4f13ba835c670d7c471f91a3083846ab082 22-Oct-2014 Bryce Lee <brycelee@google.com> Merge "[Theater Mode] framework implementation through global setting" into lmp-sprout-dev
410f7ee4031bb754600ad9c984158b6ff4f056c8 22-Oct-2014 Alan Viverette <alanv@google.com> Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev
4da84cd56582fb4025eb5a9a1d4bb5b5b4a50cef 21-Oct-2014 Christoph Studer <chstuder@google.com> SysUI/NoMan: Log clicks on notification buttons

Introduce notification_action_click logtag that is logged whenever
the user clicks any notification button. For standard templates, we
also log the index of the pressed action button.

Bug: 18064190
Change-Id: Icb07795ff711729d16bde0b7e03d13c2f466779c
om/android/internal/statusbar/IStatusBarService.aidl
2615de920be16de6c7fe49e85fc65923074c2041 21-Oct-2014 John Reck <jreck@google.com> Surface:lockHardwareCanvas DO NOT MERGE

Bug: 17440886

Cherry pick of bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2

Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de
ndroid/view/Surface.java
bb852b0b6b743aeca3a6daceafc89166ec6022d8 22-Oct-2014 Alan Viverette <alanv@google.com> Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev
13e13ddd4e3d1e7c10b55b6e3fe47d6bfd317ed3 22-Oct-2014 Alan Viverette <alanv@google.com> Format ListPreference summary with empty string if entry is null

Adding serif-monospace and sans-serif-monospace font families bumped
out the previous monospace, which left the summary as %s. Returning
an unformatted summary is never correct, and we should simply return
a summary populated with an empty string.

BUG: 17666124
Change-Id: Ic22dc5dc87d9ba3ad6f6b92ee059f5c98cbf103a
ndroid/preference/ListPreference.java
584a44517950204a04ef01345be70b33d8ba43f9 22-Oct-2014 Bryce Lee <brycelee@google.com> [Theater Mode] framework implementation through global setting

Bug: 17684570
Change-Id: I64a9c9c0620049cdfcca0150648fa201281f7178
ndroid/provider/Settings.java
3f8dd14451521d728fba548c7655d8fe531ed2ef 21-Oct-2014 Filip Gruszczynski <gruszczy@google.com> Disable activity's translucency until it starts being swiped away.

Change-Id: Ia5dceac7bd9ff57920a43736f9db6a33175e01ac
om/android/internal/widget/SwipeDismissLayout.java
3a5c721072c60c7ed9c8a95d0a65d0e3cb4eb9bb 14-Oct-2014 Svetoslav <svetoslavganov@google.com> APIs for an accessibility service to put interaction tracking overlays.

An accessibility service may register to observe the interactive windows
on the primary display. These windows are the one that has input focus and
ones a sighted user can touch. It is sometimes beneficial for an
accessibility service to overlay a window to intercept user interaction
and based on that introspect and perform an action on the windows that
are on the screen. This is problematic as overlaying a full screen window
that is touchable prevents the accessibility service to introspect the
content under this window.

This change adds a special type of window that only an accessibility service
can place which does not affect what an accessibility service can "see" on
the screen. Hence, even putting such a window full screen the service will
be able to interact with the other interactive windows it covers.

Change-Id: I053ccc3a5c6360a98dc40bdb172b54dab35d8b31
ndroid/accessibilityservice/AccessibilityService.java
ndroid/accessibilityservice/IAccessibilityServiceClient.aidl
ndroid/app/UiAutomation.java
ndroid/view/WindowManager.java
ndroid/view/WindowManagerInternal.java
ndroid/view/accessibility/AccessibilityWindowInfo.java
054e8be5e0f9c83dd9792bb1bc118b1a7fd70e17 21-Oct-2014 Adam Powell <adamp@google.com> Merge "Intent chooser callback" into lmp-mr1-dev
bf463af2a5ed6c37df5d0e5a49f6a15d457e1c85 21-Oct-2014 John Reck <jreck@google.com> Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2 21-Oct-2014 John Reck <jreck@google.com> Surface:lockHardwareCanvas

Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
ndroid/view/Surface.java
393b1c1e88cbdd0f65c8f217c495dbbe8de9125d 19-Oct-2014 Wale Ogunwale <ogunwale@google.com> Fix issue #17789629: PopupWindow overlaps with navigation bar.

The Lollipop release introduced a feature that allowed
apps to extend under the navigation bar. This also means
any popup window that is anchored to the bottom of its
parent window will overlap with the navigation bar if the
parent window is extending underneath the navigation bar.

This change introduces a new window flag
(FLAG_LAYOUT_ATTACHED_IN_DECOR) that allows the app to
specify if the popup window should be attached to the decor
frame of the parent window thereby avoiding an overlap
with the screen decorations.

By default the flag is set on SDK version LOLLIPOP_MR1 or
greater and cleared on lesser SDK versions.

Also, replaced flags FLAG_NEEDS_MENU_KEY and
PRIVATE_FLAG_NEEDS_MENU_KEY_SET with needsMenuKey state
variable to make room for the new
FLAG_LAYOUT_ATTACHED_IN_DECOR flag.

Bug: 17789629
Change-Id: I2150e0c6ac688c966c0e8f7e54d42fd20285bea6
ndroid/view/Window.java
ndroid/view/WindowManager.java
ndroid/widget/PopupWindow.java
e354a9e4da56da45d7035e1e93301554c5faf32e 21-Oct-2014 Alan Viverette <alanv@google.com> Check MenuItem.isVisible() for keyboard shortcuts

Parity with support-v7 change.

BUG: 18021345
Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59
om/android/internal/view/menu/MenuBuilder.java
0b3c11260ae5ea09c7e702802b39f77afc74f35f 09-Oct-2014 Adam Powell <adamp@google.com> Intent chooser callback

Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.

Bug 17363684

Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
ndroid/content/Intent.java
om/android/internal/app/ChooserActivity.java
om/android/internal/app/ResolverActivity.java
cc8b3e8d4e561026cf673c9a234cc151f17b3362 21-Oct-2014 John Spurlock <jspurlock@google.com> Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev
735f9ebc188e1cb225533e1f5f9ef925d1f0b20e 21-Oct-2014 John Spurlock <jspurlock@google.com> Settings: Make SeekBarVolumizer more null-resilient.

Now that the instances are reusable, ensure all "post" methods
do a handler check, and ensure they are all internal.

Bug: 18063070
Change-Id: Idc478c636686f666f5656f3d07bf2738ba3e9a5a
ndroid/preference/SeekBarVolumizer.java
ndroid/preference/VolumePreference.java
3d52809bad2d96f7f39aa50e51bd53c69607cb4e 21-Oct-2014 Alan Viverette <alanv@google.com> Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev
2959231c78fb890907e4dc6cf232f1d64ef37bcf 20-Oct-2014 Wei Wang <weiwa@google.com> am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev

* commit '33bb6c2d3ca798c8275694d0fe700e9fb1fefe99':
Remove spammy log information for BLE scan.
33bb6c2d3ca798c8275694d0fe700e9fb1fefe99 20-Oct-2014 Wei Wang <weiwa@google.com> Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
e28cd1a276d64d697da89cac4941baf79f380f6c 20-Oct-2014 Alan Viverette <alanv@google.com> Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev
5f978bfa0949d58a187dec0fe9ee6b341cb97c1f 20-Oct-2014 Adrian Roos <roosa@google.com> Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev
0608b9328b1c2f804ffb2d4165c34383d34bde2a 13-Oct-2014 Yuncheol Heo <ycheo@google.com> CEC: Add a callback for vendor when HDMI control setting is changed.

- removed unregisterContentObserver() to reactivate the service later.
- added the parameter destAddress to onReceived() callback to
distinguish whether the message is broadcast or not.

Bug: 17962624
Change-Id: I552d14661583f63bb66b07866092f972b259b15a
ndroid/hardware/hdmi/HdmiClient.java
ndroid/hardware/hdmi/HdmiControlManager.java
ndroid/hardware/hdmi/IHdmiVendorCommandListener.aidl
7a78e578d78ada941d3cc07e280fe7784e84b364 20-Oct-2014 Jinsuk Kim <jinsukkim@google.com> Merge "CEC: add getDeviceList()" into lmp-mr1-dev
bdf27fbf746bee11430c4db2ea6dfd026bae77fe 20-Oct-2014 Jinsuk Kim <jinsukkim@google.com> CEC: add getDeviceList()

Returns the list of all the connected CEC device information. This is
different from getInputDevices() which returns devices of source type only.

For this, turned the local device address list to unmodifiable so that it can
be used by any threads.

Now respects the device type info passed through <Report Physical Address>
rather than always defaulting to the one from HdmiUtil.getTypeFromAddress().
This ensures future compatibility when a device of reserved logical address
comes with a specific type.

Bug: 18046603
Change-Id: I5f7d5e31706efba1ad5dcf4bcfd4ffc918d1d940
ndroid/hardware/hdmi/HdmiTvClient.java
ndroid/hardware/hdmi/IHdmiControlService.aidl
ed512c817c090e2545db89e13837481f86e7596e 18-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev
a496ba555292f091e4051ef7f0bc946a894b2804 18-Oct-2014 Alan Viverette <alanv@google.com> am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev

* commit 'e61519b4a541a4262389842ae8b72dac401b2199':
Translate compound button drawable by scroll position
020bd7b861dfd560fad9f761f2778ebbac8be20e 17-Oct-2014 Wei Wang <weiwa@google.com> Remove spammy log information for BLE scan.

Bug:17574681
Change-Id: Ic5761ad7262200f38f2b67659c37f8a3f01d80d5
ndroid/bluetooth/le/BluetoothLeScanner.java
e61519b4a541a4262389842ae8b72dac401b2199 18-Oct-2014 Alan Viverette <alanv@google.com> am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev

* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
Translate compound button drawable by scroll position
15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e 18-Oct-2014 Alan Viverette <alanv@google.com> Merge "Translate compound button drawable by scroll position" into lmp-dev
b95c336d7863e6b63e2aa8682a90dd8ae213889c 18-Oct-2014 Alan Viverette <alanv@google.com> Translate compound button drawable by scroll position

BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
ndroid/widget/CompoundButton.java
d9b81b11b9c3c61d21565d7c6ac250fba1a4f052 18-Oct-2014 Jim Miller <jaggies@google.com> am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev

* commit 'a054a8280c1316a1f805cc86f00f571a3b1cfc2f':
Add utility methods to LockPatternUtils for encryption
a054a8280c1316a1f805cc86f00f571a3b1cfc2f 18-Oct-2014 Jim Miller <jaggies@google.com> am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev

* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
Add utility methods to LockPatternUtils for encryption
c6c843fbe8fb8d9bdd012a472e22970ee89b9d24 18-Oct-2014 Jim Miller <jaggies@google.com> Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
0b5af04a8b202a2f274bb90c4fa982c813c40a20 18-Oct-2014 Svetoslav <svetoslavganov@google.com> am ebb38bcc: am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev

* commit 'ebb38bcc03a0f770d371b2ed997570572df7aed1':
Accessibility no longer overrides strong encryption.
dd5de719c5a0d39030f94d931c0ab1bed1f147f8 17-Oct-2014 Jim Miller <jaggies@google.com> Add utility methods to LockPatternUtils for encryption

This enables a change in Settings that allows device
encryption to be disabled by the user.

Fixes bug 17881324

Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
om/android/internal/widget/LockPatternUtils.java
ebb38bcc03a0f770d371b2ed997570572df7aed1 18-Oct-2014 Svetoslav <svetoslavganov@google.com> am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev

* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
Accessibility no longer overrides strong encryption.
cd2b54e6e546099e028f9e41966ab7cf1deedd3c 18-Oct-2014 Svetoslav <svetoslavganov@google.com> Merge "Accessibility no longer overrides strong encryption." into lmp-dev
b3af4ec6bae4fe93d40f021e54cbbce10cc7b4c6 18-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17948288: Improve accuracy of memory use reporting

We now use Mapped to not double-count cached pages that are
mapped in to app processes. Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.

It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space. I need to figure out
how I was finding that before.

Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
ndroid/os/Debug.java
om/android/internal/util/MemInfoReader.java
44d515457a55cdcd92257a711db8dd10f71f0175 18-Oct-2014 William Bourke <billbourke@google.com> am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit '7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
Modified lollipop Easter egg for TV compatibility
7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3 18-Oct-2014 William Bourke <billbourke@google.com> am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
Modified lollipop Easter egg for TV compatibility
33f577cfea7b5cc7c7167716522bf74c5e3219da 17-Oct-2014 William Bourke <billbourke@google.com> Modified lollipop Easter egg for TV compatibility

Bug: 17997922

Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
om/android/internal/app/PlatLogoActivity.java
a6711ff6f09cc25c693cbb50452e3f807c6122f5 17-Oct-2014 Svetoslav <svetoslavganov@google.com> Accessibility no longer overrides strong encryption.

Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
ndroid/view/AccessibilityManagerInternal.java
177ec4608e919b309ec98ba8272cc1a16d1277e3 17-Oct-2014 Alan Viverette <alanv@google.com> Only request layout when removeView() actually removes a view

BUG: 18035456
Change-Id: Iec82be63ef9fc4d0ff90d93f8f3a65328a5e1eba
ndroid/view/ViewGroup.java
26c563b051aacf5be66a0453be00a645ed3f50cd 17-Oct-2014 Alan Viverette <alanv@google.com> Prevent excessive accessibility announcements in TimePicker

This is not a complete solution, and it's still awkward to use for
actually setting the time using the radial time picker. Better
software keyboard support and explore-by-touch CLs are still pending.

BUG: 17994166
Change-Id: Ia2871840a13cb00c140f7f2ab07fe03371acab2f
ndroid/widget/TimePickerSpinnerDelegate.java
12c84b5d9f30f3d31ab18fee719f3a1bf00ab957 17-Oct-2014 Adam Lesinski <adamlesinski@google.com> Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev
e1970346a43109a9bcf4037135425a918fc953d3 17-Oct-2014 Amith Yamasani <yamasani@google.com> am b5afeca3: am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev

* commit 'b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c':
Use the correct method to check if device is encrypted
b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c 17-Oct-2014 Amith Yamasani <yamasani@google.com> am a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev

* commit 'a865bb5df834194dee339db615c17d7c7b63aaa3':
Use the correct method to check if device is encrypted
a865bb5df834194dee339db615c17d7c7b63aaa3 17-Oct-2014 Amith Yamasani <yamasani@google.com> Merge "Use the correct method to check if device is encrypted" into lmp-dev
3182987eb8bf93c77d2cde6d3483d39006aea28a 17-Oct-2014 Dianne Hackborn <hackbod@google.com> am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev

* commit 'bab9b48efcc55ee247c428aa3f53725c25222166':
SDK only: hide the old L API version constant.
cd410ba4e816b657020cafb23e69206734726b42 17-Oct-2014 Amith Yamasani <yamasani@google.com> Use the correct method to check if device is encrypted

DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.

Check if the device is encrypted by some means, instead.

Also fix a SecurityException when Device Admin queries encryption state
(recent regression)

Bug: 17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
om/android/internal/widget/LockPatternUtils.java
721fc2adf4d4d5b890b12cb2067db10e78888aba 17-Oct-2014 Alan Viverette <alanv@google.com> Fix build

Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
ndroid/view/ViewDebug.java
2f68a204b2299029dd492ab25bd3bcfe7216bafc 17-Oct-2014 Alan Viverette <alanv@google.com> Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev
bab9b48efcc55ee247c428aa3f53725c25222166 17-Oct-2014 Dianne Hackborn <hackbod@google.com> am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev

* commit '52476989b8afc0e96c2218625031ed550b12c79b':
SDK only: hide the old L API version constant.
686a41ef2b05b3fb1c5c5f44ec6270ab317ce9d5 17-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Add API level for MR1." into lmp-mr1-dev
9086562a6a524cc0c96231411863cd65d8785bfe 17-Oct-2014 Adam Lesinski <adamlesinski@google.com> Minor resource notation/compatibility fixes

- Change the format of mnc/mcc when printing a resource-qualifier
formatted string from a Configuration object.
- Correctly bump the SDK to 21 when using anydpi in a resource qualifier.

Change-Id: I3c31e344dc5384d45398d6e9f264a073abab65d1
ndroid/content/res/Configuration.java
3b6968876fc9a57f83bf3eaebf524ddd5de05a51 17-Oct-2014 Dianne Hackborn <hackbod@google.com> Add API level for MR1.

Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
ndroid/os/Build.java
d3511d4be120f84cb302456b0992dbc003d4aa80 17-Oct-2014 Dianne Hackborn <hackbod@google.com> SDK only: hide the old L API version constant.

Also update the LOLLIPOP version constant to describe more things
that change when you target it.

Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
ndroid/os/Build.java
0db6536190fa34910c0bfe376c47b8d594f32a25 17-Oct-2014 Alan Viverette <alanv@google.com> Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev
06819409c673b6f93c1df9f7d6949f623ff67192 16-Oct-2014 Prerepa Viswanadham <dham@google.com> am 56302744: am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()

* commit '56302744c4b22342798e3a08c03b34322a8a9dd3':
Update javadoc comments for getBluetoothLeAdvertiser()
6580c273a51daee08972149f2d2ede8ef6e7a79a 16-Oct-2014 Brian Carlstrom <bdc@google.com> am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev

* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
Set threads' contextClassLoader during LoadedApk.makeApplication.
56302744c4b22342798e3a08c03b34322a8a9dd3 16-Oct-2014 Prerepa Viswanadham <dham@google.com> am 248edc3e: Update javadoc comments for getBluetoothLeAdvertiser()

* commit '248edc3e969217aec1fcce7f324cbae6c46da0a3':
Update javadoc comments for getBluetoothLeAdvertiser()
248edc3e969217aec1fcce7f324cbae6c46da0a3 16-Oct-2014 Prerepa Viswanadham <dham@google.com> Update javadoc comments for getBluetoothLeAdvertiser()

To clarify that BluetoothLeAdvertiser object will return null
when BT is off OR if the hw doesn't support these capabilities

bug: 18006072
Change-Id: I635d7971711a3cae7c58f7a0636faf9a03f19970
ndroid/bluetooth/BluetoothAdapter.java
ccb7a9af271836fde98636d9ce6ebbda09eb0158 16-Oct-2014 Adrian Roos <roosa@google.com> Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev
ea6f0ae86d62cff88d63b926578c588a956d0512 16-Oct-2014 George Mount <mount@google.com> Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
d2b824887f9ec2e3448bd38aae58efbc4f178997 16-Oct-2014 Brian Carlstrom <bdc@google.com> am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev

* commit '20de619d66a594fd9e6e76a3a2cb79422aef577c':
Set threads' contextClassLoader during LoadedApk.makeApplication.
b4a29247ffb58f44e50edad7cf56ffc2ea0d7c6b 16-Oct-2014 Alan Viverette <alanv@google.com> Merge "Set content description on CalendarView day labels" into lmp-mr1-dev
20de619d66a594fd9e6e76a3a2cb79422aef577c 16-Oct-2014 Brian Carlstrom <bdc@google.com> Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
0511023432ff24c5ddda563e326273936b5d40f5 16-Oct-2014 Alan Viverette <alanv@google.com> Merge "Document Toolbar's vertical alignment strategy" into lmp-mr1-dev
8afc90fd715457033ca70dae3cd53377957d8b94 16-Oct-2014 Alan Viverette <alanv@google.com> Merge "Add style support to PopupMenu, clean up constructor javadoc" into lmp-mr1-dev
19c0a1632f3be67c8cbbee210cd6d8eedfe3649a 16-Oct-2014 Adam Powell <adamp@google.com> Merge "View measurement optimization" into lmp-mr1-dev
29632521c36548d71b610fc4de864281bab4dfb4 16-Oct-2014 Alan Viverette <alanv@google.com> Add style support to PopupMenu, clean up constructor javadoc

BUG: 18002523
Change-Id: Ice492686b814460248ccbe9727c64dd002e7ed7a
ndroid/widget/PopupMenu.java
om/android/internal/view/menu/MenuPopupHelper.java
7c479f5a013fb5544be45cd3a952190fc3a923fc 16-Oct-2014 George Mount <mount@google.com> Use empty snapshots list when there are no shared elements.

Bug 17964119

Change-Id: Ia2a63e52623d1e4238b0fd4e25d565451e856834
ndroid/app/ActivityTransitionCoordinator.java
0499bb5de45cf5542db7ac42406cd856d3386f1f 10-Oct-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS:change enhanced 4g setting to store in setting db.

Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
ndroid/provider/Settings.java
ef71947fd38f7918a628a238fee2ae000bb6bb45 15-Oct-2014 Alan Viverette <alanv@google.com> Set content description on CalendarView day labels

BUG: 17985867
Change-Id: I64fa9c757504fe7aebd8d5b7576ebe57e3a3e3fd
ndroid/widget/CalendarView.java
67945c11a5e9547f71be91ceb99e7b9ff15a6292 15-Oct-2014 Alan Viverette <alanv@google.com> Update AM/PM selectors for clock face TimePicker

The selectors are now CheckedTextViews, which makes more sense when
using a screen reader.

BUG: 17468036
Change-Id: I09c62a08172a710faa8fb7ed2bf99a66331e5701
ndroid/widget/RadialTimePickerView.java
ndroid/widget/TimePickerClockDelegate.java
ndroid/widget/TimePickerSpinnerDelegate.java
9cefbda11ee5308145d58b0b99ced0f66a0b1cf9 15-Oct-2014 Adam Powell <adamp@google.com> View measurement optimization

If a view hasn't explicitly requested layout and it's asked to measure
with MeasureSpec.EXACTLY in both dimensions and sizes that match its
current measured size, the measure operation is a no-op.

This helps out a number of ViewGroups that perform initial speculative
measurements with AT_MOST or UNSPECIFIED followed by looping over
child views and measuring EXACTLY to lock in the final measurement
with perhaps some extra leftover space distributed. In practice this
happens a fair bit, especially for views high up in the view
hierarchy. This optimization allows ViewGroup measurement code to be a
little cleaner in not having to keep track of this on its own.

Change-Id: I88ff46a7d37aeda7a4cd16204b68cab0d051b341
ndroid/view/View.java
ce711c6d57732c3582da0828c0361f55381f4223 15-Oct-2014 Jim Miller <jaggies@google.com> am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev

* commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5':
Add a checkbox option to 'require password to decrypt'
09ba0da87fa56eac91da5eb2d0a20b7799df66d5 15-Oct-2014 Jim Miller <jaggies@google.com> am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev

* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
Add a checkbox option to 'require password to decrypt'
e7c325559d961f13c6df96803bca4747f41b27a4 15-Oct-2014 Jim Miller <jaggies@google.com> Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev
5c8cafa6143858f725dd1bb73da7ac9f8d8f8f5f 15-Oct-2014 Amith Yamasani <yamasani@google.com> am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev

* commit '01ddc75fc1e9ea28212512299132e9bdace60e05':
Fix admin policies in managed profiles
01ddc75fc1e9ea28212512299132e9bdace60e05 15-Oct-2014 Amith Yamasani <yamasani@google.com> am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev

* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
Fix admin policies in managed profiles
2c3886cb3463ff39c1986c5b85eba79748dd8c24 15-Oct-2014 Amith Yamasani <yamasani@google.com> Merge "Fix admin policies in managed profiles" into lmp-dev
242f4b125939276be866bb0a637b89bfbc5aa880 15-Oct-2014 Amith Yamasani <yamasani@google.com> Fix admin policies in managed profiles

Some of the admin policies are throwing security exceptions in
a managed profile without being documented correctly and others
shouldn't be throwing security exceptions.

Changed setCameraDisabled() to not throw an exception. It now just
prevents work profile apps from using the camera.

Changed wipeData() to allow passing in ERASE_EXTERNAL_STORAGE. In
secondary users/profiles, this is just going to remove the user, so
the flag is harmless.

Updated documentation for setKeyguardDisabledFeatures() and resetPassword()
to indicate that they cannot be called in a managed profile.

Bug: 17987913
Change-Id: I8060be4c2d32bdd4edb46ce543551fabb9c8c983
ndroid/app/admin/DevicePolicyManager.java
2df76285914692973a4dfa6d600a71584e3e1c2a 15-Oct-2014 Jeff Sharkey <jsharkey@android.com> am 203ed4db: am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev

* commit '203ed4db9656cc3047c65e12e3969d21652d4ccf':
Reduce PackageInstaller Binder memory pressure.
203ed4db9656cc3047c65e12e3969d21652d4ccf 15-Oct-2014 Jeff Sharkey <jsharkey@android.com> am 88a6ed54: Merge "Reduce PackageInstaller Binder memory pressure." into lmp-dev

* commit '88a6ed5477eb6fa0453f9f29adef4c11b6eeade0':
Reduce PackageInstaller Binder memory pressure.
97d47ed036ff7bd3d7d2ddc1c6df1104ec237559 15-Oct-2014 Jeff Sharkey <jsharkey@android.com> Reduce PackageInstaller Binder memory pressure.

When restoring hundreds of apps on low-DPI devices, we end up sending
icon Bitmaps inline in the response instead of splitting into ashmem
regions. To avoid triggering TransactionTooLargeException, switch to
using ParceledListSlice under the hood.

Bug: 17926122
Change-Id: Ib4da6775e79d2fcb4aaea15f58ed998df203a5f9
ndroid/content/pm/IPackageInstaller.aidl
ndroid/content/pm/PackageInstaller.java
27c3ab630afd6296ff1ff7b2b71638caa8f2ec54 15-Oct-2014 Adrian Roos <roosa@google.com> Prevent ChooserActivity from taking over the system bars

Bug: 17939334
Change-Id: I4d028695a1f81442cbbe7067b33475634effd5d2
om/android/internal/app/ResolverActivity.java
8091edbffbacbf80eebe0ed646e6ec9f6aafe5be 15-Oct-2014 Narayan Kamath <narayan@google.com> Set threads' contextClassLoader during LoadedApk.makeApplication.

We used to set this from LoadedApk.getClassLoader. This had
the unfortunate side effect of clobbering the threads default
classloader when Context.createPackageContext().getClassLoader()
was called. This happens, for example, to every app that uses
a updatable webview.

bug: 17986934
Change-Id: If2b5938a19f836ea5fe60c94ea53a7125c2098c0
ndroid/app/LoadedApk.java
4d526bd249d720ef8dc54b8c7ecef9953e5be5c7 15-Oct-2014 Jeff Sharkey <jsharkey@android.com> am cf2c5649: am 97978808: Start cross profile intents as caller.

* commit 'cf2c564987965be1241fe197106b3ec22b11b4b0':
Start cross profile intents as caller.
cf2c564987965be1241fe197106b3ec22b11b4b0 15-Oct-2014 Jeff Sharkey <jsharkey@android.com> am 97978808: Start cross profile intents as caller.

* commit '9797880808320e3a7bae1f59bc7e0c5a13189e5f':
Start cross profile intents as caller.
9797880808320e3a7bae1f59bc7e0c5a13189e5f 14-Oct-2014 Jeff Sharkey <jsharkey@android.com> Start cross profile intents as caller.

The system should always be using new startActivityAsCaller() when
starting activities on behalf of someone else, to ensure that
security checks are enforced as the original caller.

Bug: 17983737
Change-Id: Ic40816a797cfdb13c0adb48b86ed4ed7d6aae8eb
ndroid/app/Activity.java
ndroid/app/ActivityManagerNative.java
ndroid/app/IActivityManager.java
ndroid/app/Instrumentation.java
ndroid/app/admin/DevicePolicyManager.java
om/android/internal/app/IntentForwarderActivity.java
om/android/internal/app/ResolverActivity.java
6f1edae88c3f6cfa2e9c046cf77658154640ba7a 15-Oct-2014 Alan Viverette <alanv@google.com> Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev
6848dc8e3b54fb27047836d8026c4c9971754607 14-Oct-2014 Jim Miller <jaggies@google.com> Add a checkbox option to 'require password to decrypt'

Fixes bug 17881324

Change-Id: Id94e593a172d686339c736473226fece1bb749ee
ndroid/provider/Settings.java
om/android/internal/widget/LockPatternUtils.java
1201d2a018c85e9c5092e670b334cc4ed4ebcaef 15-Oct-2014 Jeff Hao <jeffhao@google.com> am dbfbb175: Backport of ordering apps for boot dexopt.

* commit 'dbfbb17512fe6a5b3c7198d60b6a149969174a71':
Backport of ordering apps for boot dexopt.
207913387111b148f84a956ff968200512c5fb78 15-Oct-2014 Amith Yamasani <yamasani@google.com> am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev

* commit '4bf0356ee2058c7f033a41e02fa3eb86909c450c':
Hide DISALLOW_OUTGOING_BEAM API
dbfbb17512fe6a5b3c7198d60b6a149969174a71 30-Sep-2014 Jeff Hao <jeffhao@google.com> Backport of ordering apps for boot dexopt.

This is a squashed commit of the following changes:

1. Order apps by priority when performing boot dexopt.
(cherry picked from commit 65cde7d42d741c7d9aa2714a397b7333f688ab55)

2. Improve priority ordering of apps when performing boot dexopt.
Added core apps and updated system apps.
(cherry picked from commit 272bf3a274daff62995caf05da338c1f2a73dae3)

3. Stop boot dexopt when low on memory.
(cherry picked from commit 1d892dcb6b0ff3a50cc63e387667dc29baf1014f)

Bug: 17641843
Change-Id: Ie32f1c21047d3462aaf728f7633fecf647ba2b47
ndroid/content/pm/PackageInfo.java
ndroid/content/pm/PackageParser.java
99562fbbb40c72722468e5dc8c84b3e28494a20f 14-Oct-2014 Alan Viverette <alanv@google.com> Check type resolution on declared methods and fields in ViewDebug

BUG: 17375269
Change-Id: I8a74dfab1a1cf11b4240afb011d2729beea307c5
ndroid/view/ViewDebug.java
f23b29ad5a730c7b26d9f96c764dc4e0d96fdd16 14-Oct-2014 Dianne Hackborn <hackbod@google.com> am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev

* commit 'a861a9d713c99b576c0e7284a65d50838c4f953a':
Fix issue #10034864: Define YouTube application as the preferred...
4bf0356ee2058c7f033a41e02fa3eb86909c450c 14-Oct-2014 Amith Yamasani <yamasani@google.com> am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev

* commit '15a5f82f9b6b389614b1df78749bd627d97d5417':
Hide DISALLOW_OUTGOING_BEAM API
15a5f82f9b6b389614b1df78749bd627d97d5417 14-Oct-2014 Amith Yamasani <yamasani@google.com> Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev
a861a9d713c99b576c0e7284a65d50838c4f953a 14-Oct-2014 Dianne Hackborn <hackbod@google.com> am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev

* commit '35de0e2872b64f78b596a850d6da2c483ba65bb5':
Fix issue #10034864: Define YouTube application as the preferred...
35de0e2872b64f78b596a850d6da2c483ba65bb5 14-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev
f85e7af4d009862fc799c7232ec5cf9e2dc9fa34 14-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #10034864: Define YouTube application as the preferred...

...handler for its Intents

Fix bug when a third party app is installed as an additional but
worse match for the intent.

Also raise up the limit for when we start printing logs about
overly large strict mode data.

And turn off the logs about services being created and destroyed,
since with the way things are using services these days these have
become way too spammy.

Change-Id: I8fe301dfd80fb4b70213cb7783b7c5426245278d
ndroid/app/ApplicationErrorReport.java
bec0c53a402224cf4807efd4077047c870f5b58f 14-Oct-2014 John Spurlock <jspurlock@google.com> Merge "Make SeekBarVolumizer restartable." into lmp-mr1-dev
6d93491f506312e0686d86f278eac6f48a364242 14-Oct-2014 Amith Yamasani <yamasani@google.com> Hide DISALLOW_OUTGOING_BEAM API

This is not fully functional in managed profiles, so it is being removed for L.

Bug: 17973040
Change-Id: If660e5e565076cdf61649e9f5ca12877425e9df3
ndroid/os/UserManager.java
9e1c67e861302f0df55859c422000b437cef2027 14-Oct-2014 Svet Ganov <svetoslavganov@google.com> Optimize text rendering in accessibility mode.

In accessibility mode when iterating over the text of a TextView we
use the selection to keep track of the current position. Consequentally,
if the text of a TextView does not support selection we change the text
to Spannable. Doing that has performance cost. While we need selection
support before we used to convert the text to Spannable even if we do
not need to. Now this transformation happens only when the user decides
to traverse the text which is very rare as opposed to doing this for
every TextView.

bug:17491082

Change-Id: Id7e82e01034e439b5d34133b9350a4efc4d19d4a
ndroid/widget/TextView.java
d8a21bbedbaeb752b7f458823ed709b9a01c14c1 14-Oct-2014 Nicolas Prevot <nprevot@google.com> Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev
be98cdc702e9efef11274fef699c7513aa07de09 14-Oct-2014 Alan Viverette <alanv@google.com> Send VIEW_SELECTED event when View selection state changes

BUG: 11354667
Change-Id: I55d69e0e156c7bd83c14025f313a9d7261b7ccda
ndroid/view/View.java
157afde397f817e0a3a21c5d47011db462b6fff6 14-Oct-2014 Alan Viverette <alanv@google.com> Document Toolbar's vertical alignment strategy

BUG: 17526065
Change-Id: I78fdd8da225c33971985d3941f54624b20248409
ndroid/widget/Toolbar.java
3f0aa505f4bf6ecb111dc5b39f30189afbac3cff 14-Oct-2014 Wei Wang <weiwa@google.com> am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev

* commit '34020eb6ebc619c90b9107003331a91e4d5a350e':
Add support of advertising through standard instance.(1/4)
34020eb6ebc619c90b9107003331a91e4d5a350e 14-Oct-2014 Wei Wang <weiwa@google.com> Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev
1f9b32f006f7c506d9df5bf73294710665746397 17-Sep-2014 Aravind Akella <aakella@google.com> Sensor documentation fixes.

Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1
ndroid/hardware/Sensor.java
ndroid/hardware/SensorEventListener2.java
ndroid/hardware/SensorManager.java
8d3cf106aa53ccf03c9f57c4e3b4af5799e2b530 14-Oct-2014 Jesse Hall <jessehall@google.com> am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev

* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
d4b38fe5c06f622b984e7f84f299269efce92e42 14-Oct-2014 Jesse Hall <jessehall@google.com> am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev

* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails
0e588ea8e1746f3335b2b5c8a51fdd9a96167b59 08-Oct-2014 John Spurlock <jspurlock@google.com> Make SeekBarVolumizer restartable.

Decouple start from constructor, making it possible to restart
once stopped.

Bug:17898190
Change-Id: I2f860864161f818d5a62a28331ef1c47051fb39f
ndroid/preference/SeekBarVolumizer.java
ndroid/preference/VolumePreference.java
d7e559675c96071b6ee46c3b45aa3c9e7216a9c4 13-Oct-2014 Jesse Hall <jessehall@google.com> Surface: Leave object in unlocked state when unlockCanvasAndPost fails

If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.

Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.

This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)

Bug: 17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e
ndroid/view/Surface.java
58ee8a966a14208c85ac304136a36602b2d75e01 13-Oct-2014 Marcin Kosiba <mkosiba@google.com> am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev

* commit '4f3ee426f62662f590c056ce44f005cd716f9870':
Remove the default WebView text encoding resource entirely.
4f3ee426f62662f590c056ce44f005cd716f9870 13-Oct-2014 Marcin Kosiba <mkosiba@google.com> am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev

* commit '437517573b53b17765eba9b0b98055915bf3a4a1':
Remove the default WebView text encoding resource entirely.
437517573b53b17765eba9b0b98055915bf3a4a1 13-Oct-2014 Marcin Kosiba <mkosiba@google.com> Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
e6308c7eb283a9c222d128dd81887cd0b82b45c4 11-Oct-2014 George Mount <mount@google.com> am 52fb8a42: am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev

* commit '52fb8a4245aad87972bb6b52697fcd2dd111fe99':
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
f1178b23ac64b6c96320b64e17f67a95fc7b6dff 11-Oct-2014 Christopher Tate <ctate@google.com> am 2c15bbc8: am 1133e29f: Tweak wallpaper restore rejection threshold

* commit '2c15bbc8382ac7e5f04d149c8f576261f1dca334':
Tweak wallpaper restore rejection threshold
52fb8a4245aad87972bb6b52697fcd2dd111fe99 10-Oct-2014 George Mount <mount@google.com> am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev

* commit '1a285496fb504d4c4d41e97a7c3b67210c1a67ef':
Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
1a285496fb504d4c4d41e97a7c3b67210c1a67ef 10-Oct-2014 George Mount <mount@google.com> Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev
e61e68d001ac858d87a7f639515f12c3eafcd297 10-Oct-2014 Dianne Hackborn <hackbod@google.com> am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev

* commit '18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63':
Improve some docs, fix some debugging.
5ac9b20b41f72baabcb8a7d114bcaac3ed37e352 10-Oct-2014 George Mount <mount@google.com> Allow using setLeft/Top/Right/Bottom to control ChangeBounds.

Bug 17938614

Change-Id: Ia341fdd63ab57ec16a3de6349b7eb07fdc0a48ae
ndroid/transition/ChangeBounds.java
5237c0c3c99eb5dcaf237a291e3c97b030e4e52a 10-Oct-2014 ztenghui <ztenghui@google.com> Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev
897f6daeffe965d546ebdc9a05c99a638b37f37d 08-Oct-2014 ztenghui <ztenghui@google.com> Support negative value in exponential data in the pathData.

Now "1e-5" will not be separated as "1e" and "-5".

Add one test for this use case.
Make sure we print out the pathData when path parsing has error.

b/17919923

Change-Id: I10a00ce21166cfb5a009c49c1a93f40eeb956d83
ndroid/util/PathParser.java
2c15bbc8382ac7e5f04d149c8f576261f1dca334 10-Oct-2014 Christopher Tate <ctate@google.com> am 1133e29f: Tweak wallpaper restore rejection threshold

* commit '1133e29f22252cc36102f41204c3de35779e49d2':
Tweak wallpaper restore rejection threshold
1133e29f22252cc36102f41204c3de35779e49d2 10-Oct-2014 Christopher Tate <ctate@google.com> Tweak wallpaper restore rejection threshold

Raise the height ratio threshold slightly in order to start accepting
restores of height=1920 images onto height=2560 devices.

Bug 17882661

Change-Id: I63b47817fdf754cda9a052bddb62aee764522c6f
ndroid/app/backup/WallpaperBackupHelper.java
fd1ac83f6339a608967ae478240f1ad6a0fa01ef 10-Oct-2014 Marcin Kosiba <mkosiba@google.com> Remove the default WebView text encoding resource entirely.

Having the default text encoding in config.xml makes it seem like
it's something that could be changed, but upon further inspection
we can't see any good reason for anyone to ever want to change it
from UTF-8.

BUG: 17634120
Change-Id: I10a09ab1d65590c29efb10222abfa08ca52b5c84
ndroid/webkit/WebSettings.java
1a815921694ca2b3ad4dbb85bf82d85e831bc84e 10-Oct-2014 Nicolas Prevot <nprevot@google.com> Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile.

Inside ResolverActivity: when getting the ResolveInfo for EXTRA_INITIAL_INTENTS:
The ResolveInfo is created directly inside ResolverActivity, not by PackageManagerService.
So, noResourceId had not been set to true for this ResolveInfo.
So setting it inside ResolverActivity.

This is needed since inside a managed profile, the icons are not associated with resource ids.

BUG:17577733
Change-Id: Ic4f0439128f95482167103b783344e2baa0aed52
om/android/internal/app/ResolverActivity.java
1db0cce028c22fe04b129c8d1f627ac30da84558 10-Oct-2014 Tom O'Neill <tomo@google.com> Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev
18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63 10-Oct-2014 Dianne Hackborn <hackbod@google.com> am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev

* commit '7ea69880bdbf2c51140460dcfd063dc015c3ce26':
Improve some docs, fix some debugging.
7ea69880bdbf2c51140460dcfd063dc015c3ce26 10-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Improve some docs, fix some debugging." into lmp-dev
ab4a81b3c625e33d04ae8070fcce6b6baee6522c 10-Oct-2014 Dianne Hackborn <hackbod@google.com> Improve some docs, fix some debugging.

- Add docs to Binder, Messenger, ResultReceier to explain their
relation (or lack there-of) to process lifecycle.
- Clarify some aspects of process lifecycle for services.
- Fix help text of am command.
- Fix per-package dumping of battery stats to not include history.
- Fix per-package dumping of proc stats to only include aggregated
and current stats and fix some formatting.
- Fix per-process dumping of meminfo to have an option to interpret
the input as a package, so including all processes that are
running code of that package.
- Fix top-level per-package debug output to correctly include all
of these improvements and give them a little more time (10s) to
complete for timing out.

Change-Id: I2a04c0f862bd47b08329443d722345a13ad9b6e2
ndroid/app/ActivityManager.java
ndroid/app/Service.java
ndroid/os/Binder.java
ndroid/os/Messenger.java
ndroid/os/ResultReceiver.java
om/android/internal/app/ProcessStats.java
e78aa53123df02a021cf20f2d19af8d07e890058 10-Oct-2014 Svetoslav <svetoslavganov@google.com> am 9ab1b1bb: am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev

* commit '9ab1b1bbe62aa0424214bb5bbcfd707cb8ac8199':
Fix child view ordering for accessibility.
d190a5ca4c0501f01d2eb5a0359bd987cb703b0c 10-Oct-2014 Dianne Hackborn <hackbod@google.com> am 0e259ce2: am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev

* commit '0e259ce2d7ed09c58993da5c5b63966e8f467c82':
Implement issue #17906468: Allow search request to fall back to global search
9ab1b1bbe62aa0424214bb5bbcfd707cb8ac8199 10-Oct-2014 Svetoslav <svetoslavganov@google.com> am c43caf52: Merge "Fix child view ordering for accessibility." into lmp-dev

* commit 'c43caf52a61e56d5ed78f947fc8c299ad5273abf':
Fix child view ordering for accessibility.
c43caf52a61e56d5ed78f947fc8c299ad5273abf 10-Oct-2014 Svetoslav <svetoslavganov@google.com> Merge "Fix child view ordering for accessibility." into lmp-dev
88e447b576bb330e4e25f4a6840df5aa9296a5b5 10-Oct-2014 Svetoslav <svetoslavganov@google.com> Fix child view ordering for accessibility.

When reporting views to accessibility services we are ordering the
children in a parent based on their location on the screen. The
initial implementation worked pretty well in practive but violated
the transitivity property leading to rare crashes in apps. The current
implementation does not violate transitivity but does not produce
good ordering.

Given the lack of time and to minumize risk this change uses the
old strategy which works most of the time and if that fails we
fall back to the current strategy. Coming up with a correct strategy
that produces good results requires more time.

bug:17887986

Change-Id: I1c233ecdf318befc315e793696ac48bd6c652ab6
ndroid/view/ViewGroup.java
51650235c1bd70c5b5c0d82fed31390008f94c89 10-Oct-2014 Jorim Jaggi <jjaggi@google.com> Merge "Apply color to progress bar for notifications" into lmp-mr1-dev
7cb761fe8c29fc00e66515c40f7fcb9111b70da0 09-Oct-2014 Adam Powell <adamp@google.com> Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev
19a9e6c23b44e4fbee2f559e921170e34732d858 09-Oct-2014 Adam Powell <adamp@google.com> Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev
a7a735fb2a5d56e5ec7ca2f65cb14e29e3793f3c 09-Oct-2014 Adam Powell <adamp@google.com> Document that MarginLayoutParams margins should be positive.

Negative margins can cause all sorts of other problematic assumptions,
subtle errors and unexpected behavior. While they technically work
developers should steer clear of them.

Change-Id: Ia1f7d9a33e25444ebdc3c32679ae1179210558e1
ndroid/view/ViewGroup.java
0e259ce2d7ed09c58993da5c5b63966e8f467c82 09-Oct-2014 Dianne Hackborn <hackbod@google.com> am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev

* commit '6166a824b2ea7b7918f54769005ab691e15f77f7':
Implement issue #17906468: Allow search request to fall back to global search
bb76d5cd886f34165e59a35a36c353fe559929c7 09-Oct-2014 Tim Kilbourn <tkilbourn@google.com> am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev

* commit '5d7f58be2c034823d6e5cfab847ad50b2a463dfc':
Don't start SearchDialog on television.
5d7f58be2c034823d6e5cfab847ad50b2a463dfc 09-Oct-2014 Tim Kilbourn <tkilbourn@google.com> am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev

* commit '37bd07768a05aabb0905608606f354a488a2d5cf':
Don't start SearchDialog on television.
ef72a198afc4ded0b75534a97142fae2e91b46f5 26-Aug-2014 Jorim Jaggi <jjaggi@google.com> Apply color to progress bar for notifications

Bug: 17128179
Change-Id: Ia642ff2a352bbabf2d1e468367d45dc188ee0e73
ndroid/app/Notification.java
ndroid/widget/ProgressBar.java
ndroid/widget/RemoteViews.java
7731a99807728298cd4bbfdc8b577183199bc47e 09-Oct-2014 Tom O'Neill <tomo@google.com> Fix a race where NLP consent dialog can be shown unnecessarily

- Bug: 17908111

Change-Id: If94570861f38b922478d490599ab02cfb86adea6
ndroid/provider/Settings.java
6b7515dd0d70ad1b3149b1f38ef548a06a4d5cec 09-Oct-2014 Jeff Hao <jeffhao@google.com> Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev
35cd4c853f748e295352bda708b26ee39544d06d 26-Sep-2014 Wei Wang <weiwa@google.com> Add support of advertising through standard instance.(1/4)

Use config overlay to check whether peripheral mode is supported.

Bug: 17552672
Change-Id: I1081bc84da9fe033426f82ece2ec74c2d663e3aa
ndroid/bluetooth/BluetoothAdapter.java
ndroid/bluetooth/IBluetooth.aidl
ndroid/bluetooth/le/BluetoothLeAdvertiser.java
fdf5b35ab46639759d6389a4e2a4d5799cb6814b 09-Oct-2014 Dianne Hackborn <hackbod@google.com> Implement issue #17906468: Allow search request to fall back to global search

Change-Id: I04834b2a9f1ec4a68c6a3fed14da2f8dd93b3be7
ndroid/app/Activity.java
ndroid/app/ActivityManagerNative.java
ndroid/app/IActivityManager.java
ndroid/app/ISearchManager.aidl
ndroid/app/SearchManager.java
a4d5471fc66345f82ffbc877eea172d879fb8563 09-Oct-2014 Christopher Tate <ctate@google.com> am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev

* commit '3a8e28c1d7dc474b70e937774de5eba70d528674':
Turn on dimension validation in wallpaper restore
03be7ab52975a5bab0e0e86d25694c14b8030aa6 09-Oct-2014 Adam Lesinski <adamlesinski@google.com> am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev

* commit '6167950b7a5a8b9f021e9656b42b9b48bfbcbf80':
Remove UsageEvents#resetToStart() as it doesn't work
45a9da5076f4482e82ada5f394a9e69f730b9734 09-Oct-2014 Adam Powell <adamp@google.com> Throw a more descriptive exception when adding null to a ViewGroup

Help developers during debugging bad calls to addView by throwing an
IllegalArgumentException earlier rather than implicitly tossing NPE
the first time the child view is accessed.

Change-Id: I4a554635815a5d0b415f637b93592fb45973f26d
ndroid/view/ViewGroup.java
3a8e28c1d7dc474b70e937774de5eba70d528674 09-Oct-2014 Christopher Tate <ctate@google.com> am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev

* commit 'c0a30bcfaecf38ab5b55c53e82505570ffffa71e':
Turn on dimension validation in wallpaper restore
6167950b7a5a8b9f021e9656b42b9b48bfbcbf80 09-Oct-2014 Adam Lesinski <adamlesinski@google.com> am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev

* commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f':
Remove UsageEvents#resetToStart() as it doesn't work
e6411c76c44930cd893b78ea9f59f26a4a441881 09-Oct-2014 ztenghui <ztenghui@google.com> Merge "Support dot separation as the svg path data did." into lmp-mr1-dev
7e7a14c541aba0824e37f51920e988dc38e9a34f 09-Oct-2014 Eino-Ville Talvala <etalvala@google.com> am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev

* commit 'eeec4b9ebc15545e59985eab29385157cbbd8e9f':
Camera2: Docs cleanup, especially units and range
camera2: Update docs only for legacy devices
d83e9e42805e340384f30199777fbc472c5c6f20 09-Oct-2014 Dianne Hackborn <hackbod@google.com> am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev

* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
Put in real "code" (aka marketing) name.
b424849533ac369c41a824510a8f3914f62ed2c6 09-Oct-2014 Jeff Sharkey <jsharkey@android.com> am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev

* commit 'b01a5ba2b7c1bc22e30d6cc16c30f8e1215701cd':
Bring along more ApplicationInfo fields.
eeec4b9ebc15545e59985eab29385157cbbd8e9f 09-Oct-2014 Eino-Ville Talvala <etalvala@google.com> am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev

* commit 'ef773e3569969592fb220b7ccc49dafcabfdd67a':
Camera2: Docs cleanup, especially units and range
camera2: Update docs only for legacy devices
37bd07768a05aabb0905608606f354a488a2d5cf 09-Oct-2014 Tim Kilbourn <tkilbourn@google.com> Merge "Don't start SearchDialog on television." into lmp-dev
fe087d38a8cca08680e659c57176b3afd735ea90 09-Oct-2014 Alan Viverette <alanv@google.com> Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev
0761b1b5ebb453a411e3289c1c972dbfddcee880 09-Oct-2014 Dianne Hackborn <hackbod@google.com> am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev

* commit '89b196958fee07475765bd3c458098464ba16f2e':
Put in real "code" (aka marketing) name.
b01a5ba2b7c1bc22e30d6cc16c30f8e1215701cd 09-Oct-2014 Jeff Sharkey <jsharkey@android.com> am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev

* commit '562262cc89838529316ff2f3e511c0d876b08677':
Bring along more ApplicationInfo fields.
99e9095430b84e49bda50c831e320dada8bca109 09-Oct-2014 Tim Kilbourn <tkilbourn@google.com> Don't start SearchDialog on television.

Bug: 17654744
Change-Id: Ie76405d648b7ac34a70465e275315f9cf277a3fe
ndroid/app/SearchManager.java
4cc3e2704a93197213ca0978b8c940abcb59e49a 07-Oct-2014 ztenghui <ztenghui@google.com> Support dot separation as the svg path data did.

Like "0.0.0" will be separated to "0.0 .0" now, just to make sure we are more
complied with svg path data.

b/17892882

Change-Id: Id7b64e9882f5174aa794a0256e2a29d66c724876
ndroid/util/PathParser.java
c0a30bcfaecf38ab5b55c53e82505570ffffa71e 08-Oct-2014 Christopher Tate <ctate@google.com> Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
272bf3a274daff62995caf05da338c1f2a73dae3 08-Oct-2014 Jeff Hao <jeffhao@google.com> Improve priority ordering of apps when performing boot dexopt.

Added core apps and updated system apps.

Bug: 17641843
Change-Id: Ia00ea3399cf1e1acaef45ff8df8f754442de5185
ndroid/content/pm/PackageInfo.java
ndroid/content/pm/PackageParser.java
59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f 08-Oct-2014 Adam Lesinski <adamlesinski@google.com> Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev
54e064bcea11b54240ac766ea3c36bdc9c18273c 08-Oct-2014 Adam Lesinski <adamlesinski@google.com> Remove UsageEvents#resetToStart() as it doesn't work

After completely iterating over a UsageEvents object, the internal parcel
is recycled. If resetToStart is called then, it does nothing.

Bug:17909428
Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
ndroid/app/usage/UsageEvents.java
431906b34f33e23b5407fc2f72f8c085ef572816 08-Oct-2014 Christopher Tate <ctate@google.com> Turn on dimension validation in wallpaper restore

Bug 17906491

Change-Id: I4c76c3197df95b51a6e44d1fe2d522b6c05284e5
ndroid/app/backup/WallpaperBackupHelper.java
ef773e3569969592fb220b7ccc49dafcabfdd67a 08-Oct-2014 Eino-Ville Talvala <etalvala@google.com> Merge changes Id09663d8,Ie88f3750 into lmp-dev

* changes:
Camera2: Docs cleanup, especially units and range
camera2: Update docs only for legacy devices
fd3e2892f29ded5a25a0a064275b282ce93ed258 06-Oct-2014 Eino-Ville Talvala <etalvala@google.com> Camera2: Docs cleanup, especially units and range

- Add entries for units and range into javadoc
- Fix up existing units entries and add new ones
- Fix up range entries to be consistent for enums
- Add range entries where it makes sense
- Minor fix to javadoc gen to allow for code indentation
- Lots of edits for consistency, especially to
available* entries.

Bug: 16525650

Change-Id: Id09663d897ec98122073e6e13719731ec0de4dad
ndroid/hardware/camera2/CameraCharacteristics.java
ndroid/hardware/camera2/CameraMetadata.java
ndroid/hardware/camera2/CaptureRequest.java
ndroid/hardware/camera2/CaptureResult.java
621fa30c5427a69230dfd2d4b40047720ce18a40 08-Oct-2014 Dan Sandler <dsandler@android.com> am 9eef8749: am 2200f86f: All (er, L) is finally revealed.

* commit '9eef8749232c00afad5ca3c26736c0be785cb8c1':
All (er, L) is finally revealed.
9eef8749232c00afad5ca3c26736c0be785cb8c1 08-Oct-2014 Dan Sandler <dsandler@android.com> am 2200f86f: All (er, L) is finally revealed.

* commit '2200f86f800876d005f911e6864708fa9772d03a':
All (er, L) is finally revealed.
89b196958fee07475765bd3c458098464ba16f2e 08-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Put in real "code" (aka marketing) name." into lmp-dev
562262cc89838529316ff2f3e511c0d876b08677 08-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "Bring along more ApplicationInfo fields." into lmp-dev
7f1a57a3e709b9e1fdb03a7a8af5f13859f7f1ad 08-Oct-2014 Jeff Sharkey <jsharkey@android.com> Bring along more ApplicationInfo fields.

When we added scan paths, we forgot to bring them along through
Parcel and copy constructor.

Bug: 17900178
Change-Id: I0ee9374f909d375768045976fd88cee7431f7d4d
ndroid/content/pm/ApplicationInfo.java
45bdf81a48253c90797e99794323c8ece9806a50 08-Oct-2014 Jeff Brown <jeffbrown@google.com> am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev

* commit 'e1449dfc55113bc9eceb7fd74c8f66ff19a35dea':
Reapply animation duration scale each time it is started.
e1449dfc55113bc9eceb7fd74c8f66ff19a35dea 08-Oct-2014 Jeff Brown <jeffbrown@google.com> am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev

* commit '32b9f4a650d1b8b52b85a27109f95fde030dff66':
Reapply animation duration scale each time it is started.
2200f86f800876d005f911e6864708fa9772d03a 06-Oct-2014 Dan Sandler <dsandler@android.com> All (er, L) is finally revealed.

If you exceed 20000 points, please send in a screenshot.

Bug: 15984887
Change-Id: I1164160bfa8e7dca3b9e7d7ca5d50ef9abd38b61
om/android/internal/app/PlatLogoActivity.java
955d8d69ea6caabce1461dc25b339b9bf9dc61a6 08-Oct-2014 Dianne Hackborn <hackbod@google.com> Put in real "code" (aka marketing) name.

Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
ndroid/app/ActivityManager.java
ndroid/app/ContextImpl.java
ndroid/app/Fragment.java
ndroid/app/Notification.java
ndroid/content/Context.java
ndroid/content/Intent.java
ndroid/hardware/location/GeofenceHardware.java
ndroid/os/Build.java
ndroid/os/Message.java
ndroid/os/UserManager.java
ndroid/provider/MediaStore.java
ndroid/service/notification/NotificationListenerService.java
ndroid/view/WindowManagerGlobal.java
ndroid/webkit/CookieManager.java
ndroid/webkit/WebSettings.java
ndroid/webkit/WebView.java
ndroid/widget/Editor.java
ndroid/widget/Spinner.java
om/android/internal/app/ResolverActivity.java
9a64513c7fccc2a9cf331a384906a7669b29b3f4 08-Oct-2014 Adrian Roos <roosa@google.com> Retire RecentApplicationsDialog

Bug: 5162991
Change-Id: I429da977502f33e2091496f3a075b2c507a88e1f
ndroid/view/WindowManager.java
32b9f4a650d1b8b52b85a27109f95fde030dff66 08-Oct-2014 Jeff Brown <jeffbrown@google.com> Merge "Reapply animation duration scale each time it is started." into lmp-dev
7a08fe0e09c9bd5b66049738617cc9972651bf5b 08-Oct-2014 Jeff Brown <jeffbrown@google.com> Reapply animation duration scale each time it is started.

When Battery Saver mode is enabled, we set the animation duration
scale factor to 0 to effectively disable all animations. Later
when it is disabled, we reset the animation duration scale
factor to 1.

This change ensures that we reapply the duration scale factor
whenever the animation is started instead of only applying it
once when the duration is set (usually when the animation is
created). This ensures that the correct scale factor is applied
even when it changes after the animation has been initialized.

Previously, certain animations would continue to be suppressed
even after Battery Saver mode was disengaged. This wasn't much
of an issue when the duration scale was initially implemented as
a developer setting but now that it is exposed via Battery Saver
the artifacts caused by this bug have become visible to users.

Bug: 17887431
Change-Id: I91ba5ca0505d02ac389a31d067e38886112fa0c8
ndroid/animation/ValueAnimator.java
0660042a26b99614e4bed88eb21ef7b46526d73b 08-Oct-2014 Alan Viverette <alanv@google.com> Merge "Mutate and apply theme if needed before caching themed drawables" into lmp-mr1-dev
727cae197b123ef764a1f8fbe08a995b000d14c3 08-Oct-2014 Alan Viverette <alanv@google.com> Mutate and apply theme if needed before caching themed drawables

This ensures that drawables are completely separated from their cached
constant states before applying a theme. After this, we can remove the
implicit (and incomplete) mutation in the clone constructors.

Also implements missing mutate() method on ClipDrawable.

BUG: 17646144
Change-Id: If0d66b0a85724d76e0a4f506758c7ba3c0aa3410
ndroid/content/res/Resources.java
152893dd66a8cdecab14595c20085a0f10917f21 07-Oct-2014 Christopher Tate <ctate@google.com> am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev

* commit '93e5e859e3d2c0f4d4f47c90d370b38be4440655':
Accept any restored wallpaper
ec8e720ae209d975ac34dc66e51f280d9a9482ef 07-Oct-2014 Alan Viverette <alanv@google.com> Ensure AdapterView doesn't post selection notifications forever

Previously we would loop forever if a selection notification was
posted after data had changed but the data changed bit was never
reset (e.g. a layout pass never occurred). This moves the pending
notification to occur as part of a layoutChildren() /
checkSelectionChanged() pass. If the client does horrible things
to prevent layout, no notification will occur -- but we won't loop
forever.

BUG: 17736536
Change-Id: I9773a769ad402c92dcbe2af7b8982d4443001961
ndroid/widget/AdapterView.java
93e5e859e3d2c0f4d4f47c90d370b38be4440655 07-Oct-2014 Christopher Tate <ctate@google.com> am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev

* commit 'ae456fd894c5a41f859196016a7c49113b235eda':
Accept any restored wallpaper
ae456fd894c5a41f859196016a7c49113b235eda 07-Oct-2014 Christopher Tate <ctate@google.com> Merge "Accept any restored wallpaper" into lmp-dev
18ab83e571e1ef7e4599d38cffc080dca704a06d 07-Oct-2014 Adam Lesinski <adamlesinski@google.com> am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev

* commit 'f189c445b84365a3f1bd2b678fdca37f9df8d5d1':
Load shared library dependencies for AppWidgets
5d6238819279572ab75c8caed08942160ebe7adb 07-Oct-2014 Andres Morales <anmorales@google.com> am 4e558355: am 258d2221: Fix build, previous commit failed to remove an import

* commit '4e5583554151ea95d8d573e3d64947afbc51f34f':
Fix build, previous commit failed to remove an import
6ef845d34ae2ac773c833084997ed93c3bf9dd8a 07-Oct-2014 Andres Morales <anmorales@google.com> am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev

* commit 'b4589115ad5ca8a98aa8f9b75296502658ae6416':
Remove dead NFC unlock code from fw/base
f189c445b84365a3f1bd2b678fdca37f9df8d5d1 07-Oct-2014 Adam Lesinski <adamlesinski@google.com> am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev

* commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc':
Load shared library dependencies for AppWidgets
4e5583554151ea95d8d573e3d64947afbc51f34f 07-Oct-2014 Andres Morales <anmorales@google.com> am 258d2221: Fix build, previous commit failed to remove an import

* commit '258d222152a410341ddad045ce92e57dd7ab454e':
Fix build, previous commit failed to remove an import
b4589115ad5ca8a98aa8f9b75296502658ae6416 07-Oct-2014 Andres Morales <anmorales@google.com> am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev

* commit 'd6a2ab930972d5578957ca919abd38fca074deec':
Remove dead NFC unlock code from fw/base
1a98dd5cc7ea89793208b51983198bfbeade5ccc 07-Oct-2014 Adam Lesinski <adamlesinski@google.com> Merge "Load shared library dependencies for AppWidgets" into lmp-dev
af6781dcfe3ded916c3341c49e39b585b9a18398 07-Oct-2014 Pete Gast <pgast@google.com> Expand WearableExtender to customize labels.

BUG: 15774526
Change-Id: I5796ab0e27975b5746d677be084b1ba1ada80a76
ndroid/app/Notification.java
d00bb5edcfc8ee5c2026f66785b703b388314b22 07-Oct-2014 Adam Lesinski <adamlesinski@google.com> Load shared library dependencies for AppWidgets

PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.

Bug:17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
ndroid/app/ApplicationPackageManager.java
258d222152a410341ddad045ce92e57dd7ab454e 07-Oct-2014 Andres Morales <anmorales@google.com> Fix build, previous commit failed to remove an import

Bug:17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
ndroid/nfc/INfcAdapter.aidl
d6a2ab930972d5578957ca919abd38fca074deec 07-Oct-2014 Andres Morales <anmorales@google.com> Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
4797554ab8522ffc3dbf6f4ede111dcbbb7bb757 07-Oct-2014 Amith Yamasani <yamasani@google.com> am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev

* commit 'b86671f4b8263affaa561796862bd4149235b1d3':
Set the default user restrictions to disallow calling and sms
b86671f4b8263affaa561796862bd4149235b1d3 07-Oct-2014 Amith Yamasani <yamasani@google.com> am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev

* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
Set the default user restrictions to disallow calling and sms
41bb3455e44dc8fde4569bbfd56fa20c6da8a27d 07-Oct-2014 Amith Yamasani <yamasani@google.com> Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev
aa6634eaca707f7cbf5f5a1d75b90d8d775d254b 06-Oct-2014 Amith Yamasani <yamasani@google.com> Set the default user restrictions to disallow calling and sms

When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
ndroid/os/UserManager.java
406abd45471c523aea151f5aca84b008fee02bbe 07-Oct-2014 Christopher Tate <ctate@google.com> Accept any restored wallpaper

...and let the wallpaper service & hosts figure out what to do
with it.

Bug 17677006

Change-Id: Ie5bfa549af4da178e621ffc42a759a552897d93a
ndroid/app/backup/WallpaperBackupHelper.java
f6c763d6a4c84a576ed0ec99b8c22f3550eb39ba 26-Sep-2014 George Mount <mount@google.com> Protect against ImageView changing to a null Drawable during Transition.

Bug 17600191

Change-Id: I5918866dbb6594725f4712a92acdef23003e8f3e
ndroid/widget/ImageView.java
fcc059dcf0d84a77d9c2b5ef3b01c23afe25f72c 07-Oct-2014 Jeff Sharkey <jsharkey@android.com> am 1d5ef81e: am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev

* commit '1d5ef81e29279f769d79315f2a38e747ea92e10f':
Reduce PackageInstaller I/O pressure.
d534b936d70cd45d7dffd623ca16ec9b7fdbcbe2 07-Oct-2014 Yuncheol Heo <ycheo@google.com> Merge "Change visibility of RecordSource into public." into lmp-mr1-dev
1d5ef81e29279f769d79315f2a38e747ea92e10f 07-Oct-2014 Jeff Sharkey <jsharkey@android.com> am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev

* commit '99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
Reduce PackageInstaller I/O pressure.
99586dc0108d0f4311c8af4d06ed113bbf40a6ee 07-Oct-2014 Jeff Sharkey <jsharkey@android.com> Merge "Reduce PackageInstaller I/O pressure." into lmp-dev
0aa69ff2ff9e8556f4963b7dfdad56996a604392 07-Oct-2014 Chris Craik <ccraik@google.com> am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev

* commit '1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d':
Avoid changeBounds animations on Views that are not yet laidout
02bd78490d8594d225ecc70a74b2058cb968a657 07-Oct-2014 Jeff Sharkey <jsharkey@android.com> Reduce PackageInstaller I/O pressure.

When performing a restore during initial device setup, we could be
installing hundreds of packages. Currently, we're writing all
metadata (including heavy icons) for every session mutation! Because
we're holding the mSessions lock while writing all this heavy data,
we end up causing ANRs when apps call other PackageInstaller APIs.

This patch mitigates by moving the heavy icon data into separate
per-session PNG files, which we only persist when changed.

Bug: 17881962, 17567794
Change-Id: I4dee15d4a65a8eb65c381e6bb7477728b6cc30d2
ndroid/content/pm/PackageInstaller.java
om/android/internal/util/XmlUtils.java
052690540e2bccfebe586caf8d0fa843afb9a137 07-Oct-2014 Andres Morales <anmorales@google.com> Remove dead NFC unlock code from fw/base

Bug:17883273
Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
ndroid/nfc/INfcLockscreenDispatch.aidl
1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d 07-Oct-2014 Chris Craik <ccraik@google.com> am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev

* commit '6c9f0a01602697aaed99f54c4db0d6296701ed43':
Avoid changeBounds animations on Views that are not yet laidout
6c9f0a01602697aaed99f54c4db0d6296701ed43 07-Oct-2014 Chris Craik <ccraik@google.com> Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev
f791703f9bc566bee4f4809910d09dd415342078 06-Oct-2014 Chris Craik <ccraik@google.com> Avoid changeBounds animations on Views that are not yet laidout

bug:17683930

This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.

Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
ndroid/transition/ChangeBounds.java
2f577e83cbd5b12e47178a90443390210b446102 06-Oct-2014 Dianne Hackborn <hackbod@google.com> am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev

* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
b6f5cb3e45c9d4cf891d0ee024e7073f6d139677 06-Oct-2014 John Spurlock <jspurlock@google.com> am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev

* commit '81b96aadbdc3726186c91b51465fb21ead56888a':
Fix NPE in StrictMode handling.
90d557b7a68e64e049a44560b76b959ef87f13d7 06-Oct-2014 Dianne Hackborn <hackbod@google.com> am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev

* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
81b96aadbdc3726186c91b51465fb21ead56888a 06-Oct-2014 John Spurlock <jspurlock@google.com> am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev

* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
Fix NPE in StrictMode handling.
7f7d240b13b96b617e298c6178af0425308f5ef9 06-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev
9bb3dacbf9da4dae2cc0585c2e382c8b29476d32 06-Oct-2014 John Spurlock <jspurlock@google.com> Fix NPE in StrictMode handling.

Bug:17875462
Change-Id: I0bf31abe2d07335addd57976aca110565bb63cc4
ndroid/os/StrictMode.java
31409c0ccd1434efdcfff8f7ddcd7c4207660104 06-Oct-2014 Benjamin Franz <bfranz@google.com> Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
4b8cd6b44cf800cf5dd88e5afbcff4968398779d 03-Oct-2014 Igor Murashkin <iam@google.com> camera2: Update docs only for legacy devices

Bug: 17788234
Change-Id: Ie88f3750cc06d889c6750f2099598d53ccb601b7
ndroid/hardware/camera2/CameraCharacteristics.java
ndroid/hardware/camera2/CameraMetadata.java
ndroid/hardware/camera2/CaptureRequest.java
ndroid/hardware/camera2/CaptureResult.java
c67e5ae2da638762aec73b3c9a1c368defc79b5e 04-Oct-2014 vandwalle <vandwalle@google.com> am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev

* commit '4f5fd78019bda5582f652393fdc3c83f45100bf1':
add millisecond timestamp to locallog
6a2296d856fe4db524ab71c6500f356ff0454f29 04-Oct-2014 John Reck <jreck@google.com> am 9da6e743: am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev

* commit '9da6e7435945e34d05e0c8c5c9a324218480c6ff':
Cleanup DeferredLayerUpdater
4f5fd78019bda5582f652393fdc3c83f45100bf1 04-Oct-2014 vandwalle <vandwalle@google.com> am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev

* commit '68104b0529da95644c6cb65ab7ebb0c0bf7dff57':
add millisecond timestamp to locallog
9da6e7435945e34d05e0c8c5c9a324218480c6ff 04-Oct-2014 John Reck <jreck@google.com> am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev

* commit 'd988a45d60cd2ff05e41a44c78cb09d307bd90cb':
Cleanup DeferredLayerUpdater
68104b0529da95644c6cb65ab7ebb0c0bf7dff57 04-Oct-2014 vandwalle <vandwalle@google.com> Merge "add millisecond timestamp to locallog" into lmp-dev
2d7576b082b84068fb9d68419b710b9bec49139b 04-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17752399: Multiple apps broken by GET_TASKS permission change

Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
ndroid/app/ActivityManager.java
ndroid/content/pm/IPackageManager.aidl
c520aa89a33ddb7c065ef06bcd2d2dbf96e1f989 02-Oct-2014 vandwalle <vandwalle@google.com> add millisecond timestamp to locallog

Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
ndroid/util/LocalLog.java
d988a45d60cd2ff05e41a44c78cb09d307bd90cb 04-Oct-2014 John Reck <jreck@google.com> Merge "Cleanup DeferredLayerUpdater" into lmp-dev
749906b468912dab7bf69a86e852deac3e80b0cc 04-Oct-2014 John Reck <jreck@google.com> Cleanup DeferredLayerUpdater

Bug: 17765082

DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures

Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
ndroid/view/ThreadedRenderer.java
6b1cf642fc5bda2dfaea2571b24241bd3c2109b4 03-Oct-2014 Dianne Hackborn <hackbod@google.com> am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...

* commit '5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5':
Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
5ebb0e6a1ea16630f7b7be2380eaeb9f16876ab5 03-Oct-2014 Dianne Hackborn <hackbod@google.com> am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...

* commit 'd867b7c7a2c8c151c01b57597b6612ca5355a51a':
Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
d867b7c7a2c8c151c01b57597b6612ca5355a51a 03-Oct-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...

...'java.lang.String java.lang.String.substring(int)' on a null object reference

Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
ndroid/os/StrictMode.java
eb35fa56a46acddf21139f6cb402eb80db0e0a56 03-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev

* commit '3515ab8092719ea9f61c8c2859bf586aed0955e3':
Send callbacks for Net property changes
3515ab8092719ea9f61c8c2859bf586aed0955e3 03-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev

* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
Send callbacks for Net property changes
24861eabe641d5a147f127c8e7f98fab949224ab 03-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Send callbacks for Net property changes" into lmp-dev
ec2d48b96d1f95fb266914df294a27c210f8c3f5 01-Oct-2014 Benjamin Franz <bfranz@google.com> Introduce new API to get an unbadged icon and unbadge permissions.

Bug: 17125560
Change-Id: I61b884186c96cc54dcaf1d3c7ee8f47610fd1d21
ndroid/app/ApplicationPackageManager.java
ndroid/content/pm/PackageItemInfo.java
ndroid/content/pm/PackageManager.java
ndroid/widget/AppSecurityPermissions.java
a848c1cc0a7b72b192aef9de2d448b3e1d17619c 01-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Send callbacks for Net property changes

LinkProperties and NetworkCapabilities changes were not calling app callbacks.

bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
ndroid/net/ConnectivityManager.java
8aa21f20d8095f3a45cdacbdd06f4fcccaafd0e4 03-Oct-2014 Dianne Hackborn <hackbod@google.com> am 12dd9943: am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev

* commit '12dd9943ec01a54453f50a24da2a8e329f2d3790':
SDK only: Update docs to reflect current implementation.
12dd9943ec01a54453f50a24da2a8e329f2d3790 03-Oct-2014 Dianne Hackborn <hackbod@google.com> am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation." into lmp-dev

* commit '7a73f2c5aab16e2d4c21fcce9aa8173e87ecfb4f':
SDK only: Update docs to reflect current implementation.
7a73f2c5aab16e2d4c21fcce9aa8173e87ecfb4f 03-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "SDK only: Update docs to reflect current implementation." into lmp-dev
6f2d610f4d8ed33bf2ec4eb23a4285018e1ae028 03-Oct-2014 Jeff Brown <jeffbrown@google.com> am b82bf9df: am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev

* commit 'b82bf9df111031e0f3afa4df29fbc22460e6cc8b':
Fix race in RecognizerService teardown.
b82bf9df111031e0f3afa4df29fbc22460e6cc8b 03-Oct-2014 Jeff Brown <jeffbrown@google.com> am ae309489: Merge "Fix race in RecognizerService teardown." into lmp-dev

* commit 'ae309489c2b22c6cfcc6701b5dea13c652239ecd':
Fix race in RecognizerService teardown.
ae309489c2b22c6cfcc6701b5dea13c652239ecd 03-Oct-2014 Jeff Brown <jeffbrown@google.com> Merge "Fix race in RecognizerService teardown." into lmp-dev
61eae1605ddc940e03d0619fd840cbbb8edc54f9 02-Oct-2014 Christopher Tate <ctate@google.com> am ac3aed96: am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev

* commit 'ac3aed96eb9d3ac5bde4c4a56d1b7ba5c2a079f0':
Tweak wallpaper restore acceptance heuristics
ac3aed96eb9d3ac5bde4c4a56d1b7ba5c2a079f0 02-Oct-2014 Christopher Tate <ctate@google.com> am cdf7961f: Merge "Tweak wallpaper restore acceptance heuristics" into lmp-dev

* commit 'cdf7961f73f7ee313cbcd2f16750228cc57bcb5e':
Tweak wallpaper restore acceptance heuristics
004c16654f2f86ff3055f3c88b5498eb3254f2e1 02-Oct-2014 Christopher Tate <ctate@google.com> Tweak wallpaper restore acceptance heuristics

We now accept for restore any image that is at least wide enough to
fit the screen, and has a height within a comfortable margin of the
previously stated target.

Bug 17677006

Change-Id: I5937a82ddfbfa0bbb30d568621eb48e4b3533fac
ndroid/app/backup/WallpaperBackupHelper.java
7a81bd82f4d05e6843e4a9743e194cceb0c2d2e1 02-Oct-2014 Alan Viverette <alanv@google.com> Fix invalid bounds detection in ExploreByTouchHelper

Empty bounds are actually valid in some cases.

Change-Id: I2b9bf7c072e0370d13eff71e22498959eab07797
om/android/internal/widget/ExploreByTouchHelper.java
438fe5937f3bc04087f48b511a799f9f6cf5a205 02-Oct-2014 Chris Craik <ccraik@google.com> Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev
67a101aa3006aa2011a9d9edaacb2fa6f6f31140 02-Oct-2014 Dianne Hackborn <hackbod@google.com> SDK only: Update docs to reflect current implementation.

Change-Id: I498425bb55b157c954af6a2441d8bd9be3871c55
ndroid/os/UserManager.java
96156979022a6e1af4b29051aedd0d8e237018e8 02-Oct-2014 Jeff Brown <jeffbrown@google.com> Fix race in RecognizerService teardown.

Use a WeakReference to refer to the outer class to prevent leaks.
Ensure atomicity of access to the reference.

Bug: 17584947
Change-Id: I7ad7c7793b60fa125e04fc4d803ed905e8a00a95
ndroid/speech/RecognitionService.java
94f5155d6c81b5fd3326a91e4a2670bccfddf284 02-Oct-2014 Newton Allen <newt@google.com> am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev

* commit 'c68aad9fd0f7937176ac6a8238e6236dd7ea3427':
Fix some documentation typos.
c68aad9fd0f7937176ac6a8238e6236dd7ea3427 02-Oct-2014 Newton Allen <newt@google.com> am d84ce32b: Merge "Fix some documentation typos." into lmp-dev

* commit 'd84ce32bd2d7c3cebac15545504f4fec464a6956':
Fix some documentation typos.
d84ce32bd2d7c3cebac15545504f4fec464a6956 02-Oct-2014 Newton Allen <newt@google.com> Merge "Fix some documentation typos." into lmp-dev
c55a2547a1462a1bf9e1b3c4e102d4d61877d7fe 02-Oct-2014 Paul West <paulofthewest@google.com> am bebcde44: Merge "[DS] DSDS support for widget view" into lmp-sprout-dev

* commit 'bebcde4453af3f0711c60d09f5b0f82076daff3d':
[DS] DSDS support for widget view
bebcde4453af3f0711c60d09f5b0f82076daff3d 02-Oct-2014 Paul West <paulofthewest@google.com> Merge "[DS] DSDS support for widget view" into lmp-sprout-dev
b29b651dd58cf55303ea86e444e62ada540eaf6d 02-Oct-2014 George Mount <mount@google.com> am a590a95c: am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev

* commit 'a590a95c4d3b68f9df40b76eef1462d159ff568f':
Fix ChangeTransform works only once on a View.
a590a95c4d3b68f9df40b76eef1462d159ff568f 02-Oct-2014 George Mount <mount@google.com> am d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev

* commit 'd982b582d1993288347f771177f6889fe14fb387':
Fix ChangeTransform works only once on a View.
d982b582d1993288347f771177f6889fe14fb387 02-Oct-2014 George Mount <mount@google.com> Merge "Fix ChangeTransform works only once on a View." into lmp-dev
4f4b81bd3d6837e05a552bc64b8742ca093a2685 02-Oct-2014 Sreeram Ramachandran <sreeram@google.com> am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev

* commit 'c04e922f67cacfc428d09fd266f7c9b36a6fb472':
Send app permissions to netd.
c04e922f67cacfc428d09fd266f7c9b36a6fb472 02-Oct-2014 Sreeram Ramachandran <sreeram@google.com> am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev

* commit '5aaabc0fa66dd755843f040fe634962477107950':
Send app permissions to netd.
0c5c24f23468aa71ccf10c2b6b31f6922222f15a 02-Oct-2014 Jungshik Jang <jayjang@google.com> Change visibility of RecordSource into public.

RecordSource should be accessible outside of
android.hardware.hdmi.

Bug: 17775014
Change-Id: I4c8879dc1504aad9672555c17d5b7f6643ed5188
ndroid/hardware/hdmi/HdmiRecordSources.java
e4a05afe85f15472325db9c535ef81f409fb6070 24-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Send app permissions to netd.

Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
ndroid/os/INetworkManagementService.aidl
ded96310cfd24b3cea21a814edf8629f592c7014 02-Oct-2014 Dianne Hackborn <hackbod@google.com> am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '796d6eced1e23217914e639da45d9371baf8a5b0':
More work on issue #17656716: Unhandled exception in Window Manager
796d6eced1e23217914e639da45d9371baf8a5b0 02-Oct-2014 Dianne Hackborn <hackbod@google.com> am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
More work on issue #17656716: Unhandled exception in Window Manager
c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a 02-Oct-2014 Dianne Hackborn <hackbod@google.com> Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
c6646b0cb4ca34f1f0842b94367a5b34191f9976 02-Oct-2014 Erik Pasternak <roboerik@android.com> am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev

* commit '739bf81dd130957c9bc09abc4e25732af2d675c0':
Implement auto-sleep functionality.
739bf81dd130957c9bc09abc4e25732af2d675c0 02-Oct-2014 Erik Pasternak <roboerik@android.com> am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev

* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
Implement auto-sleep functionality.
4d82c46ef5df06e1b92f3574e41b38a62ec0e607 02-Oct-2014 Erik Pasternak <roboerik@android.com> Merge "Implement auto-sleep functionality." into lmp-dev
8d05172112436a81bed6e4a0810f8914509d8a4d 01-Oct-2014 Dianne Hackborn <hackbod@google.com> More work on issue #17656716: Unhandled exception in Window Manager

Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock. This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it. And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing. So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
ndroid/os/StrictMode.java
ndroid/util/Slog.java
a5ecdbb1a82f93a4feeefb2a905cb3881ab3bc3a 02-Oct-2014 Alan Viverette <alanv@google.com> Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev
62a8b61f929315c82448888a7addb0853f62293e 02-Oct-2014 Alan Viverette <alanv@google.com> Manage pressed state during drag-to-open

BUG: 17573390
Change-Id: Ia85d7b51d6e4a18dcbf99b930f9f7c045697a31b
ndroid/widget/ListPopupWindow.java
5f961157c4480e3abbde0f80e5f682da4224b528 02-Oct-2014 Hui Shu <hush@google.com> am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev

* commit '888fd710cd9ae569d47e1795f47e2ad909b5c8df':
Revert "Remove WebView DRP Setting from Developer Settings"
cae740173f2797209bea31f3df23e6b664754498 02-Oct-2014 Patrick Tjin <pattjin@google.com> am f7c59190: am dea847c2: Skip over directories when iterating tombstones

* commit 'f7c59190f7f0ece82b98ed61ca16d5f7ab20dc0d':
Skip over directories when iterating tombstones
d644facfcd415b0ced337c6c2ef116fc4f1e1f63 02-Oct-2014 John Reck <jreck@google.com> am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev

* commit 'f408656a731328694b3ffee2f588263d60349dc3':
Re-allow suppressing onDetachedFromWindow
7ce8d27fcd83a4e193765f1814fb8f47d7ebf372 02-Oct-2014 Hui Shu <hush@google.com> am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev

* commit '9cd616e067b9049c87ad5064d3cf4b8cc380ddfa':
Remove WebView DRP Setting from Developer Settings
888fd710cd9ae569d47e1795f47e2ad909b5c8df 02-Oct-2014 Hui Shu <hush@google.com> am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev

* commit '4e0ad44fcac48b2be77bd116ffdb696cb6490829':
Revert "Remove WebView DRP Setting from Developer Settings"
4e0ad44fcac48b2be77bd116ffdb696cb6490829 02-Oct-2014 Hui Shu <hush@google.com> Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev
05af6adb8d4fd5ea069c9aead5a877da9085daa8 01-Oct-2014 Jeff Brown <jeffbrown@google.com> Implement auto-sleep functionality.

Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity. By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM. When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
ndroid/provider/Settings.java
2267177279326b6d499830a2d177eacff6ea50a8 01-Oct-2014 Hui Shu <hush@google.com> Revert "Remove WebView DRP Setting from Developer Settings"

This reverts commit eb487c63017ae5cb0f3f35bf8b17c5f3bbb0f456.

Change-Id: Ie38a24efe2ea015b971cb0a05eca321299898538
ndroid/provider/Settings.java
ndroid/webkit/WebView.java
f7c59190f7f0ece82b98ed61ca16d5f7ab20dc0d 01-Oct-2014 Patrick Tjin <pattjin@google.com> am dea847c2: Skip over directories when iterating tombstones

* commit 'dea847c2ace8894a595cf9bd87764ce2ca9698ab':
Skip over directories when iterating tombstones
24314e7d10d0354cd548de35a2c4795a87fbfb21 01-Oct-2014 George Mount <mount@google.com> Fix ChangeTransform works only once on a View.

Bug 17762118

When ChangeTransform is used on a View, its intermediate values
are being set, but not cleared after the transition completes
unless it uses a GhostView. This CL clears the intermediate
values when the animation ends if no GhostView is used.

Change-Id: I2590d9c2bc36d31023b3e1af94d2bd72c9589eb5
ndroid/transition/ChangeTransform.java
dea847c2ace8894a595cf9bd87764ce2ca9698ab 01-Oct-2014 Patrick Tjin <pattjin@google.com> Skip over directories when iterating tombstones

Bug: 17380601
Change-Id: Idb6e559a89c7438751bd7a52375b9789454e0334
om/android/server/BootReceiver.java
97850c066b3eccdabecdd5f424735883661c12ed 11-Sep-2014 Mick Lin <Mick.Lin@mediatek.com> [DS] DSDS support for widget view

Change-Id: If8b8410eb3cc471933f0b109973ea1f43fe5e791
om/android/internal/widget/AccountItemView.java
om/android/internal/widget/AccountViewAdapter.java
a67c6f0162f0459db2befef5726851d5cb0bf5f9 28-Mar-2014 Jeff Hao <jeffhao@google.com> Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]

Needed to bypass new access checks for fields, methods, and
constructors.

Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
(cherry picked from commit e3abd2ccbef4c50b48df3605c65d732fa49a980b)
ndroid/view/LayoutInflater.java
f408656a731328694b3ffee2f588263d60349dc3 01-Oct-2014 John Reck <jreck@google.com> am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev

* commit '8786a962f0aa9991e0bc668eb7d9eae45645409e':
Re-allow suppressing onDetachedFromWindow
8786a962f0aa9991e0bc668eb7d9eae45645409e 01-Oct-2014 John Reck <jreck@google.com> Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev
9cd616e067b9049c87ad5064d3cf4b8cc380ddfa 01-Oct-2014 Hui Shu <hush@google.com> am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev

* commit 'aee5c9e7c1f61126c61722a957daedf57cf26e7e':
Remove WebView DRP Setting from Developer Settings
aee5c9e7c1f61126c61722a957daedf57cf26e7e 01-Oct-2014 Hui Shu <hush@google.com> Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
3867e4d0c08ad74ee16dfde70e81c77f09e0e0ff 01-Oct-2014 Craig Mautner <cmautner@google.com> am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev

* commit '9ab8fbbc60588b204d362bdab45d892e8274382b':
Don't clear visible-behind activity if it is top
9ab8fbbc60588b204d362bdab45d892e8274382b 01-Oct-2014 Craig Mautner <cmautner@google.com> am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev

* commit '245645ca460150b4030d84c88faa931345a90a50':
Don't clear visible-behind activity if it is top
245645ca460150b4030d84c88faa931345a90a50 01-Oct-2014 Craig Mautner <cmautner@google.com> Merge "Don't clear visible-behind activity if it is top" into lmp-dev
77e4a5250fc6df451999efe508f57968a44b603f 01-Oct-2014 John Reck <jreck@google.com> Re-allow suppressing onDetachedFromWindow

Bug: 17578553

Games seem to be doing this to prevent destruction of their
GL contexts, and they assume it works even if it doesn't. However,
GLSurfaceView is clunky here, so while the app is doing something
questionable we don't really offer a better way. For now revert
back to kitkat behavior.

Change-Id: Icfa9e496279b9cfa47f9bc7f6848d9313caed0d5
ndroid/view/SurfaceView.java
64ccb7086741d520c041273610519a5c2f65b440 01-Oct-2014 Craig Mautner <cmautner@google.com> Don't clear visible-behind activity if it is top

Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
ndroid/app/Activity.java
13705ca9404e7364044010f2268d70ed177799c4 01-Oct-2014 Narayan Kamath <narayan@google.com> am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev

* commit 'd480147f1853e452e7e8fc4820db0e7821488289':
Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
0d71155d42e09e62456505bcff4e1dfe02ba9b32 01-Oct-2014 Jerome Poichet <jpoichet@google.com> am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev

* commit 'a5fa02dfa8ae6e2a8cfab6489ada400f8c33f455':
Make sure cancel is called on tear down.
bf1184e8bb795ea74044c9ccb703883f579ccec4 01-Oct-2014 Eino-Ville Talvala <etalvala@google.com> am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev

* commit '4ddacc465d52d118dedc087f68d6a00f8b419342':
Camera2 Legacy: Set a default thumbnail size
ced21e4e651ab86d311212f527036253dd8079c4 01-Oct-2014 Adam Powell <adamp@google.com> am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev

* commit 'c754382ba042ee0c70892b5ec33cd32c11e98d16':
Inset the non-overlay contextual action bar without a status guard
601fa2498d9042a19a21015e21629901ff09b25d 01-Oct-2014 Alan Viverette <alanv@google.com> am 8c14ff5c: am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev

* commit '8c14ff5cb1e742e7e57cc213f91cb76b9600479c':
Implement missing visibility management for FrameLayout foreground
4d9face69eed8e1e6980199ea4e91a01a4bf0759 01-Oct-2014 Ruben Brunk <rubenbrunk@google.com> am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev

* commit '7432b88447dea2a9a5b8adcfeb150da7a18d22f6':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
16b6a8f702fe654575f8929754908f57845158ce 01-Oct-2014 Dianne Hackborn <hackbod@google.com> am 962e3e83: am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '962e3e831516688824fec334c5ddcfd4f3d13f44':
More work on issue #17656716: Unhandled exception in Window Manager
344ffbc647926611e52ae31d3e3188099a3b76fc 01-Oct-2014 Svetoslav <svetoslavganov@google.com> am 567c9788: am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev

* commit '567c97881b1d1719d32daaf647979e47e01be438':
Use default encryption password if an accessibility service is enabled.
d1c1201dfc07a6cce890b69610dc0e173a282791 01-Oct-2014 Winson Chung <winsonc@google.com> am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev

* commit 'b61dea2047b1b27f169728104f8279528fbd9eac':
Fixing regression with black task bar background. (Bug 17584337)
82ef988c92fb158125f294201baecaceff7bcc8e 01-Oct-2014 Chris Wren <cwren@android.com> am b742c9a0: am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev

* commit 'b742c9a01261075d6a85f23d72e7842dec932cda':
Add a returns clause to the matchesInterruptionFilter javadoc.
1d88c087e6f95d1e29a2d657b4a446f2a20d75c4 01-Oct-2014 Chris Wren <cwren@android.com> am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev

* commit '4afe428f49533342966545a14b51acaee9052c71':
Update the documentation on EXTRA_PEOPLE.
30854356ef263a4e4ac3bd2376886f272d768e72 01-Oct-2014 Dianne Hackborn <hackbod@google.com> am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev

* commit '29a115235832fd4ea6f6cac1ad962a3bfe6e99be':
Fix issue #17705755: Battery stats resets at incorrect times
6d7a0cd57f75e3b88a7f8a0f74694c8c049784c3 01-Oct-2014 George Mount <mount@google.com> am 3dc0a918: am 8afceda1: Merge "Clear preordered list after use." into lmp-dev

* commit '3dc0a918748fade0ad7c683c6bc769f032759fcd':
Clear preordered list after use.
d480147f1853e452e7e8fc4820db0e7821488289 01-Oct-2014 Narayan Kamath <narayan@google.com> am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev

* commit '7dc7f676d699c739128dcc7855cbc0dacddaaa57':
Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
a5fa02dfa8ae6e2a8cfab6489ada400f8c33f455 01-Oct-2014 Jerome Poichet <jpoichet@google.com> am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev

* commit '72079f7f9b644e57169e26597ec7c727786071a1':
Make sure cancel is called on tear down.
4ddacc465d52d118dedc087f68d6a00f8b419342 01-Oct-2014 Eino-Ville Talvala <etalvala@google.com> am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev

* commit '0a62ab707977d4d6666d1c452ba702442655b6e6':
Camera2 Legacy: Set a default thumbnail size
c754382ba042ee0c70892b5ec33cd32c11e98d16 01-Oct-2014 Adam Powell <adamp@google.com> am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev

* commit 'fe426d061ad5feb65200c2970bf826b10e356247':
Inset the non-overlay contextual action bar without a status guard
8c14ff5cb1e742e7e57cc213f91cb76b9600479c 01-Oct-2014 Alan Viverette <alanv@google.com> am c44c77d3: Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev

* commit 'c44c77d305c02d9c8280df5ce3a816ee586c9d52':
Implement missing visibility management for FrameLayout foreground
7432b88447dea2a9a5b8adcfeb150da7a18d22f6 01-Oct-2014 Ruben Brunk <rubenbrunk@google.com> am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev

* commit 'b3c802f2381c3411fe753206ab89027f60164b77':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
962e3e831516688824fec334c5ddcfd4f3d13f44 01-Oct-2014 Dianne Hackborn <hackbod@google.com> am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
More work on issue #17656716: Unhandled exception in Window Manager
567c97881b1d1719d32daaf647979e47e01be438 01-Oct-2014 Svetoslav <svetoslavganov@google.com> am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev

* commit '44d4eeaa48721296663a05d01071f196a509dc34':
Use default encryption password if an accessibility service is enabled.
b61dea2047b1b27f169728104f8279528fbd9eac 01-Oct-2014 Winson Chung <winsonc@google.com> am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev

* commit 'da649073bd927fa69d02982745cc1d61e9a4f8b3':
Fixing regression with black task bar background. (Bug 17584337)
b742c9a01261075d6a85f23d72e7842dec932cda 01-Oct-2014 Chris Wren <cwren@android.com> am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev

* commit 'c3328cacdad67623f94b13fceb734d958461a475':
Add a returns clause to the matchesInterruptionFilter javadoc.
4afe428f49533342966545a14b51acaee9052c71 01-Oct-2014 Chris Wren <cwren@android.com> am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev

* commit 'af098c5657942d645ec7362cc439718457abec64':
Update the documentation on EXTRA_PEOPLE.
29a115235832fd4ea6f6cac1ad962a3bfe6e99be 01-Oct-2014 Dianne Hackborn <hackbod@google.com> am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev

* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede':
Fix issue #17705755: Battery stats resets at incorrect times
3dc0a918748fade0ad7c683c6bc769f032759fcd 01-Oct-2014 George Mount <mount@google.com> am 8afceda1: Merge "Clear preordered list after use." into lmp-dev

* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
Clear preordered list after use.
7dc7f676d699c739128dcc7855cbc0dacddaaa57 01-Oct-2014 Narayan Kamath <narayan@google.com> Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev
e26ba8f74f364079b97c0dcdad3f441f9bb553d4 01-Oct-2014 Dianne Hackborn <hackbod@google.com> am 069de204: am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '069de2045ef1b65f8952e2a452afbfa6bdc3f850':
Work on issue #17656716: Unhandled exception in Window Manager
c1fb6dc1a494d73a080348d16b96e70f5735e036 01-Oct-2014 Jerome Poichet <jpoichet@google.com> Make sure cancel is called on tear down.

- Make sure cancel is called when consumer of SpeechRecognizer calls
destroy.
- If consumer goes away, make sure to call cancel as well.

b/17584947 Pressing mic button in Music hoses audio

Change-Id: Ibe1198b37fe6167493a8694f9089d970f1eb07de
ndroid/speech/RecognitionService.java
ndroid/speech/SpeechRecognizer.java
069de2045ef1b65f8952e2a452afbfa6bdc3f850 01-Oct-2014 Dianne Hackborn <hackbod@google.com> am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
Work on issue #17656716: Unhandled exception in Window Manager
017b13a50c1225ca338357dc1315befa38dc3e33 01-Oct-2014 Dake Gu <dake@google.com> ActivityTransition: Encode scaleType and matrix in snapshot view

So that SharedElementCallback can setup initial imageView scale
type properly to run transition against.

b/17703309

Change-Id: I0ab212e0413fd666de605bc51ef64c8d66e4d09d
ndroid/app/SharedElementCallback.java
ndroid/transition/TransitionUtils.java
eb487c63017ae5cb0f3f35bf8b17c5f3bbb0f456 01-Oct-2014 Hui Shu <hush@google.com> Remove WebView DRP Setting from Developer Settings

BUG: 17730990
Change-Id: Ic4fde9affb2f887329d6b3d2dbe8945959c016d8
ndroid/provider/Settings.java
ndroid/webkit/WebView.java
0a62ab707977d4d6666d1c452ba702442655b6e6 01-Oct-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev
fe426d061ad5feb65200c2970bf826b10e356247 01-Oct-2014 Adam Powell <adamp@google.com> Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev
c44c77d305c02d9c8280df5ce3a816ee586c9d52 01-Oct-2014 Alan Viverette <alanv@google.com> Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev
b3c802f2381c3411fe753206ab89027f60164b77 01-Oct-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
3be5e0e625534126a922d407d8c5f3ffc7d26568 30-Sep-2014 Alan Viverette <alanv@google.com> Implement missing visibility management for FrameLayout foreground

BUG: 15350931
Change-Id: I16900d0d95051489852385d682e7b5aa4adad327
ndroid/widget/FrameLayout.java
0c79884076405bc36c0fb4f1bce27f883b97d64c 30-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Use valid dimensions for RGBA8888 gralloc buffers.

Bug: 17675571

- All of the mistakes were made. Unmake them.

Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
ndroid/hardware/camera2/legacy/RequestThreadManager.java
46cbf7e1903f5cf1c3960e63989499f373ad7db4 30-Sep-2014 Adam Powell <adamp@google.com> Inset the non-overlay contextual action bar without a status guard

When the status guard is not available, (e.g. when the window is not
drawing system bars) do not consume the insets when an action mode is
active.

Bug 17691453

Change-Id: I459622eaf161a96152fb9ac5f60bb9508aa4de89
ndroid/view/View.java
9cf01b63cb0023aec0e05b1ce050ff572532b876 30-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
44d4eeaa48721296663a05d01071f196a509dc34 30-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev
16e4a1aade2b73edfdaa42aa86a3893fd039fc62 30-Sep-2014 Svetoslav <svetoslavganov@google.com> Use default encryption password if an accessibility service is enabled.

When device is encrypted the user has to authenticate in order to decrypt
the data partition which is required for running accessibility services
and Text-To-Speech. In order to address this issue we are falling back
to use the default password if there is an enabled accessibility service
and the user has secure lock. This will enable the user to authenticate
when accessibility layer is completely functional.

bug:17671790

Change-Id: Iafffe7bcd234008cf91ffb5011b21b803dca227a
ndroid/view/AccessibilityManagerInternal.java
om/android/internal/widget/LockPatternUtils.java
57c79c8a4988e236b223502258a799e8b0ea4ca0 30-Sep-2014 Chris Craik <ccraik@google.com> Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates

bug:17697944
Change-Id: I1c2296707df5fc29bfc85385d766217afc1063cf
ndroid/view/ViewGroup.java
da649073bd927fa69d02982745cc1d61e9a4f8b3 30-Sep-2014 Winson Chung <winsonc@google.com> Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev
c3328cacdad67623f94b13fceb734d958461a475 30-Sep-2014 Chris Wren <cwren@android.com> Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev
af098c5657942d645ec7362cc439718457abec64 30-Sep-2014 Chris Wren <cwren@android.com> Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev
ce92b0d070c4967914698b4e257c203d7121c972 30-Sep-2014 Dianne Hackborn <hackbod@google.com> More work on issue #17656716: Unhandled exception in Window Manager

Drop down the limit on when we log, since under normal operation we
will never get more than a few K of data due to strict mode.

Try to clean up the code paths coming in and out of binder IPCs to
plug any places where we could disrupt the gather flag of a thread,
causing it to keep gathering stack crawls (which is the thing that
is causing our strict mode data to become so large).

Change-Id: I9a46512283d33e863c429840b465855d1fabb74e
ndroid/app/ApplicationErrorReport.java
ndroid/os/Binder.java
ndroid/os/StrictMode.java
3adf18dc33c1a57983461a3f23976ca9103492c4 30-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera2 Legacy: Set a default thumbnail size

Generally, JPEGs are better with thumbnails, and the default parameters
typically set a basic thumbnail size. In legacy, include a default size in the
templates.

This also works around issues with some devices not producing valid images with no
thumbnail.

Bug: 17724701
Change-Id: I2ad1449fc8c6d1fdec609af55f53db7491abbb92
ndroid/hardware/camera2/legacy/LegacyMetadataMapper.java
0fef44de68c022a35aa34b6f36f8a183c827c684 30-Sep-2014 Chris Wren <cwren@android.com> Add a returns clause to the matchesInterruptionFilter javadoc.

Bug: 17641219
Change-Id: I4f1949902bf872823389f3db8e694e370e113295
ndroid/service/notification/NotificationListenerService.java
c3014c8cf8932cb6a482e985edc7def97c50eede 30-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev
e6c4893ed4d4f79df4299dfd0587b641dc1e2e81 29-Sep-2014 Chris Wren <cwren@android.com> Update the documentation on EXTRA_PEOPLE.

Include the supported formats with links to ContactsContract documentation.

Bug: 15283556
Change-Id: Ic48b0a9ad1be61f0fa119b1d0e9d6aac5e5bea27
ndroid/app/Notification.java
8afceda14176b911cf755b8ebbcfbfa9eff60aae 30-Sep-2014 George Mount <mount@google.com> Merge "Clear preordered list after use." into lmp-dev
eff258c3050e260b67399432357c7d79baec7916 30-Sep-2014 Narayan Kamath <narayan@google.com> Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS

32 bit processes will always see values from SUPPORTED_32_BIT_ABIS
and 64 bit processes will always see values from SUPPORTED_64_BIT_ABIS.

bug: 17367265
Change-Id: I9996034c190f9213986b9b1a4ee0e38eca91c7ad
ndroid/os/Build.java
8f8a11b7fa26e603519131001ab46596aa30ba1a 26-Nov-2013 Newton Allen <newt@google.com> Fix some documentation typos.

Change-Id: I747a0ade5c7b9c45d4465bf327952338bbc1cfaa
(cherry picked from commit 4465d1a03ee5fddc5987c19fc36b0bb79e19572f)
ndroid/content/ClipData.java
ndroid/content/UriMatcher.java
ndroid/net/Uri.java
ndroid/text/method/KeyListener.java
ndroid/view/View.java
ndroid/view/inputmethod/InputConnection.java
ndroid/widget/RelativeLayout.java
ndroid/widget/TextView.java
fb3809ca63c17ac09162e08ee3eef0bdae16dc73 30-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17705755: Battery stats resets at incorrect times

Revert back to (mostly) KK behavior, fix a problem where we were
collecting some data in an inconsistent state.

Change-Id: Ida3ca3fb734a9d7d61a90fd5044152e927c59e02
om/android/internal/os/BatteryStatsImpl.java
50ac6cb9820da352bd5e89596b17561878e969cc 30-Sep-2014 George Mount <mount@google.com> Clear preordered list after use.

Bug 17671834
Bug 17697944

Change-Id: I0ba46f32661869db0c925b00342211ea543e2f88
ndroid/view/GhostView.java
73d6a821aeecd6003c70c32f7ae6c38f062c4290 29-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17656716: Unhandled exception in Window Manager

Remove the checks for large parcel sizes. Those were triggering,
and identifyng the area of the problem, but also cause a lot of
trouble by making the unsafe deadlocky code there much more likely
to deadlock.

Add logging for strict mode IPCs, since those seem to be the
problem. Only log when things look bad.

Also add a log when battery stats are reset, to diagnose why they
are getting reset when they shouldn't be.

Change-Id: I588c858fb8d8c45f3c9c164ae2de9ae01547b304
ndroid/app/ApplicationErrorReport.java
ndroid/os/Binder.java
ndroid/os/StrictMode.java
om/android/internal/os/BatteryStatsImpl.java
ae12dae13a58695653e6918124ca68cd8dcbf54e 29-Sep-2014 Winson Chung <winsonc@google.com> Fixing regression with black task bar background. (Bug 17584337)

Change-Id: Ieaa2defa4997ffc8851832c18dfe84e561ffedb5
ndroid/app/ActivityManager.java
04cea9f8e075e9d6fb7c92b8170771cf78005e29 29-Sep-2014 Adrian Roos <roosa@google.com> am 0c92c858: am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev

* commit '0c92c858b039a40b066136cdbf13ae5a38a00b1d':
Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
5aa788a61f0613966bd1e866714927b57468bffa 29-Sep-2014 Paul Jensen <pauljensen@google.com> am a621a97f: am 89e0f093: Move mobile provisioning APN support into telephony.

* commit 'a621a97f4a05891a514ba5343c9db04d125e1eb8':
Move mobile provisioning APN support into telephony.
0c92c858b039a40b066136cdbf13ae5a38a00b1d 29-Sep-2014 Adrian Roos <roosa@google.com> am 51a400eb: Merge "Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams" into lmp-dev

* commit '51a400eb440c89fb06a47371bb7b026f00edb09c':
Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams
a621a97f4a05891a514ba5343c9db04d125e1eb8 29-Sep-2014 Paul Jensen <pauljensen@google.com> am 89e0f093: Move mobile provisioning APN support into telephony.

* commit '89e0f0937a70d73b5ed188c9337b4d33860e5573':
Move mobile provisioning APN support into telephony.
9d38f35a8f4e2ae671337af20c640dffa92570c5 26-Sep-2014 Adrian Roos <roosa@google.com> Clear FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS for dreams

By default, dreams should not get the in-window bars
because those conflict with the lights-out bar mode.

Bug: 17367264
Change-Id: I8c041c706f7a7c4791ed4760c34a5618fb7423d7
ndroid/service/dreams/DreamService.java
89e0f0937a70d73b5ed188c9337b4d33860e5573 15-Sep-2014 Paul Jensen <pauljensen@google.com> Move mobile provisioning APN support into telephony.

Most of this logic is simply removed from ConnectivityService.
The captive portal detection is now done by the NetworkMonitor.
The notification logic is still left in ConnectivityService as
it's used by both the NetworkMonitor and telephony's mobile
provisioning logic.

bug:17324098

Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8
ndroid/net/ConnectivityManager.java
ndroid/net/IConnectivityManager.aidl
454a681fc3225ee989ff85c000e7435ed2b3ced9 29-Sep-2014 jgu21 <jinghui.gu@intel.com> am df44f764: am 20867871: Frameworks/base: Early init native bridge

* commit 'df44f764444a8676051c54cfb3e3f5fd2b8682c8':
Frameworks/base: Early init native bridge
2d0d041ffe663db6e28fbf8fc30c78b6e216ce25 29-Sep-2014 George Mount <mount@google.com> am 3bcfbdd9: am 8120652b: Order GhostViews so that they display in their ghosted view\'s order.

* commit '3bcfbdd9024785af3bbf8a0f6c513b36ea1b7ae9':
Order GhostViews so that they display in their ghosted view's order.
77e41f5ec4a5e5225e066823fb9e8afa0f26c244 29-Sep-2014 Svetoslav <svetoslavganov@google.com> am b009016f: am ed2fdc6e: Accessibility node provider getting invalid virtual view id.

* commit 'b009016f03f893129b3b20592ba8cae4bd1c9747':
Accessibility node provider getting invalid virtual view id.
df44f764444a8676051c54cfb3e3f5fd2b8682c8 29-Sep-2014 jgu21 <jinghui.gu@intel.com> am 20867871: Frameworks/base: Early init native bridge

* commit '208678718f9f8db3bc279c7d5bd1445af2831ae3':
Frameworks/base: Early init native bridge
3bcfbdd9024785af3bbf8a0f6c513b36ea1b7ae9 29-Sep-2014 George Mount <mount@google.com> am 8120652b: Order GhostViews so that they display in their ghosted view\'s order.

* commit '8120652bb1155d762d945c1a3bf1636b6825dbd2':
Order GhostViews so that they display in their ghosted view's order.
b009016f03f893129b3b20592ba8cae4bd1c9747 29-Sep-2014 Svetoslav <svetoslavganov@google.com> am ed2fdc6e: Accessibility node provider getting invalid virtual view id.

* commit 'ed2fdc6ef560c76ba310a2c4e5bb63f01d08af40':
Accessibility node provider getting invalid virtual view id.
208678718f9f8db3bc279c7d5bd1445af2831ae3 10-Sep-2014 jgu21 <jinghui.gu@intel.com> Frameworks/base: Early init native bridge

Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.

(cherry picked from commit 2eacd06bfb82b33dfcbccafbcfc0bf1218484bb5)

Bug: 17671501
Change-Id: I970db5b284b0c12e2d8a45df3950c1fff2927a4e
ndroid/os/Process.java
om/android/internal/os/Zygote.java
om/android/internal/os/ZygoteConnection.java
8120652bb1155d762d945c1a3bf1636b6825dbd2 27-Sep-2014 George Mount <mount@google.com> Order GhostViews so that they display in their ghosted view's order.

Bug 17671834

GhostViews can be added in arbitrary order since they are added
depending on how they are insterted into the TransitionValues
maps. This CL does two things: it ensures that GhostViews are always
pulled to the top of the Overlay and inserts GhostViews into
the Overlay in the order that their ghosted views are drawn.

Change-Id: I9f68105126834cc8f30a6cfe5d58fc3c51465afd
ndroid/view/GhostView.java
ndroid/view/ViewGroup.java
ed2fdc6ef560c76ba310a2c4e5bb63f01d08af40 27-Sep-2014 Svetoslav <svetoslavganov@google.com> Accessibility node provider getting invalid virtual view id.

If the virtual child id is not specified we should ask the node
provider to create a node info for the hosting view bu passing
the special host node id.

bug:17664111

Change-Id: Iaf1387acdfe33b50b50729d293adcdf82340a648
ndroid/view/AccessibilityInteractionController.java
3e616c1f6b6b253df01c167f289f7592cbc2cdec 27-Sep-2014 Andres Morales <anmorales@google.com> am 38c53ee8: am 858d04cb: Merge "Mark PDB identifier as SystemApi" into lmp-dev

* commit '38c53ee836c76b3aae4bb4815820a5401c017cc2':
Mark PDB identifier as SystemApi
30adb2ca22140c2313400ec8c6ff45f59a98a742 27-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev

* commit 'd0f17b986c78f1915f6cf155858b6fd2a9927f23':
camera2: Fix native ImageReader test segfaults.
aa1bcd95cfd42b74106680d29e44c70b82dca742 27-Sep-2014 Andres Morales <anmorales@google.com> am 858d04cb: Merge "Mark PDB identifier as SystemApi" into lmp-dev

* commit '858d04cbf0962acba1ffc0e5df4113c01ed3abec':
Mark PDB identifier as SystemApi
1c2bb0c72ee1063cbb315736fcd0c356c9558c47 27-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev

* commit '6f34ad71cb00c7f4260dbf071422b334152a2cd1':
camera2: Fix native ImageReader test segfaults.
66b63cb825b37079ea0d50e1482064d118620822 27-Sep-2014 Andres Morales <anmorales@google.com> Merge "Mark PDB identifier as SystemApi" into lmp-dev
7b28c66a6cc10b48231f8a5d8d45f5e22322e798 27-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
31798f33184fd59dd3d3cc55e6373d9f91d220b6 26-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix native ImageReader test segfaults.

Bug: 17675571

- Check for JPEG footer in correct location from ImageReader
when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
incorrect width calculations.

Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
ndroid/hardware/camera2/legacy/RequestThreadManager.java
33df937f6f187006b653b030154a1e891410d0ae 27-Sep-2014 Andres Morales <anmorales@google.com> Mark PDB identifier as SystemApi

Had already marked the API itself as system api, just not
the Context.BLAH id. Also update the javadoc as it doesn't
return an FD anymore.

Change-Id: Ic8a5b8c75b0ba0bdf4ad26cf33d5f87eea568376
ndroid/content/Context.java
332b01e0675e3cdaeeaecb37af77530178c92a50 27-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 92a92a93: am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev

* commit '92a92a93c09d0e1f405d292560f32b2f3a4dc62d':
Camera2: Fix parallel session and device close() exception
8883ada99b8f666b24cfeec9442144cea4e2e2c7 27-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev

* commit '678e432809fcde0d189f1130887bb201967eb342':
Camera2: Fix parallel session and device close() exception
ccc483696b0d2a934c5372ad73e686cdbe7767f5 27-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev
dfb0b303de6f6cd1bb8ac653c1182d7ae8ef5098 27-Sep-2014 Alan Viverette <alanv@google.com> am a6958574: am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev

* commit 'a69585749e38e5300162317e4f046dc66cdf1966':
Add callback to track and thumb drawables, propagate state in ASLD
08cb4ec7a76dbc81d1b1a0a935fe700dcfb46cf3 27-Sep-2014 Dianne Hackborn <hackbod@google.com> am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '72bc7651fb7b7fff7e3a0a4d0d61cada28278b2d':
More debugging for issue #17656716: Unhandled exception in Window Manager
72f1d94fed91381a8a80ec8d48738904bea7ef5b 27-Sep-2014 Alan Viverette <alanv@google.com> am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev

* commit '637569566d2234b06e08d94acf4db1b0d3be6501':
Add callback to track and thumb drawables, propagate state in ASLD
e4f529c7bada151d6b5fcb46f3f623143f287819 27-Sep-2014 Dianne Hackborn <hackbod@google.com> am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit 'cbb94a27c1f0fa8c2b459ffe3206eb96006f92dc':
More debugging for issue #17656716: Unhandled exception in Window Manager
ab9f1bab6b9513a7b722be989b78d5a41514b181 27-Sep-2014 Alan Viverette <alanv@google.com> Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev
b067405bf453289a6b6bfd34b06700f08be58c24 27-Sep-2014 Alan Viverette <alanv@google.com> Add callback to track and thumb drawables, propagate state in ASLD

BUG: 17665424
Change-Id: I22da4530f3e2869d856102e804f020461a46fe49
ndroid/widget/Switch.java
820eab3e751fde9d8bb65d9aadcc058483d55a50 27-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev
78efd1be8c2aafa251fa30c71322c5a02cc57d84 27-Sep-2014 Svetoslav <svetoslavganov@google.com> am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev

* commit '5cdfd3ac79d5e2bf23652a6fb52f95f1267ee9fe':
Accessibility node provider getting invalid virtual view id.
3f1c8a08c1d8125630d8a6e66d852049c66901ee 27-Sep-2014 Elliott Hughes <enh@google.com> am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev

* commit '416de7fdbecc186c01db7266c659a0c7ad095eb6':
Set the system locale correctly even on an encrypted device.
9743acd8b5c1427450dee8666e1cc279fa84a73f 27-Sep-2014 Svetoslav <svetoslavganov@google.com> am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev

* commit '7c20fcc83a5216a993bb1b31ab9ed09e90457fc5':
Accessibility node provider getting invalid virtual view id.
2d895e5b21209e1cf1d3d969e5458e2d0fbbc1e2 27-Sep-2014 Elliott Hughes <enh@google.com> am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev

* commit '70c1f083332729a586d670af7565732a2eb06ab4':
Set the system locale correctly even on an encrypted device.
44389c5a3c8e6194573458b73f09197177f85c97 27-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev
39aa0d946bc831cc3e25cc60694deaaa1239ca85 27-Sep-2014 Elliott Hughes <enh@google.com> Merge "Set the system locale correctly even on an encrypted device." into lmp-dev
fad079dc5dbec1cb2461e4f8e0cdfd4784e9eada 27-Sep-2014 Dianne Hackborn <hackbod@google.com> More debugging for issue #17656716: Unhandled exception in Window Manager

Change-Id: I81d3678e21d293d5896c467ae5c6739c82cfaa95
ndroid/os/Binder.java
56fbbeab7931386af7ad9701fad9b62c170abd77 24-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera2: Fix parallel session and device close() exception

It's possible for the device to have close() called on it
during the session close sequence such that the session still
tries to do a stream reconfiguration on the closed device.

Handle the exception thrown by this attempt.

Bug: 17661765

Change-Id: Iee63c5c559405abe5c044ae251ad56edd1fb3e79
ndroid/hardware/camera2/impl/CameraCaptureSessionImpl.java
67e4da3f64bf87051a49166f352355e005b02ce8 27-Sep-2014 Igor Murashkin <iam@google.com> am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev

* commit 'd3edd1c2f2c6c4c78d515a8f70273b9bc7f27e68':
camera2: Fix race conditions and deadlocks around configuration
e014f23e92832664270e66cdc9cabc0f3f25479e 27-Sep-2014 Igor Murashkin <iam@google.com> am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev

* commit 'ba164dfbcab8d1358075e18199b3ef55f85c8b88':
camera2: Fix race conditions and deadlocks around configuration
b3ba1d4e717d6292df4273108f0da61dac4f7b10 27-Sep-2014 Svetoslav <svetoslavganov@google.com> Accessibility node provider getting invalid virtual view id.

If the virtual child id is not specified we should ask the node
provider to create a node info for the hosting view bu passing
the special host node id.

bug:17664111

Change-Id: I9c2d3195ad813eed7ea4108fe0d7ccb9cc32a1a0
ndroid/view/ViewRootImpl.java
381d22f706f347c681885c0114917d8fe2373be8 27-Sep-2014 Igor Murashkin <iam@google.com> Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev
f839b4fcb6b179529585765517895a8c90fe315b 26-Sep-2014 Elliott Hughes <enh@google.com> Set the system locale correctly even on an encrypted device.

Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
ndroid/os/storage/StorageManager.java
om/android/internal/widget/LockPatternUtils.java
a552e9846ae81af051f09c11d132142835b5122b 26-Sep-2014 Fabrice Di Meglio <fdimeglio@google.com> am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev

* commit 'a2a5c97fe32f60a7b62899d23feb5392f11406b4':
Fix bug #17521147 Settings activity looks terrible on Volantis
c410968871cc9437f289e3d566a33ad09101a842 26-Sep-2014 Fabrice Di Meglio <fdimeglio@google.com> am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev

* commit '8420a924e038948e5df6ab41b4fbc73ae16c67b4':
Fix bug #17521147 Settings activity looks terrible on Volantis
6b0a880e13b217b670f27bfe8ef3a13b3bb51af0 26-Sep-2014 Fabrice Di Meglio <fdimeglio@google.com> Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev
b22be6fcf2689a7de3795f406678caf73180a990 25-Sep-2014 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #17521147 Settings activity looks terrible on Volantis

- update layouts for PreferenceActivity and its headers
in two panes mode (per UX request)
- add theming where it was missing

Change-Id: I0c478c1a66b6de7e122b7ee73da24f3dd5a7bc28
ndroid/app/FragmentBreadCrumbs.java
ndroid/preference/PreferenceActivity.java
5e2285527d81db8addcc94d3fc6b8327e3aae6a5 26-Sep-2014 Dianne Hackborn <hackbod@google.com> am 298b3d23: am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev

* commit '298b3d23d22e9a503eee856fe318b44536737e3b':
Fix issue #17671802: "content" command always prints...
f051b703dbec29609222f37a540be7cea3b3980a 26-Sep-2014 Dianne Hackborn <hackbod@google.com> am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev

* commit '45245d6117ae484bb84d9afa3fbda36d59886059':
Fix issue #17671802: "content" command always prints...
192554b59bd53087b4079de3e371103ec574dba6 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev
e20f9aa3168660c20360b819f21b4d138ac64f85 26-Sep-2014 Martijn Coenen <maco@google.com> am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev

* commit 'eaaa5adb4e553ca2482eb57084d077e8847ffc3e':
Add hidden API to disable NFC (optional persist).
b56ec7fc266a266ec38e50d082be414c7ed40acd 26-Sep-2014 Jorim Jaggi <jjaggi@google.com> am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev

* commit '5299d7e5e88b0c2b91e9f8bac35b21487ac83d0f':
Don't preload task description icons when opening recents
a4e3a616cdd32029cde09b146ba98dfb37530651 26-Sep-2014 Raph Levien <raph@google.com> am 02366924: am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev

* commit '02366924dfd8c0ae2c61f87a92c0b6a24a852f29':
Defer spelling correction with apostrophe
a751e2aa379e6b3f77d993c7fb5eecd85b1541e4 26-Sep-2014 Martijn Coenen <maco@google.com> am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev

* commit 'd846490a560122f9dd67d863da9ebddf81e15ba2':
Add hidden API to disable NFC (optional persist).
875db8db406f27efc117a0d409dda7db690e6057 26-Sep-2014 Jorim Jaggi <jjaggi@google.com> am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev

* commit '9b20e0125f1ef129a719834874262574a2a0db9a':
Don't preload task description icons when opening recents
e430e9bba6474c052e562af1b56767d93dab2909 26-Sep-2014 Raph Levien <raph@google.com> am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev

* commit 'a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
Defer spelling correction with apostrophe
2f1993ec460166413e7887f151630f6708077c0f 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17671802: "content" command always prints...

..."uid 2000 does not have android.permission.UPDATE_DEVICE_STATS"

Make sure to clear calling identity before getting into the guts
of the activity manager. Also fix the places the activity manager
calls in to battery stats to not require a permission check, anyway.

Change-Id: Ifd90937875b9fe0c36aa3f5cf1ec173746914e6b
om/android/internal/app/IBatteryStats.aidl
0a094c61bc1150585af3e60be7de3a5b17fa5573 26-Sep-2014 Martijn Coenen <maco@google.com> Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev
e51b21a81ef786526d9fe79af7073808ddb0bbbf 26-Sep-2014 Jorim Jaggi <jjaggi@google.com> Merge "Don't preload task description icons when opening recents" into lmp-dev
c8ffeeca673cc667f781116b269eb0886ab3bb86 26-Sep-2014 Raph Levien <raph@google.com> Merge "Defer spelling correction with apostrophe" into lmp-dev
bdd4b201e45ffa82dcd3b09fb9724d243c86c8d8 26-Sep-2014 Jorim Jaggi <jjaggi@google.com> Don't preload task description icons when opening recents

Bug: 17624331
Change-Id: I55a1184efd5982122f87fab99a5402336b380d7c
ndroid/app/ActivityManager.java
65757382519f08a242935f5a0af4ba993bd5307a 26-Sep-2014 Philip Nowell <pnowell@google.com> am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev

* commit 'f8ecaacbfd77cdb0b2aa1fb0918243691415c86e':
Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
b1fef1114e31e35c90bc885fd9e8f9381895846f 25-Sep-2014 Raph Levien <raph@google.com> Defer spelling correction with apostrophe

When typing a contraction (such as "doesn't") we don't want a spell
right after the apostrophe, as this will create a false temporary red
underline, and the span split also breaks a kern pair causing text to
shift. This patch detects the case where the cursor is immediately after
such a word and suppresses correction in that case.

Bug: 17641350

Change-Id: I4d09576a31df551c96f820242fd2cbc675506dae
ndroid/widget/SpellChecker.java
32ab32c85e13322e6c23cef339e7220b2006daf8 26-Sep-2014 Philip Nowell <pnowell@google.com> am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev

* commit '571730b4d1a438fadfdb2c6951483f00f6276518':
Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
31a141af13a77ff095c1e1c61644ccd5e051dec2 26-Sep-2014 Philip Nowell <pnowell@google.com> Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
16f5ec12078f48471e746259fa4d456a315203eb 26-Sep-2014 Przemyslaw Szczepaniak <pszczepaniak@google.com> am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev

* commit '8924617dd13785fa6285d5f9eb6fd20423077a73':
Fix ambiguous TTS#playSilence method.
d95788bf85b7a21ed798f62557d7ca957ddca159 26-Sep-2014 Przemyslaw Szczepaniak <pszczepaniak@google.com> am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev

* commit 'f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
Fix ambiguous TTS#playSilence method.
759962ab6dd6937b25668e874ce56e0ef9389832 26-Sep-2014 Przemyslaw Szczepaniak <pszczepaniak@google.com> Merge "Fix ambiguous TTS#playSilence method." into lmp-dev
0329423afa75b274364c4a763349c94a811e2a94 26-Sep-2014 Svetoslav <svetoslavganov@google.com> am b14c7e04: am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev

* commit 'b14c7e041441376d7e248613d82b46569a8bae62':
Using wrong virtual view id When prefetching accessibility nodes.
7c1de6c06e3ba50cf42fa7cdf0c41ba1e824f80b 26-Sep-2014 Dianne Hackborn <hackbod@google.com> am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '24ecbc4fbe66b548a35617c03c7ac068b40b83de':
Work on issue #17656716: Unhandled exception in Window Manager
91e18e538a7f38fba20d51062a520c4d36f86da3 26-Sep-2014 Alan Viverette <alanv@google.com> am 5a99c276: am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev

* commit '5a99c276b329a7c828e65083da5d5df73e60915e':
Correctly advertise accessibility scrolling actions
75d7874edcd37daecdeb2dc5c4169afa1e564120 26-Sep-2014 Svetoslav <svetoslavganov@google.com> am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev

* commit '9ec435dca7296db68b19e03300ff814e34f84c16':
Using wrong virtual view id When prefetching accessibility nodes.
a8181a9a0b420429a188218689a299fdf1335bb8 26-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
c569d3594574598d54f69b36239d88f7e0d15b7d 26-Sep-2014 Svetoslav <svetoslavganov@google.com> Using wrong virtual view id When prefetching accessibility nodes.

When getting an accessibility node info we also prefetch its predecessors,
siblings and descendants up to fifty. If a view has a node provider, i.e.
virtual descendants, and the id of the virtual descendant is not specified
we use a speacial constant to refer that the provider should create a node
for its hosting view. The bug was that we were not using the correct constant
when calling into the provider.

bug:17664111

Change-Id: I4f6b2333e1e7e3e2bb6b164c0752613417c60d16
ndroid/view/AccessibilityInteractionController.java
0f129c7959e62c1e507cd91fbf8618e437a5a4a2 26-Sep-2014 Dianne Hackborn <hackbod@google.com> am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev

* commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d':
Work on issue #17656716: Unhandled exception in Window Manager
52128ecd61213d1582bbb117953a1bc2382cb936 26-Sep-2014 Alan Viverette <alanv@google.com> am a9ac89a3: Merge "Correctly advertise accessibility scrolling actions" into lmp-dev

* commit 'a9ac89a3fa9291553edb72f4557dcff9e77863ae':
Correctly advertise accessibility scrolling actions
a7b1595c2590574d0e4ac0f0932c25206ca909ef 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev
80c0bbe82c9804af3499bae5f55a5931c92f1a7b 26-Sep-2014 Alan Viverette <alanv@google.com> Merge "Correctly advertise accessibility scrolling actions" into lmp-dev
56a3e67433fe1d6649c7665d58e913e784a0ea1c 24-Sep-2014 Martijn Coenen <maco@google.com> Add hidden API to disable NFC (optional persist).

Bug: 17298769
Change-Id: I1fa59592a34f1207731dc75d2e548b3e614d94f5
ndroid/nfc/NfcAdapter.java
d561913798c6ee3c987f39fa19f70e53eeb93ce6 26-Sep-2014 Philip Nowell <pnowell@google.com> Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.

Change-Id: I8b5ac84431d378f0e43be8d19920fd6ba335ebc6
ndroid/util/DisplayMetrics.java
017c6a28bee788d2ba5550548ea844d0236bc40e 26-Sep-2014 Dianne Hackborn <hackbod@google.com> Work on issue #17656716: Unhandled exception in Window Manager

Create descriptive errors when sending unreasonably large
parcels through IPC.

Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
ndroid/os/Binder.java
3f1ead4859388053451cb36844b7eb482bdd656e 26-Sep-2014 Adam Powell <adamp@google.com> am 11133a78: am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev

* commit '11133a783a0e7b0fc0d725f2d4cd858d2a51ab6e':
Always show the name of the last used Home app in ResolverActivity
4967a73816fc5a50746b87ad3e79cba23517f95a 26-Sep-2014 Adam Powell <adamp@google.com> am da7f9bab: Merge "Always show the name of the last used Home app in ResolverActivity" into lmp-dev

* commit 'da7f9bab0206c237f3d70b3b23eeaab41f478eb1':
Always show the name of the last used Home app in ResolverActivity
51dcfd65a6742884e07182dd7d13b916fd4e0305 26-Sep-2014 Igor Murashkin <iam@google.com> camera2: Fix race conditions and deadlocks around configuration

Fixes an illegal state exception that sometimes occurs during
configuration. Fixes a deadlock during unconfiguration. Fixes
the idle handler never being run during configuration.

Bug: 17628736
Change-Id: Id2c5e416f96fcbac9c718fca3cc2cf21734bc6a4
ndroid/hardware/camera2/impl/CameraCaptureSessionImpl.java
ndroid/hardware/camera2/impl/CameraDeviceImpl.java
ndroid/hardware/camera2/legacy/CameraDeviceState.java
ndroid/hardware/camera2/legacy/GLThreadManager.java
ndroid/hardware/camera2/legacy/LegacyCameraDevice.java
ndroid/hardware/camera2/legacy/RequestHandlerThread.java
ndroid/hardware/camera2/legacy/RequestThreadManager.java
a35c77aea61cd0701a921d245ce15bfbd923f117 26-Sep-2014 Adam Powell <adamp@google.com> Always show the name of the last used Home app in ResolverActivity

Bug 17629220

Change-Id: Ia1d0a188f8c0911e5b74b18ba44508a6e2139d0c
om/android/internal/app/ResolverActivity.java
f2be7170bf3a635dbc8de722c3db0f43964bbc33 26-Sep-2014 Adrian Roos <roosa@google.com> am a2e1e2ca: am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev

* commit 'a2e1e2ca20dba8d163223364b82861b84d180600':
Ensure that setting an empty password clears it
c043b87d48a1b0d991384893009c714d95ea2b81 26-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am eeb44d4a: am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev

* commit 'eeb44d4a77d5dd5050a25cc622bd5e6869e69e14':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
dc1fc7fc77e5e5c8c2eacbfb578e08483a5f4da2 26-Sep-2014 Adrian Roos <roosa@google.com> am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp-dev

* commit '05ade73e580b826ead839d3c5db508a8ea25ad93':
Ensure that setting an empty password clears it
3517b1db4a748ecc9e4e829aca0cd0b6732969c6 26-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev

* commit '7b6a4acdeb6bddbb6b058c227e037c714dd8f2b8':
Camera2 Legacy: Clear JPEG ids when reconfiguring.
625e8f595978693a079c4c20ac8d70e8710947e9 26-Sep-2014 Adrian Roos <roosa@google.com> Merge "Ensure that setting an empty password clears it" into lmp-dev
b17ff6777dda6b59f08a41676b40b28ca5d5c704 26-Sep-2014 Michael Wright <michaelwr@google.com> am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev

* commit '57bb094b818d0e215cd987738078e5c181c26fac':
Specify a device identifier for keyboard layout notification.
c2c520950a7f4b72ad66a19d391fedddc96b88c1 26-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev
e27380ac46fe7beab8bf0f6409efab0482e2cee0 26-Sep-2014 Michael Wright <michaelwr@google.com> am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev

* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
Specify a device identifier for keyboard layout notification.
42dad8041823833106311ff43cc17a8b3c583d32 26-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Specify a device identifier for keyboard layout notification." into lmp-dev
efdd0cc832098be4eb6f1861616fd9383d2b94ff 25-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes

* commit '9ceeb831c412d80b0961bcf38d81c789aba1718b':
Camera2 legacy: Improve robustness to camera service crashes
845ea54c510827fbe95ad61fafdb16df93272065 25-Sep-2014 Eino-Ville Talvala <etalvala@google.com> am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes

* commit '93f0b612350e217b8434a0199ba4723c2cfe0e72':
Camera2 legacy: Improve robustness to camera service crashes
52571b9032fedb90ca1fabbda90d0313d44adfb9 25-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera2 Legacy: Clear JPEG ids when reconfiguring.

Otherwise, stale IDs for old streams will be left around, causing
JPEGs to be sent to the wrong consumers.

Bug: 17659125
Change-Id: I98e1a1d389147631bc80eaeb10d57f74a6256f32
ndroid/hardware/camera2/legacy/RequestThreadManager.java
eecc904f13e7a105f5548c953e4caa306fe06f0d 24-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Camera2 legacy: Improve robustness to camera service crashes

When the camera service dies, the getParameters call is often the first
to fail, and on legacy mode, this frequently happens in a background thread.
Catch the runtime exceptions and convert to device errors, instead of killing
the process.

Bug: 17587496

Change-Id: I6757961e7c0387defd368a13cb7c343950602400
ndroid/hardware/camera2/legacy/CameraDeviceUserShim.java
ndroid/hardware/camera2/legacy/RequestThreadManager.java
947a96956035e1ee22a82d18aec018b9046b641b 25-Sep-2014 Alan Viverette <alanv@google.com> Correctly advertise accessibility scrolling actions

Previously, we didn't take into account partially-visible views. This
extracts existing logic for determining whether the list can scroll
up or down and applies that when adding scrolling actions.

BUG: 17648502
Change-Id: I7ed9382e1645970ab098c210ad10f8a077da834b
ndroid/widget/AbsListView.java
b4e87c11280ce6b2b87da0df97310b074b8d9ba6 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev

* commit '4754428da2cc3e1224fc6f227ac831fee90c8b96':
camera2: Fix null check in PictureCallback.
4b6b2104ace03676688258a13aafc89d62991af2 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev

* commit 'e76ce25ff342d393ffb79ef7e01b09cae5320a73':
camera2: Fix null check in PictureCallback.
820a08a55581d2f9c8d39c4e197250fb8ded5ab5 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Fix null check in PictureCallback." into lmp-dev
994ba63f89cf5ec472b4b13ecbe306cce4241a27 25-Sep-2014 Paul Lawrence <paullawrence@google.com> am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev

* commit '7c4b941336300efc04e8842dc21a24f1c17bf345':
Fix pause when setting pin/pattern/password
2c3d7c5f68993531a4f5f91c1335cac8ca448e17 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix null check in PictureCallback.

Bug: 17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
ndroid/hardware/camera2/legacy/RequestThreadManager.java
809c1be06be65f45d06107cd701b2a06145cfb8f 25-Sep-2014 Paul Lawrence <paullawrence@google.com> am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev

* commit '56a38862d68c3160ae9b049ca89422cc5834e8e3':
Fix pause when setting pin/pattern/password
fa3f1232ddd0b207082f7993279484f8b78ce68d 25-Sep-2014 Chris Wren <cwren@android.com> am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev

* commit '3c7f1aacb544db6984a19c933bf9a5975b6c0bf4':
getCurrentInterruptionFilter should return the filter value, not the hints.
3a5a0be61ec7ea08884c80817c226f7cfe531a67 25-Sep-2014 Paul Lawrence <paullawrence@google.com> Fix pause when setting pin/pattern/password

Move setting encryption pin/pattern/password into a separate thread

Bug: 17554587
Change-Id: Ifdf2ed5aa9ca08d68bb2ed08c8985203c24dcb9f
om/android/internal/widget/LockPatternUtils.java
0a94bebf2e2e23e189c4228a0b9be28d38c32382 25-Sep-2014 Chris Wren <cwren@android.com> am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev

* commit '15653a918f6c1747d08f03e8241368bbbcc38fe6':
getCurrentInterruptionFilter should return the filter value, not the hints.
b6981859298eaa30981a60bc0cb0c2ae69082aac 25-Sep-2014 Chris Wren <cwren@android.com> Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
ca915dd6aa77af1acda988ba096fe0bcae8205d2 25-Sep-2014 John Reck <jreck@google.com> am 2994cc57: am e5831979: Missing null check

* commit '2994cc57444cc0ae83081f2324a5ce94ab58965a':
Missing null check
b3e68eb21c3740ce8de7938cb4deceb6fdb74fb1 25-Sep-2014 Andre Eisenbach <eisenbach@google.com> am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev

* commit '630f9671beae6a09e8a1fa315b632d292a83c4f0':
Remove remanents of onConnectionCongested in framwork
c1411a42531f17108ccbd381c08f7b5d0eae04bf 25-Sep-2014 Jeff Sharkey <jsharkey@android.com> am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev

* commit 'b8bbeff0796847bbe98deb2d84989b656356873c':
Include reason when wiping data.
ab7dae58cc831471b9a677575ac3dccd17779925 25-Sep-2014 Adrian Roos <roosa@google.com> Ensure that setting an empty password clears it

Bug: 17496766
Change-Id: I7c29b632519247bc5675a05ef6cc90902fec8527
om/android/internal/widget/LockPatternUtils.java
07b3c7428a9871ee240d7267a413c9a6e51bb198 25-Sep-2014 John Reck <jreck@google.com> am e5831979: Missing null check

* commit 'e58319791de1e47db1d6d3c6565f03a5f775a9cb':
Missing null check
9bb34605ceec6bb8ccb2771fe11101677a639a3f 25-Sep-2014 Andre Eisenbach <eisenbach@google.com> am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev

* commit 'fe99f9f42ad1a45922c906bacd5ea56d58667245':
Remove remanents of onConnectionCongested in framwork
264975697540da332b9214bb5e45dc82ce96be9d 25-Sep-2014 Jeff Sharkey <jsharkey@android.com> am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev

* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
Include reason when wiping data.
ccf2fa00314b91c7d25e0edf48e0e2b51dbc4e63 25-Sep-2014 John Reck <jreck@google.com> Missing null check

Bug: 17642023
Change-Id: I874b76e1e184a59dec714191d759c1045b7b9814
ndroid/view/WindowManagerGlobal.java
6ddd9c29b376fda27c4df3b18d6a67de14a633ca 25-Sep-2014 Przemyslaw Szczepaniak <pszczepaniak@google.com> Fix ambiguous TTS#playSilence method.

Due to recent fixes for TTS API review (b/17389935)
overloaded playSilence method became ambiguous when
the last argument is null. This change renames the new
method to playSilentUtterance solving the issue.

Also, since LMP API level is 21, I updated invalid
references to it as API level 20 inside speech.tts.

Bug: 17389935
Change-Id: I9f9fae988240d1cec45d44650e53ffc29803ccac
ndroid/speech/tts/SynthesisRequest.java
ndroid/speech/tts/TextToSpeech.java
ndroid/speech/tts/TextToSpeechService.java
fb444ce6f82b47e3370c3854627dc481ac56430e 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev

* commit '6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
camera2: Hide JPEGs in RGBA gralloc buffers.
1ac7646e8b27179f8165ba7e566bffdd47f23fa6 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev

* commit '8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
camera2: Hide JPEGs in RGBA gralloc buffers.
77e7054176111b17cb371f2ffb3a188d67546078 25-Sep-2014 Andre Eisenbach <eisenbach@google.com> Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
0a285b4462719b938dfd5bf54808a9a4a2e3e5b5 25-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "Include reason when wiping data." into lmp-dev
81ba98619b3b7d5856fe3787167333b05fe16f83 25-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
fc4cba361949d1fe059ae316642276f4fad23263 25-Sep-2014 Igor Murashkin <iam@google.com> am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev

* commit 'ee0b9782a7ac2844f2942ba44bad4c36f235169c':
camera2: Increase preview frame timeout
957ed70273b2cf2bc65cd96ac0e91a35e58a0b6d 25-Sep-2014 Chris Wren <cwren@android.com> getCurrentInterruptionFilter should return the filter value, not the hints.

Bug: 17641218
Change-Id: I4a6ff073c04a3d3624916293824faba40f6226aa
ndroid/service/notification/NotificationListenerService.java
f0b56a5a7f9cff4b4ed120188be65a7bc08e2256 19-Sep-2014 Prerepa Viswanadham <dham@google.com> Remove remanents of onConnectionCongested in framwork

Bug:17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
ndroid/bluetooth/BluetoothGatt.java
ndroid/bluetooth/BluetoothGattCallbackWrapper.java
ndroid/bluetooth/BluetoothGattServer.java
ndroid/bluetooth/IBluetoothGattCallback.aidl
ndroid/bluetooth/IBluetoothGattServerCallback.aidl
c4b79198825529a4a40a12157c1f9310f8dc6f62 24-Sep-2014 Igor Murashkin <iam@google.com> am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev

* commit '7ddc2313a35637f087b68fea385df9d56b7f3f6d':
camera2: Increase preview frame timeout
1dbf7248eaafd8a44b972b2b6d77c5a6c34fd112 24-Sep-2014 Igor Murashkin <iam@google.com> Merge "camera2: Increase preview frame timeout" into lmp-dev
004a4b20f8d3116e6a711525960d433fcfea4ee4 24-Sep-2014 Jeff Sharkey <jsharkey@android.com> Include reason when wiping data.

This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
ndroid/content/Intent.java
ndroid/os/RecoverySystem.java
om/android/internal/os/storage/ExternalStorageFormatter.java
3e2c14f3d64b66e155e623c6cda22848eb3f5314 24-Sep-2014 Igor Murashkin <iam@google.com> camera2: Increase preview frame timeout

Some devices, especially those with HAL2/HAL3 frames will have a large
delay between the first preview frame and and the camera open. This is
because the streams are configured lazily so it adds extra latency.

Increase the timeout to make it significantly less likely to get frame drops.

Bug: 17628866
Change-Id: I48dcda8507fb7eb31c3f426f833418126171c204
ndroid/hardware/camera2/legacy/RequestThreadManager.java
c9a5227292ecc24f9735d4ba53cd1f9aaef3e6f4 24-Sep-2014 George Mount <mount@google.com> Fix NPE when detached View is added as a shared element.

Bug 17632940

This won't solve all problems in which the parent becomes null,
but it will protect against shared elements being added that aren't
attached when mapped.

Change-Id: I991722c671c57048aea84b59a3c187c77c93450f
ndroid/app/ActivityTransitionCoordinator.java
0fd198ad89ec9c600bb1761b10d938146c28bb98 24-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Hide JPEGs in RGBA gralloc buffers.

Bug: 17379185

- WAR for SW Write usage flags being unavailable on
certain devices for JPEG (blob) format buffers.

Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
ndroid/hardware/camera2/legacy/BurstHolder.java
ndroid/hardware/camera2/legacy/LegacyCameraDevice.java
ndroid/hardware/camera2/legacy/RequestHolder.java
ndroid/hardware/camera2/legacy/RequestQueue.java
ndroid/hardware/camera2/legacy/RequestThreadManager.java
ndroid/hardware/camera2/legacy/SurfaceTextureRenderer.java
a9f6486c929029eb7a0b5f1ce42d051592dda17b 24-Sep-2014 Svetoslav <svetoslavganov@google.com> am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev

* commit '176b19559e3775e59ce852fa54343bea5663ee17':
Ignore not visible views computing click point for accessibility.
856fcb6284dc5fde7f04347e899889747f5181c1 24-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Ignore not visible views computing click point for accessibility." into lmp-dev
d2a77c2453380d69283c5f14931a88a793f2f2f5 24-Sep-2014 Zoltan Szatmary-Ban <szatmz@google.com> am 7602bc54: Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev

* commit '7602bc548c3c85e8958e899593cc1757d849d532':
Register ActivityManagerService.PackageMonitor for all users.
bdc07b6986d6ba5cab2ab98a36814ed9f8e3b520 24-Sep-2014 Zoltan Szatmary-Ban <szatmz@google.com> Merge "Register ActivityManagerService.PackageMonitor for all users." into lmp-dev
e7482460af6c0a2ea02d6cc42df129b583132571 24-Sep-2014 Svetoslav <svetoslavganov@google.com> Ignore not visible views computing click point for accessibility.

In accessibility mode we compute a location to where to send down and up
events to click a view (triggered by a double tap). This solves the problem
of interacting with views that are partially covered by other interactive
views. The logic that computes the click point was not ignoring siblings
that are not visible. As a result a blind user cannot interact with some
views.

bug:17632224

Change-Id: I93e637ee6702e4ba3e79faa736205430e2196d01
ndroid/view/ViewGroup.java
34feaa0947dcfa0ff042d1ab8f4c5c577261a1b1 24-Sep-2014 Lorenzo Colitti <lorenzo@google.com> am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev

* commit '6974f6a97028a42ce79b8e9e1869af0ebf5624f4':
Block address families with routes, not NetworkAgent side channel
e034716628de94399717a744f14bdfd534d8f87a 24-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
5c1ac3d443cfbc27289405845a89d7f94ec396f6 24-Sep-2014 Jeff Sharkey <jsharkey@android.com> am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev

* commit 'e50b0a6c86c70f5ddcb69984cb99337ce1d96032':
More ACTION_CHOOSER ClipData migration.
fb488eb2a269772064432e69ebdd9c5cedd18006 24-Sep-2014 Jeff Sharkey <jsharkey@android.com> Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
c004eef7bb4d4752c9a980af95a1e49a4098ade6 24-Sep-2014 Jeff Sharkey <jsharkey@android.com> More ACTION_CHOOSER ClipData migration.

Traverse into both EXTRA_INTENT and any EXTRA_INITIAL_INTENTS when
migrating extras to ClipData. Also, we don't need to promote these
ClipData into the parent, since the platform ChooserActivity will
issue any required permission grants for the final user-selected
Intent. Even if we wanted to, we can't combine the various child
Intent flags into anything meaningful at the ACTION_CHOOSER level.

Bug: 17580604
Change-Id: I6b5a1f572a7edf8135e059c67a2643d3736e40ab
ndroid/content/Intent.java
a040e44417ac13df87a09f245e5d7debc89e1ff3 24-Sep-2014 Igor Murashkin <iam@google.com> am c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev

* commit 'c79b145f0216d2f9b099a409fee2c154de1f7019':
camera2-legacy: Workaround max jpeg/preview size AR mismatch
4f17981fdc04a3246a34031df2488028ffa78e4c 24-Sep-2014 Igor Murashkin <iam@google.com> Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
a0496d34ffc5153bf933cacbd4be71a4a1bd4041 24-Sep-2014 Igor Murashkin <iam@google.com> camera2-legacy: Workaround max jpeg/preview size AR mismatch

Filter out the largest preview sizes (from the stream configuration map)
until we find one whose aspect ratio matches the max jpeg aspect ratio.
Keep all other (smaller) preview sizes.

Bug: 17589233
Change-Id: I8ebcaef6439691eff3312da2c37b9abe08a067ad
ndroid/hardware/camera2/legacy/LegacyMetadataMapper.java
ndroid/hardware/camera2/legacy/SizeAreaComparator.java
c93fbd1fae3d461f2f8a7c039b15f953ed6a8b50 23-Sep-2014 Michael Wright <michaelwr@google.com> Specify a device identifier for keyboard layout notification.

Bug: 17614683
Change-Id: If53489b09212bfa487d7dc3a7f9b000731d949ac
ndroid/provider/Settings.java
14f10be0bf913bbbb6589872a4f7036abd31b799 23-Sep-2014 Dianne Hackborn <hackbod@google.com> am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev

* commit '5a9cfe3ea7fdcec78094530032217fca477561b1':
Maybe fix issue #17614177 APR: system process restarting due to infinite loop
6c0b8b794a6d49c36daa6442a24e2aee3b43ddd4 23-Sep-2014 Adam Powell <adamp@google.com> am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev

* commit 'c8d72a97c53da122d41b8238f23609f99aca2e02':
Track persistent nested Y offset for fling velocity
d0e0154c1f0be7786f12aea60add7ed4fb7c4e6c 23-Sep-2014 Dianne Hackborn <hackbod@google.com> Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev
01db31f89953fd7f834a427a7c2d2c7b945313a2 23-Sep-2014 Adam Powell <adamp@google.com> Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
6a90fa0c20666ab815403a2470f0cf8d5f760426 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev

* commit '30306d89bd83fe884b11816f5cfc33d5ab3048cb':
camera2: Update EACCES to throw correct exception in LEGACY.
b0ddd2e0d6f5431dd03e31dcc9d3064d6c905a3b 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
25e1ecaabbde4741663c8e5a777d9df9b939572c 23-Sep-2014 Dianne Hackborn <hackbod@google.com> Maybe fix issue #17614177 APR: system process restarting due to infinite loop

Also try to get rid of a huge wtf we are seeing across a lot of devices
where we incorrectly change real states on a service that is restarting,
and get rid of one of the noisier boot logs in the package manager.

Change-Id: I2510b6fb082eac3f6168cbd57bc3b70ad006114d
om/android/internal/app/ProcessStats.java
3084c2f5191e560c10a0011f2f77e6d0e3396f92 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Update EACCES to throw correct exception in LEGACY.

Bug: 17595068
Change-Id: I1a88568822237d3609c3342a21e2ca81ca935408
ndroid/hardware/camera2/legacy/CameraDeviceUserShim.java
651def483c2a1652c0fa0348c2a7fa45771a1ace 23-Sep-2014 Jeff Brown <jeffbrown@google.com> am 3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev

* commit '3f51958b1911ffa49ca3d7eb2a9304348ccbf04e':
Fix window manager policy state when waking from doze.
55fa0207134d7a2470f060445938b2d63e180f4e 23-Sep-2014 Jeff Brown <jeffbrown@google.com> Merge "Fix window manager policy state when waking from doze." into lmp-dev
3ee549ca2404067bb8b2fcbaa741ec118c76bf3e 23-Sep-2014 Jeff Brown <jeffbrown@google.com> Fix window manager policy state when waking from doze.

Once upon a time when the world was fresh and new, the heavens
had an easy rhythm. Day and night. Night and day. In the day,
the pixel fairies would cavort and play in the bright gardens
with narry a mark of shadow or gloom. In the night, they would
rest peacefully, dreaming no dreams and knowing no fear.

Then one night a fairy dreamed the first dream. At first
the dream was peaceful, full of colors and delight, hopes and
memories. Then all at once, jarringly, it awoke in bright
daylight. The pixel fairy knew fear, for the world had changed
and it was unprepared.

Time passed and the pixel fairies grew accustomed to their
fate, day and night, night and day, sometimes dreaming, until
there came a night when a fairy did not sleep. It roamed
the land in a dreamless doze, lost and afraid amid a grim haze
of grey and darkness. The fairy despaired. It wanted no
part of this place. It pretended for a time to be awake but
the bright daylight would not come. It pretended for a time to
be dreaming but the colors and memories would not come.
That is when the fairy wished for oblivion. Then just as
suddenly, it awoke in the daylight. It fell to the ground,
stunned as if it had forgotten how to walk in the too bright
daylight.

Though the world again grew softer and kinder in time, the pixel
fairies were never the same. For the night is dark and full
of terrors.

---

It used to be easy. Screen on and screen off could explain almost
everything about the state of the device but it's different now with
ambient display. We need to be able to wait for all windows to be
drawn even in the case where the device is still nominally asleep.
In truth, the window manager policy which drives a lot of these
interactions is a thicket of outdated assumptions.

Added a new method to tell the window manager policy when the screen
is being turned off so that it can correctly account for changes
to the interactive state (wakeUp and goingToSleep) and screen state
(screenTurningOn and screenTurnedOff). Now we can independently
poke keyguard during interactive state changes and we can apply
screen on blocking during screen state changes.

Moved the code which manages screen on blocking (which is what
ensures the UI has fully drawn before revealing screen contents)
from the power manager to the display manager since the display
manager is in a better position to accurately track the state of
the screen, particularly when the screen is being turned off.

Fixed a bunch of synchronization issues. Previously some work
had been moved to a handler without considering what might
happen if it became reordered relative to other work happening
elsewhere. Documented the desired behavior in the code to
prevent this from happening again.

There's still a bunch of stuff in here that isn't quite right,
particularly the assumption that there's only one screen, but
it's good enough for now. Hopefully there aren't too many bugs.

Bug: 17605802
Change-Id: Ic7319e09948c8a3cda014d7e169c964a3ad86f14
ndroid/view/WindowManagerPolicy.java
0bec95d0525971d5b78ff082150e05291275a939 23-Sep-2014 Zoltan Szatmary-Ban <szatmz@google.com> Register ActivityManagerService.PackageMonitor for all users.

With the introduction of managed profiles, ActivityManagerService.PackageMonitor
can receive Intents from users other than current one.

Bug: 17580914, 17314317
Change-Id: I7c601618f7819d6775cf422dca70a929ee1089d9
ndroid/app/ActivityManager.java
004b7a3f19e43bd87935ecb3824e7801f983c32d 23-Sep-2014 George Mount <mount@google.com> am cced7645: Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev

* commit 'cced7645aae3e2fd65297ac75cecfde31dc1c636':
Force transitioning views to be visible when transition interrupted.
cbd333b256a9f301de549dbe9aa7614103835d97 23-Sep-2014 George Mount <mount@google.com> Merge "Force transitioning views to be visible when transition interrupted." into lmp-dev
633b7bb8ed36ef58339d8f0d8c2afd5d5f8a6ac5 23-Sep-2014 Lorenzo Colitti <lorenzo@google.com> am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev

* commit 'bb17a717750c558ece69344ecd93d96d4fbc4aca':
Add a throw route to the VPN endpoint.
Support non-unicast route types: unreachable and throw.
60446165d8bd44f72cec8d0c5583a688369fa660 19-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Block address families with routes, not NetworkAgent side channel

Now that we support unreachable routes, use those to block
address families on VPNs. This is a much more elegant solution.
Also update LinkProperties when IP addresses are added and
removed, fixing a TODO.

Bug: 17462989
Change-Id: Ib749d84710dca70d672350b9f129bb91419ec77e
ndroid/net/NetworkAgent.java
ndroid/os/INetworkManagementService.aidl
1e2b63d91d2e475eb68a492b98232d585284e406 23-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Merge changes I3ebf0cec,I8635472c into lmp-dev

* changes:
Add a throw route to the VPN endpoint.
Support non-unicast route types: unreachable and throw.
744beffb6ae76d682c559970bb634722c835a32e 22-Sep-2014 Adam Powell <adamp@google.com> Track persistent nested Y offset for fling velocity

Track the nested offsets applied persistently in AbsListView and
ScrollView. This allows accurate velocity to be reported to nested
fling/pre-fling.

Bug 17548219

Change-Id: I66199c534aca7fb81746eff6d04c931e4c4e48da
ndroid/widget/AbsListView.java
ndroid/widget/ScrollView.java
e48fcfb38f381549b913170c1d633229b3709aeb 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev

* commit '12f73fcf874eccaea8e56a4ac547dc86ae9259a6':
camera2: Docs update for available AF modes.
f1abef6fc2194e72af521202ee4b17c10e03c935 22-Sep-2014 George Mount <mount@google.com> Force transitioning views to be visible when transition interrupted.

Bug 17553034

When an Activity Transition was interrupted prior to starting the
enter transition, the views were not being made visible.

Override the return ActivityOptions if interrupted so that the
entering activity doesn't launch with a transition when coming
back from recents.

Change-Id: Id4e00c7bb138babfee4de71247a9df4431376e21
ndroid/app/ActivityTransitionState.java
ndroid/app/EnterTransitionCoordinator.java
ndroid/app/ExitTransitionCoordinator.java
fcb086c8e76bf2fb3c885a633174dee58f512850 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Docs update for available AF modes." into lmp-dev
75192fb7900ba00f7adbe25212e0800d6d61481e 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev

* commit '4b3c7f852a22c27bc31c3710c631ef5fae10788f':
camera2: Add missing whitebalance mapping.
60004caeba750c49aa258056e57ada898a086fc0 23-Sep-2014 Alan Viverette <alanv@google.com> am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev

* commit '9e84a6a08b4ff50b745a6eaf35e52b9c7aef4c39':
Fix inaccurate TypedArray.getDrawable() documentation
9343c3cb7f624b7b230f460d17343c4d9e65e19e 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Add missing whitebalance mapping." into lmp-dev
53b5cc87735cea92b3b3c5cb7215846bfb5ddf1d 23-Sep-2014 Alan Viverette <alanv@google.com> Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev
524d16f7ebeee7c5351ed62dd7caea97a9a1cdfb 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev

* commit '979c03a21bc346ddbfbfcf5d1d4239e5cdf30302':
camera2: Avoid spurious IDLE transitions.
fde4e3b17a5ead9f1a0848bf35b4f49f16600795 23-Sep-2014 Alan Viverette <alanv@google.com> Fix inaccurate TypedArray.getDrawable() documentation

The documentation implied that you could override
Resources.getDrawable(int) to load custom drawables, which is
not the case.

BUG: 16635905
Change-Id: I06c0febe2d6d4194ef5a31f167b378fe311b7a2d
ndroid/content/res/TypedArray.java
c90b5ebbbff46e11a7c634665e9dc48ef39e2cb2 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev
6f387098c2c9006a1fecfe18c7052b2cc40a1941 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Docs update for available AF modes.

Bug: 17588783
Change-Id: If4010517e79b3a51bd6231424a10be672ff5a252
ndroid/hardware/camera2/CameraCharacteristics.java
6ed5ffebce0eea3b366ee7915d732f3c39ff8a70 23-Sep-2014 John Reck <jreck@google.com> am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev

* commit '668e566ec250a9548d6201c6190f80306e91dcce':
Aggressively trim memory for system_process
c1dab7a201c48c98362e24488f1ab70c632e889d 23-Sep-2014 John Reck <jreck@google.com> Merge "Aggressively trim memory for system_process" into lmp-dev
73840ea3670f1c117843acc6069635c80ba2ffd2 22-Sep-2014 John Reck <jreck@google.com> Aggressively trim memory for system_process

Bug: 16978006

Don't HWUI-accelerate KeyguardScrim
Aggressively trim memory as soon as a ViewRootImpl
dies or has its visibility changed.

Change-Id: Ie1b7c9d30653456bd2e9f309128174f972999368
ndroid/app/ActivityThread.java
ndroid/view/HardwareRenderer.java
ndroid/view/ViewRootImpl.java
ndroid/view/WindowManagerGlobal.java
72a23d7b50afe2c2eba999da718864dce79f44bd 23-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Add missing whitebalance mapping.

Bug: 17588192
Change-Id: I5d161dd22f2057a33a461157d678d4217a5f88f8
ndroid/hardware/camera2/legacy/LegacyRequestMapper.java
4e2dea77dcaa0b7b940d881bbc25e13e35e2ea49 20-Sep-2014 Wink Saville <wink@google.com> Cleanup NetworkCapabilities.

Remove unused imports and variables.
Fix misspellings.
Added @Overrides.

Change-Id: I81f4adb0504e92d01c5465a0e14bc46d5ec3987e
ndroid/net/NetworkCapabilities.java
37486e54d7448bcf218f14102bc11662268c2f7d 22-Sep-2014 John Spurlock <jspurlock@google.com> am c018af27: Merge "Zen: Add events as a new config attribute." into lmp-dev

* commit 'c018af27d9da4ee3d7dc79103ff35eb54f80a8de':
Zen: Add events as a new config attribute.
e35c9bf9ba0cb4438dfd001055fc6cd5c2d0a575 22-Sep-2014 John Spurlock <jspurlock@google.com> Merge "Zen: Add events as a new config attribute." into lmp-dev
2dac62c2e985ce1848b0fff751d4ed2cc3885c0c 19-Sep-2014 John Spurlock <jspurlock@google.com> Zen: Add events as a new config attribute.

Decouple events from alarms in the zen interception function,
and default the new allowEvents to true.

Bug:17580878
Change-Id: Iff10df385206ad73c3423ff118c79e94a10918d9
ndroid/service/notification/ZenModeConfig.java
d14f290d40f4d754dfbdc3cbdbd623709902eb6a 22-Sep-2014 Alan Viverette <alanv@google.com> am 0dfa4738: Merge "Pass explicit null theme when preloading drawables" into lmp-dev

* commit '0dfa4738018b93f576a3fceee2d351505983961f':
Pass explicit null theme when preloading drawables
e7868959184ebf711ad7e67a22b51480ec2a9582 22-Sep-2014 Alan Viverette <alanv@google.com> Merge "Pass explicit null theme when preloading drawables" into lmp-dev
5c3d18d1f7463fa90e266662f675d1b5c3bc4ffd 22-Sep-2014 Yohei Yukawa <yukawa@google.com> am b5d063dc: Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev

* commit 'b5d063dc8126d9cddf5dd5172f32213469b2c11b':
Work on issue #17506095: Plumb a new configuration to IMMS
ca5e72c5aeb85c99ed7a5ae3bf3a870462562352 22-Sep-2014 Yohei Yukawa <yukawa@google.com> Merge "Work on issue #17506095: Plumb a new configuration to IMMS" into lmp-dev
8977eae6dbf4991d5a876ae511c55ded4fc71952 22-Sep-2014 Przemyslaw Szczepaniak <pszczepaniak@google.com> am 299bb1fb: Fix issues with new TTS API

* commit '299bb1fbc62ab8d6e1389cb2959e093e217f8c79':
Fix issues with new TTS API
f9ba548f210b0ed071ff7d597ddf2209af817294 22-Sep-2014 Przemyslaw Szczepaniak <pszczepaniak@google.com> Fix issues with new TTS API

Bug: 17389935
Change-Id: I59234b3222f59dc89be7e40f7d4706b1f8c610ce
ndroid/speech/tts/TextToSpeech.java
ndroid/speech/tts/TextToSpeechService.java
ndroid/speech/tts/Voice.java
84e001a9f514a047816f27db6ce836966efa481e 22-Sep-2014 Alan Viverette <alanv@google.com> Pass explicit null theme when preloading drawables

Prevents "unresolved theme attributes" warning.

BUG: 17589490
Change-Id: I5217d85b1d5ce8b551315ee8b1ca79eccfac3f10
om/android/internal/os/ZygoteInit.java
4b0f8e6fb707e19799011c1f4a5e4f54603e34b1 18-Sep-2014 Lorenzo Colitti <lorenzo@google.com> Support non-unicast route types: unreachable and throw.

Bug: 17462989
Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb
ndroid/net/IpPrefix.java
ndroid/net/LinkProperties.java
ndroid/net/RouteInfo.java
8aa88195fef94b43aef534ba8e9c5a98d97f2ddd 22-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 3b57d98a: Merge changes Iccd4d53d,Id449bc7a into lmp-dev

* commit '3b57d98a1a84ce063cb3681cae10795216300035':
camera2: Avoid setting null metering regions in LEGACY.
camera2: Fix JPEG orientation set by LEGACY request.
27dd47f81ae13486ffa79f83df22a61be7019764 22-Sep-2014 Yigit Boyar <yboyar@google.com> am a0716928: Merge "Allow fallback to Toolbar\'s default Navigation Icon" into lmp-dev

* commit 'a07169280401c84ac914b98028d7e991cee5a85d':
Allow fallback to Toolbar's default Navigation Icon
4aed87a9ed31a1ea7fd1ac8fd9ae538d9ecbef7e 22-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Avoid spurious IDLE transitions.

Bug: 17594247

- Avoid spurious IDLE transitions when waiting for
prior requests to complete.
- Clean up error reporting for GL thread and CameraDeviceState.
- Add error handling for Camera1 ErrorCallback calls.

Change-Id: I72850251d8965139b6db2193e91483a3d3409b7c
ndroid/hardware/camera2/legacy/CameraDeviceState.java
ndroid/hardware/camera2/legacy/GLThreadManager.java
ndroid/hardware/camera2/legacy/LegacyCameraDevice.java
ndroid/hardware/camera2/legacy/RequestThreadManager.java
ee3ef2b8af94b118a91b2f7c454260d191153f7a 22-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge changes Iccd4d53d,Id449bc7a into lmp-dev

* changes:
camera2: Avoid setting null metering regions in LEGACY.
camera2: Fix JPEG orientation set by LEGACY request.
5507b223dd238402d7dded3a974f7bc6885b8478 22-Sep-2014 Yigit Boyar <yboyar@google.com> Merge "Allow fallback to Toolbar's default Navigation Icon" into lmp-dev
97b5301b093000e74f70f1db0453eec3610b4215 22-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Avoid setting null metering regions in LEGACY.

Bug: 17587491

- If a single region with zero weight is set, revert to default
metering region rather than attempting to set a null to
avoid setParameters failure.

Change-Id: Iccd4d53d5a2134a9d744eafb731f464b653a154d
ndroid/hardware/camera2/legacy/LegacyRequestMapper.java
09a6bed6c6e613edfda6cb45499c4277e4446513 21-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix JPEG orientation set by LEGACY request.

Bug: 17589231
Change-Id: Id449bc7a39a6550413e6c441b6dc204e11eacda9
ndroid/hardware/camera2/legacy/LegacyRequestMapper.java
5426bc2351bfb202027a984e7bb09ba11f9b4e26 21-Sep-2014 Ruben Brunk <rubenbrunk@google.com> am 6a80927a: Merge "camera2: refactor LEGACY mode error handling." into lmp-dev

* commit '6a80927aef62f74a4801180adf68fe8781181060':
camera2: refactor LEGACY mode error handling.
2610a1ba5d2657932d46b818472c2713bec7293e 21-Sep-2014 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: refactor LEGACY mode error handling." into lmp-dev
e663cb77281c4c76241b820f6126543f1c2d859f 16-Sep-2014 Ruben Brunk <rubenbrunk@google.com> camera2: refactor LEGACY mode error handling.

Bug: 17431462
Bug: 17407537

- Add Surface format/size validation during configure.
- Update exception error codes used in binder calls.
- Report dropped requests, frames, captures, and device
errors in binder callback properly.
- Fixes CameraDeviceTest errors for incorrect metering
rectangle weight in template tests.
- Fixes CameraDeviceTest errors for missing
noiseReductionMode field in template tests.
- Implement flush call.

Change-Id: I0da803bccf2bfb9b4c0cf61208e160a86c577497
ndroid/hardware/camera2/impl/CameraDeviceImpl.java
ndroid/hardware/camera2/legacy/CameraDeviceState.java
ndroid/hardware/camera2/legacy/CameraDeviceUserShim.java
ndroid/hardware/camera2/legacy/CaptureCollector.java
ndroid/hardware/camera2/legacy/LegacyCameraDevice.java
ndroid/hardware/camera2/legacy/LegacyMetadataMapper.java
ndroid/hardware/camera2/legacy/RequestHolder.java
ndroid/hardware/camera2/legacy/RequestQueue.java
ndroid/hardware/camera2/legacy/RequestThreadManager.java
ndroid/hardware/camera2/legacy/SurfaceTextureRenderer.java
ndroid/hardware/camera2/utils/ArrayUtils.java
e5b726efca7a43ed317f98ede5247a9973a7e6ff 21-Sep-2014 Svetoslav <svetoslavganov@google.com> am 23e6a244: Merge "Fix memory leak in accessibility cache." into lmp-dev

* commit '23e6a2440435d417791e99b95402721b535f73e4':
Fix memory leak in accessibility cache.
650d7d9dd27adb7fc700e99bb5167fe697785c61 21-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Fix memory leak in accessibility cache." into lmp-dev
e63b5fae8d099d2f5d4d5a5cf7a8d5a86266c0fe 19-Sep-2014 Yohei Yukawa <yukawa@google.com> Work on issue #17506095: Plumb a new configuration to IMMS

This CL makes a plumbing from SystemConfig to IMMS.

Change-Id: Ia70b870723acf647e0c27f24aff91b40d6f85543
om/android/internal/inputmethod/InputMethodUtils.java
13bd771c993f96a06add4057c5f5d5be7ac4b42a 20-Sep-2014 Svetoslav <svetoslavganov@google.com> Fix memory leak in accessibility cache.

We were not clearing the cache if window state change event
is fired which was the behavior before adding the window
inspection APIs. As a result if no accessibility service
cares about windows we get a leek. Also when the accessibiilty
service cares about windows we were not clearing all windows
nodes from the cache. Now if a windows change or a window
state change event is recived we clear the cache.

bug:17589257

Change-Id: I8c416fbcab623160c6f505128b9fca713fcc6623
ndroid/view/accessibility/AccessibilityCache.java
0f46dd0de9637699776a2178846d0e8abeb7df9e 20-Sep-2014 Yigit Boyar <yboyar@google.com> am 646e0428: Merge "Find activity from context in menu inflator for click events" into lmp-dev

* commit '646e0428a489d786c29a9ad48c1f21f3d644af42':
Find activity from context in menu inflator for click events
1a74dc45473fe5d15dc1b52458e33b91def370c2 20-Sep-2014 Yigit Boyar <yboyar@google.com> Merge "Find activity from context in menu inflator for click events" into lmp-dev
e8e3125eebbddf849fe2bf1ad21a6294ffd1bb0a 20-Sep-2014 Jeff Brown <jeffbrown@google.com> am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev

* commit '09395677f7ef5119556e8ba100c0bd27480c9797':
Decouple turning screen on from waking up in policy.
30f5dc935b30a72982cc2ee04c8c2a17ba95e885 19-Sep-2014 Yigit Boyar <yboyar@google.com> Allow fallback to Toolbar's default Navigation Icon

Bug: 17554486
Change-Id: Id9f2197820df42d81351540be5baa852f49bdf0a
om/android/internal/widget/ActionBarView.java
om/android/internal/widget/DecorToolbar.java
om/android/internal/widget/ToolbarWidgetWrapper.java
6e53b7476e9a1b1ecc30488252e183cff114ad0b 20-Sep-2014 Jeff Brown <jeffbrown@google.com> Merge "Decouple turning screen on from waking up in policy." into lmp-dev
2300412761939b0b9999609ae9cf59cca145d299 20-Sep-2014 Alan Viverette <alanv@google.com> am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev

* commit '14932619ea17d7b224902c50db4d59f15eed7b1c':
Correctly apply max width/height to preference icons
daf85882756cb5ce4346cfb5efc72b128b81d15c 20-Sep-2014 Alan Viverette <alanv@google.com> Merge "Correctly apply max width/height to preference icons" into lmp-dev
129ffeb37c230b9676a729517c44a6688f6e0975 19-Sep-2014 Svetoslav <svetoslavganov@google.com> am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev

* commit '35abe50d89e8dedecf6a3c66c3b6bfe9f904528d':
Keep existing API behavior that regressed.
1258dd21422880ec8d3e1b7a115a1a86965cb295 19-Sep-2014 Svetoslav <svetoslavganov@google.com> Merge "Keep existing API behavior that regressed." into lmp-dev
6826e9bd3e9cfa70bc9ddfd4b76553970cdb86ee 19-Sep-2014 George Mount <mount@google.com> am a86f1015: Merge "Target only shared elements with shared element Transition" into lmp-dev

* commit 'a86f10158a690b30e31216f628942562c3f2e2f2':
Target only shared elements with shared element Transition
615a2c16057bc23cc6adf2689a76fadee343051b 19-Sep-2014 George Mount <mount@google.com> Merge "Target only shared elements with shared element Transition" into lmp-dev
b62424432555d8069f24c2a3550c97a06e5b02f6 19-Sep-2014 Svetoslav <svetoslavganov@google.com> Keep existing API behavior that regressed.

If RemoteViews get a null package in the constructor we are
using the context in which they are applied to obtain resources
during inflation. In such a case if we call the getPackage()
method we were getting null, i.e. the package passed in the
contructor, but now we are returning the package if the app
that created the remote views.

bug:17513823
Change-Id: I0c4a8953c8320469a9160dbaae46ce31465b313b
ndroid/widget/RemoteViews.java
45acf7286f60b84e50829986b2897007a64891c0 19-Sep-2014 Adam Powell <adamp@google.com> am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev

* commit '20ffcaa121cb214ed875f4940e9ba16e82850a56':
Add colorEdgeEffect to themes, default it to colorPrimary
ecd7c96aa4144224c1e6c47d079d043abb86839c 19-Sep-2014 Alan Viverette <alanv@google.com> Correctly apply max width/height to preference icons

BUG: 17581750
Change-Id: I8ad21a321c80f0a657670ba4d175d0ebecea49ef
om/android/internal/widget/PreferenceImageView.java
17f48457d29af96050c03609ac17126f0acbdf5b 19-Sep-2014 Adam Powell <adamp@google.com> Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev
36c4db8bd3bd7dad4b6cb8abd9cdc1a627fe3bbc 19-Sep-2014 Jeff Brown <jeffbrown@google.com> Decouple turning screen on from waking up in policy.

This allows us to ensure windows are fully drawn before unblocking
screen on while dozing.

Bug: 17516245
Change-Id: Ibe63c212b8db855ce26a34a8169f33764b266ee6
ndroid/view/WindowManagerPolicy.java
299947f50243086ad88ebb834b9bc86c29e1b4f1 19-Sep-2014 Michael Wright <michaelwr@google.com> am 66bbf591: Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev

* commit '66bbf591050bf2969ebebc15e2550d45eeea3ab0':
Respect intent-filter priority for system keyboard layouts.
2deeaa33143362846299bb424b3b1a52ca45deeb 19-Sep-2014 George Mount <mount@google.com> Target only shared elements with shared element Transition

Bug 17549213
Bug 17553253

Change-Id: If54aebb4e37d2012aa8d1c5354d5ec03f92b81a3
ndroid/app/BackStackRecord.java
ndroid/transition/Transition.java
4bc92b064b1f23c67b06a8ed34d11335dd9a8b4f 19-Sep-2014 Michael Wright <michaelwr@google.com> Merge "Respect intent-filter priority for system keyboard layouts." into lmp-dev
c6c744da75cfb79ba758a60baa3029495016fcfe 19-Sep-2014 Adam Powell <adamp@google.com> Add colorEdgeEffect to themes, default it to colorPrimary

Allow edgeeffect colors to be changed independently of the primary
color for the current theme.

Bug 16512225

Change-Id: Ibc13ad755f489fe1f6d16af0c61a1d12dd1a61f7
ndroid/widget/EdgeEffect.java
9af20470b290896e63356b844f1af9abd9e7ddb0 19-Sep-2014 Alan Viverette <alanv@google.com> am 40994e66: Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev

* commit '40994e66f278da83e2e4e581c85d5092ee1fb1c0':
Fix radial time picker inner circle (1-12) selections
f9390f56c6a5e31d92ce636ddc8f14c561be05f1 19-Sep-2014 Paul Soulos <psoulos@google.com> am b5586e00: Fixes typo in Intent documentation

* commit 'b5586e00ed5eb4b18b58371a54449f9cc8eedca8':
Fixes typo in Intent documentation
840855c021fe012fcf02b2704c8ca2dd4b092f2f 19-Sep-2014 Alan Viverette <alanv@google.com> Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev
628cb74d8a830e5129c9b37992fd9f523177591f 19-Sep-2014 Paul Soulos <psoulos@google.com> Fixes typo in Intent documentation

bug: 17583712
Change-Id: I37c77644213417751f8261098af44096aef51b14
ndroid/content/Intent.java
bb696dcca988c828898a4b7685e8ce715fe53c65 19-Sep-2014 Alan Viverette <alanv@google.com> Fix radial time picker inner circle (1-12) selections

Result of a poorly collapsed set of if block conditionals.

BUG: 17580782
Change-Id: I7f7e5038f943d1f49e1541acfa282479cb2505ea
ndroid/widget/RadialTimePickerView.java
70a2afd10e52dee23f53637dbcfc7664f6967a10 19-Sep-2014 Amith Yamasani <yamasani@google.com> am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev

* commit 'ba108d1178a1e7863d757fd146ae8d485088c5bc':
Allow primary user profile owner to set device restrictions
8d9f12161823f267179f46825734c188b6c75b09 19-Sep-2014 Amith Yamasani <yamasani@google.com> Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
6ac3f38143277fc69d9ce38c8ce1480ef29584ac 19-Sep-2014 George Mount <mount@google.com> am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev

* commit 'f187823e02c34118ed6de23f844a043d3a64829c':
Fix exception when fragment container has no View.
a667d5dc5e811a0724f653aca9a1071cf20853fe 19-Sep-2014 George Mount <mount@google.com> am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev

* commit '04a96bcad89cf917a57980cb77a90763f43b5b94':
Fix NPE when shared element listener is null.
8f8f5f579fa6448a2ed370c5bd48af35a30f4944 19-Sep-2014 George Mount <mount@google.com> Merge "Fix exception when fragment container has no View." into lmp-dev
a1e7d53b0ad625202db3ed3c3c03ff3e2bdf4680 19-Sep-2014 George Mount <mount@google.com> Merge "Fix NPE when shared element listener is null." into lmp-dev
57224fae58d388bea72029b42b7c64f7bf89d364 19-Sep-2014 Kenny Guy <kennyguy@google.com> am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev

* commit '4996d6a4ff983167133779a78bad4282d8bce4b3':
Remove suggested key names as its confusing.
52ee328054eeafa4f1503073813d0b52e9e3e87d 19-Sep-2014 Kenny Guy <kennyguy@google.com> Merge "Remove suggested key names as its confusing." into lmp-dev
2b6307c89490127c52c4b597e79bad9fc249ca28 19-Sep-2014 Yohei Yukawa <yukawa@google.com> am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev

* commit '8e1c6a06dcd32faf10b9bdc9c9eb0d6cc055b7e5':
Speculative fix of IMMS crash
103daa0c4937f125d66839845530d0b114fba2af 19-Sep-2014 Dan Sandler <dsandler@android.com> am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev

* commit 'c990927be5a90d0c8d0ad6d8b9e75d8b15cc717c':
Fix LayoutInflater copy constructor logic.
d66a7324ccaf0c792fc9d60f6a33afd08eac0f31 19-Sep-2014 Yohei Yukawa <yukawa@google.com> Merge "Speculative fix of IMMS crash" into lmp-dev
fcedfa01907d8a5f804974a4a3585498e8d6c261 19-Sep-2014 Yohei Yukawa <yukawa@google.com> Speculative fix of IMMS crash

This CL is a follow up CL for I6571d464a46453934f0a8f5e790.

Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().

BUG: 17553712
BUG: 17549437
BUG: 17517332

Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
ndroid/view/inputmethod/InputMethodInfo.java
f2cf16436b944e19af7c9be506b4e2862565fa4c 19-Sep-2014 Dianne Hackborn <hackbod@google.com> am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev

* commit '31ce4c62e97cf7357707c894f6992f52a43c6c9d':
Fix issue #17564607: Apps in the managed profile can send any intent...
6a0c7b1ba8cb4d5a0975804f33a956df41b5c63e 19-Sep-2014 Yigit Boyar <yboyar@google.com> am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev

* commit '6cdaab18f323108f599d54d636f8fcc9bd7af278':
Fix scroll position calculation when clipToPadding is false
20d01ad8a17b85ed8a100178f01e5eed12f31cf5 19-Sep-2014 Dan Sandler <dsandler@android.com> Merge "Fix LayoutInflater copy constructor logic." into lmp-dev
0c7bb33e03392416fc98c27738d1bcca386a6b2f 19-Sep-2014 Dan Sandler <dsandler@android.com> Fix LayoutInflater copy constructor logic.

Avoids an NPE in mFilterMap.

Bug: 17548265
Change-Id: I6556373862f706dbcf5549eaec61c3e10a47b482
ndroid/view/LayoutInflater.java
ace27915d2cc5073bcbe9cc151a5c61683bdcd1a 19-Sep-2014 Dianne Hackborn <hackbod@google.com> Fix issue #17564607: Apps in the managed profile can send any intent...

...to the primary user, even if it was not whitelisted to be forwarded.

The path where getActivityInfo is called for the ResolverActivity
would not correctly apply the requested user ID to the result, so
it wouldn't run under the correct user.

Change-Id: I1da47c54bbed26091832a28236d0b06762c92437