Commit Graph

163783 Commits

Author SHA1 Message Date
Nicolas Prevot
a9f9c4b90a Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 2015-01-15 12:28:13 +00:00
Jinsuk Kim
5304649ba8 am 2cd3ac47: Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev
* commit '2cd3ac4707f32fc296c0b2a8e7e2479d40c9a706':
  CEC: Support sendStandby() for MHL device
2015-01-15 05:11:49 +00:00
Jinsuk Kim
2cd3ac4707 Merge "CEC: Support sendStandby() for MHL device" into lmp-mr1-dev 2015-01-15 05:07:04 +00:00
Dianne Hackborn
5a4b408421 am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev
* commit 'b96a6916f657c4b3f5da7a5d2d8d32dee4d6167c':
  Fix issue android-app doc, bump battery stats checkin version
2015-01-15 01:42:35 +00:00
Dianne Hackborn
b96a6916f6 Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 2015-01-15 01:38:23 +00:00
John Reck
2c9f86aa21 am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev
* commit '53af1cd3930a398b2008c4be9c10e5182392ffaf':
  Vsyncs are hard
2015-01-15 01:11:48 +00:00
Alan Viverette
628e646eea am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev
* commit 'aa229902ef73f8777768414092eaf99eeff05f87':
  Jump ripples to end when switching to a non-hardware canvas
2015-01-15 01:11:41 +00:00
John Reck
53af1cd393 Merge "Vsyncs are hard" into lmp-mr1-dev 2015-01-15 01:08:57 +00:00
Alan Viverette
aa229902ef Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev 2015-01-15 01:05:53 +00:00
Alan Viverette
a0c0ca7389 Jump ripples to end when switching to a non-hardware canvas
Previously we canceled the hardware animations but neglected to reset
the state, which left us drawing in the pressed state.

Bug: 19020524
Change-Id: I439a18126b9093cac40006361be99f8d077b95a9
2015-01-14 17:05:21 -08:00
Alan Viverette
cf1950aaab am 4490774b: Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev
* commit '4490774bc10d575ce1da3ea98ef3e6bc1f37fed2':
  Make the DatePicker dialog fit on smaller screens in landscape mode
2015-01-15 01:03:02 +00:00
Alan Viverette
4490774bc1 Merge "Make the DatePicker dialog fit on smaller screens in landscape mode" into lmp-mr1-dev 2015-01-15 00:58:38 +00:00
Alan Viverette
f39d650280 Make the DatePicker dialog fit on smaller screens in landscape mode
Bug: 18933437
Change-Id: Id40351d52a7eab81e15e1f0120a9da961ef21d0a
2015-01-14 16:58:05 -08:00
Robert Greenwalt
2ffe412b0e Rerun entitlementcheck on sim change.
Only run if entitlement is needed and tethering is running.

bug:18356505
Change-Id: Ifc50189bf573e4575f747975edcce093c4870356
2015-01-14 16:55:38 -08:00
Chris Craik
3b47713b26 Update generationId on bitmaps when decoded into by BitmapRegionDecoder
bug:18921087

This fixes issues where bitmaps are cached as textures, and not
reuploaded when reused by BitmapRegionDecoder, showing stale content.

Change-Id: I7626fd6acd36d8e38723689734855ce9154eb8c8
2015-01-14 16:55:34 -08:00
Christopher Tate
9568307cf3 am 43a4a8c7: Fix redundant file backups
* commit '43a4a8c777fbb8f71540ac7fbe82674489ef557b':
  Fix redundant file backups
2015-01-15 00:49:46 +00:00
Christopher Tate
43a4a8c777 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
2015-01-14 16:36:30 -08:00
Roozbeh Pournader
7c0e7db67e Fudge getRightPaddingOffset in TextView to match clipRect.
A previous change (df68999dc7) adjusted
the clipRect slightly on the right side, but didn't adjust the
padding offset used in fading.

Bug: 18820846
Change-Id: I68c0918f914742d1e7b91f9ea8d5acbd41938233
2015-01-14 16:19:48 -08:00
Dianne Hackborn
0ee10f6d26 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
2015-01-14 16:16:13 -08:00
Todd Kennedy
8719f683d2 DO NOT MERGE Restore calling identity before checking permission
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.

Cherry picked from lmp. Fixes bug 15989465.

Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
2015-01-14 15:40:46 -08:00
Todd Kennedy
7dba93c087 DO NOT MERGE Restore calling identity before checking permission
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.

Cherry picked from lmp. Fixes bug 15989465.

Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
2015-01-14 15:33:21 -08:00
Scott Rowe
c222198a2c docs: removing code captions
Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45
2015-01-14 14:27:30 -08:00
Jinsuk Kim
61c94d1a03 CEC: Support sendStandby() for MHL device
Changed so that the API sendStandby() transform the request to
a MHL subcommand if the call is done against a MHL device.

Also hooked up the dump() to print out information on MHL.

Bug: 18451257
Change-Id: I1927855e0e4c45a731f0fd97ba572bfc2a894557
2015-01-15 07:12:50 +09:00
Stuart Scott
542f4ee619 am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev
* commit 'a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
2015-01-14 21:33:35 +00:00
Stuart Scott
a2fa3d219b Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 2015-01-14 21:28:54 +00:00
Michael Wright
5497e99c4a am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev
* commit 'eec75faaa25b5da3382cf0925a65e9e6bd90fdc9':
  Clean up graphics resources.
2015-01-14 21:26:52 +00:00
Michael Wright
eec75faaa2 Merge "Clean up graphics resources." into lmp-mr1-dev 2015-01-14 21:21:40 +00:00
Craig Mautner
f387d3c87a am c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev
* commit 'c8ba2e87a40eb70ad22c62b9768e7691e3ff3bc3':
  Place window at top when adding by base layer
2015-01-14 20:52:23 +00:00
Craig Mautner
c8ba2e87a4 Merge "Place window at top when adding by base layer" into lmp-mr1-dev 2015-01-14 20:46:23 +00:00
Adam Lesinski
e488ce8668 am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev
* commit '94e30215f97157500d5f5ca1cec446c7114f54b0':
  AAPT: Handle all old unversioned attribute usage
2015-01-14 20:40:42 +00:00
Adam Lesinski
94e30215f9 Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev 2015-01-14 20:22:30 +00:00
Craig Mautner
cfb13798db Place window at top when adding by base layer
When addAppWindowToListLocked defaults to adding based on mBaseLayer
it went from the lowest window to the highest window looking for a
window whose base layer was larger and dropping the new window below
that window.

If the Home activity is the InputMethodTarget then when the home
ActivityStack moves to the back the InputMethod will follow. This
puts the InputMethod, with it's high base layer value below most
activities. If a new activity window is added using the mBaseLayer
rule above it was placed at the bottom of the window list below the
InputMethod window. Being at the bottom it never received focus and
input to the activity timed out causing ANR.

This change starts the mBaseLayer search at the top window and works
its way down looking for the first window whose mBaseLayer is less
than or equal to the new window's mBaseLayer and inserting the new
window above that window. This causes it to be placed at the top of
all activities even if the InputMethod is near the bottom.

Fixes bug 17721767.

Change-Id: I037064de7604b670841e985479eb5857b47af1d7
2015-01-14 12:20:35 -08:00
Stuart Scott
400a3f6df2 Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
bug:19015551
Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
2015-01-14 12:12:02 -08:00
Adam Lesinski
28994d8d18 AAPT: Handle all old unversioned attribute usage
All references to attributes defined in pre-LOLLIPOP_MR1 SDK
are moved to version qualified resource entries.

Bug:18221682
Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
2015-01-14 12:02:15 -08:00
John Reck
a22c9b2cd1 Vsyncs are hard
Bug: 18866485
Change-Id: I7d304df0f20a3296956cb6887a72adba9243f117
2015-01-14 10:40:15 -08:00
Sanket Padawe
0b7f5e81ba Modify getDeviceId() to get device id independent of Subscription.
+ Add getDeviceId() in ITelephony to find device id independent of
subscription.

Bug: 18780202
Change-Id: I21cc38418eb7f4f1b300c6372e1dc7548385c112
2015-01-14 09:49:58 -08:00
Christoph Studer
a80da9d069 am b018399a: SysUI: Log lockscreen gestures
* commit 'b018399a3a2762e95126acbe14397eca15bad772':
  SysUI: Log lockscreen gestures
2015-01-14 15:27:02 +00:00
Jorim Jaggi
c1691e3f8b am 86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev
* commit '86e1788db46cdbcc65331dd8d0b9e23241a534fe':
  Only notify SIM state changes when it has actually changed
2015-01-14 15:16:12 +00:00
Christoph Studer
2d26435f0e am bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev
* commit 'bd0db7b18f2a78b2ac2ff13234bf5b3582c9aec4':
  SysUI: Log lockscreen state to eventlog
2015-01-14 15:16:07 +00:00
Christoph Studer
b018399a3a SysUI: Log lockscreen gestures
Log the following lockscreen gestures:
 * Swipe up to unlock
 * Swipe down to enter full shade
 * Tap in empty area (causing unlock hint)
 * Swipe to camera
 * Swipe to dialer
 * Tap on lock to lock device
 * Tap on notification, activating it

For swipe gestures, includes length and velocity where available.

Bug: 18767135
Change-Id: Ib2c535e3a9d2b378f5a2a0a00c2be3fd916554ac
2015-01-14 15:15:58 +00:00
Jorim Jaggi
86e1788db4 Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 2015-01-14 15:13:09 +00:00
Christoph Studer
bd0db7b18f Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 2015-01-14 15:10:53 +00:00
Nicolas Prevot
206d31f598 am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev
* commit '42ebaa434f95417cbf55ef6975fab7cb9d27ab3e':
  Make documentation for cross-profile intent filters clearer.
2015-01-14 13:38:21 +00:00
Nicolas Prevot
42ebaa434f Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 2015-01-14 13:33:13 +00:00
Paul Jensen
be61ffa4fe am 9f0e9ad4: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev
* commit '9f0e9ad40633f0480c8b6209e52d61c5aac52d1d':
  Don't blindly teardown unvalidated networks when releasing NetworkRequests.
2015-01-14 12:42:32 +00:00
Paul Jensen
9f0e9ad406 Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev 2015-01-14 12:39:01 +00:00
Lorenzo Colitti
792fd3d1ee am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev
* commit '2b52cad12e371a173b61257599824934b1a6c930':
  Switch the connectivity check to its own hostname.
2015-01-14 11:59:46 +00:00
Wink Saville
657f9a680f am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
* commit '1a6dd2985ef1eab036f6fc77cf723e3f12832e93':
  StateMachine.dump produces no output sometimes.
2015-01-14 11:59:41 +00:00
Nicolas Prevot
2c1c5dd5ef 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
2015-01-14 10:31:23 +00:00
Lorenzo Colitti
2b52cad12e Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 2015-01-14 10:28:26 +00:00