Adrian Roos
a79a089c43
am 61a848dd: Merge "Fix Bitmap leaks in ImageWallpaper" into lmp-mr1-dev
...
* commit '61a848dd2e095336c341af68ed01564c0f3cb442':
Fix Bitmap leaks in ImageWallpaper
2014-11-17 13:56:04 +00:00
Adrian Roos
61a848dd2e
Merge "Fix Bitmap leaks in ImageWallpaper" into lmp-mr1-dev
2014-11-17 13:50:59 +00:00
Selim Cinek
e4f945010b
am a7651b87: Merge "Increases the falsing threshold when for the keyguard affordances" into lmp-mr1-dev
...
* commit 'a7651b87059316bb4001a8f1b8f37a113b309f03':
Increases the falsing threshold when for the keyguard affordances
2014-11-17 12:58:02 +00:00
Selim Cinek
a7651b8705
Merge "Increases the falsing threshold when for the keyguard affordances" into lmp-mr1-dev
2014-11-17 12:54:56 +00:00
Ying Wang
0de36e51c5
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
2014-11-17 10:15:39 +00:00
John Spurlock
37e68bdb9c
Sysui: Align projection permission dialog checkbox.
...
Bug: 18392920
Change-Id: Ic74ce8c79c99d91b5493a0b0607cda356f727407
2014-11-16 13:05:59 -05:00
Prashant Malani
9d2a478578
am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev
...
* commit '4d269ba32037485bfa5ffba4dd23f796cbf10c43':
Don't animate screen brightness if there is a pending off transition
2014-11-15 10:04:00 +00:00
Prashant Malani
4d269ba320
am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev
...
* commit 'fb26a2c80b988118983251caf36492f2ae39559c':
Don't animate screen brightness if there is a pending off transition
2014-11-15 09:56:57 +00:00
Prashant Malani
fb26a2c80b
Merge "Don't animate screen brightness if there is a pending off transition" into lmp-sprout-dev
2014-11-15 09:46:33 +00:00
Tom Turney
fa90087274
am 2a46722f: Merge "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 adverti
...
* commit '2a46722f96480aed028785e955cbb8cb506df0b2':
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.
2014-11-15 03:07:29 +00:00
Tom Turney
2a46722f96
Merge "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." into lmp-mr1-dev
2014-11-15 03:00:07 +00:00
Chong Zhang
82e9db4972
am 1c814b5c: Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev
...
* commit '1c814b5c61c538c7ef5176b1121e1ea0c65046e6':
implement HDMI-like demo mode for remote display
2014-11-15 02:32:34 +00:00
Christopher Tate
824392bdbd
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
2014-11-14 18:27:36 -08:00
Chong Zhang
1c814b5c61
Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev
2014-11-15 02:25:33 +00:00
Tom Turney
29230ceab9
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
2014-11-15 02:25:05 +00:00
Jim Miller
96afb6f03b
Fix deadlock caused by synchronous setOccluded() method in keyguard
...
This fixes a deadlock where WindowManagerService can call into
KeyguardService.setOccluded() while holding a lock. As soon as keyguard
receives the call, it immediately needs to check permission and calls
back into the system service which is waiting for the lock to be
released. Boom!
The fix does a quick check of the calling UID and allows the call
if coming from the System UID, thus bypassing the need for a
binder call to checkPermission().
Fixes bug 18362246
Change-Id: Iab4be8a885f330fb2a62ee7e3579966e1447f8b0
2014-11-14 18:24:27 -08:00
Jeff Brown
dfe7d2193c
am bba231d7: Explicitly bind AsyncTask to main looper.
...
* commit 'bba231d7a63b58a8c2b174722ed1487b0f7d8270':
Explicitly bind AsyncTask to main looper.
2014-11-15 01:38:48 +00:00
Ruben Brunk
73a7f2862c
am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
...
* commit '4d2d97763f0963d7011d04290dc87b2940aefb33':
camera2: Add READ_SETTINGS capability.
2014-11-15 01:25:09 +00:00
Jeff Brown
bba231d7a6
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
2014-11-14 17:22:31 -08:00
Ruben Brunk
4d2d97763f
Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
2014-11-15 01:13:54 +00:00
Chris Craik
b165296a9c
Update clipToPadding docs
...
Clarify that it doesn't clip anything but children,
and only if padding is non-zero.
Change-Id: I3e3ae31f52fc22304eb13d88765f9f4fc6e43e66
2014-11-14 17:05:06 -08:00
Christopher Tate
e5e43e9ab8
am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev
...
* commit '7658f0edefab392b2af13b6558d08385c9b3ed5a':
Teach bmgr that "android" is a valid package name
2014-11-15 00:52:35 +00:00
Christopher Tate
7658f0edef
Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev
2014-11-15 00:48:16 +00:00
Chong Zhang
ae6119ffce
implement HDMI-like demo mode for remote display
...
adding the following two system properties to control remote
display rotation and device orientation lock:
"persist.demo.rotationlock"=true|false
"persist.demo.remoterotation"=landscape|portrait
Bug: 18317603
Change-Id: Id5fe115f895c6a0e72563036b9a98ff3b5037763
2014-11-14 16:39:15 -08:00
Andreas Gampe
995c62d6ab
Frameworks/base: AndroidRuntime standalone preloaded-classes
...
Change AndroidRuntime::startVM to give the new standalone
preloaded-classes file to the runtime for compilation of images.
Bug: 18305157
Change-Id: I32a13357893222b25fbce60bf2367c23fb36ab22
2014-11-14 16:15:17 -08:00
Geoff Mendal
712608d356
am 9004fe9a: (-s ours) Import translations. DO NOT MERGE
...
* commit '9004fe9a550b40f0cbba8823daac69d86477356e':
Import translations. DO NOT MERGE
2014-11-15 00:06:32 +00:00
Jeff Sharkey
6eb093909c
Prevent user ID reuse until after reboot.
...
We're still seeing rare cases where a device struggles to create a
new user, probably because of a subtle bug in the FUSE daemon. To
work around this, only allow user IDs reuse after reboot.
Bug: 8302014
Change-Id: Id7f9fb539c6d6d1ff3d47d941af1d9e6b93eca03
2014-11-14 15:58:01 -08:00
Geoff Mendal
9004fe9a55
Import translations. DO NOT MERGE
...
Change-Id: I629815c2db7019af69cf0660de6f791b2d8105cd
Auto-generated-cl: translation import
2014-11-14 15:52:54 -08:00
Winson Chung
0d539c2956
am 1c903b4e: Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev
...
* commit '1c903b4e110a60da115acf6f94cdc50fd9e6cd62':
Fixing regression in screen pinning button visibility. (Bug 18390050)
2014-11-14 23:34:07 +00:00
Winson Chung
1c903b4e11
Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev
2014-11-14 23:30:37 +00:00
Jinsuk Kim
cccafac36c
am 553aeed9: Merge "CEC: Buffer messages coming from unknown device" into lmp-mr1-dev
...
* commit '553aeed9c9de19fcadb5466b39b6903eac61598b':
CEC: Buffer messages coming from unknown device
2014-11-14 22:56:26 +00:00
Jinsuk Kim
553aeed9c9
Merge "CEC: Buffer messages coming from unknown device" into lmp-mr1-dev
2014-11-14 22:52:57 +00:00
Abhijith Shastry
d7a305bd43
Adding more javadocs to Carrier messaging API.
...
Change-Id: If0b476813c6cf02eef22bbca4e78726a038d2bfc
2014-11-14 14:45:51 -08:00
Jeff Sharkey
2cffc7dafd
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
2014-11-14 14:28:06 -08:00
John Reck
f1812b17bb
am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev
...
* commit '8f5839be21f028885b6171e75cba479a020a3a0c':
Document that circular reveal is async
2014-11-14 22:07:29 +00:00
John Reck
8f5839be21
Merge "Document that circular reveal is async" into lmp-mr1-dev
2014-11-14 22:03:33 +00:00
John Reck
a3b35907de
Document that circular reveal is async
...
Bug: 18058966
Change-Id: I64b35441f12bec433f633580319ec73c1e11e7a2
2014-11-14 14:02:55 -08:00
Yuncheol Heo
cde261796b
am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev
...
* commit '8977c1dab572cb61ebff1f844a549f7fb2e4e590':
CEC: Fix a bug in HdmiPortInfo.createFromParcel().
2014-11-14 21:55:43 +00:00
Yuncheol Heo
8977c1dab5
Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev
2014-11-14 21:50:21 +00:00
John Spurlock
8f84f62d1f
am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev
...
* commit '8fe10b4b04447d997179604ead942fd4bbd5eef2':
Volume: Move "Muted by" string from sysui to frameworks.
2014-11-14 21:44:52 +00:00
John Spurlock
8fe10b4b04
Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev
2014-11-14 21:41:43 +00:00
Wale Ogunwale
0a41a57802
Consolidated processing of package boardcasts in AM service.
...
Bug: 18230409
Change-Id: Idc048eb6cfece792b1cdc651146fba965f874430
2014-11-14 13:35:10 -08:00
Jeff Sharkey
adb5defbd9
am 84998e28: Merge "Reduce spammy PackageManager critical logs." into lmp-mr1-dev
...
* commit '84998e28584e44f69be06fc9fe7e77df182251eb':
Reduce spammy PackageManager critical logs.
2014-11-14 21:09:52 +00:00
Jeff Sharkey
bec816adc7
am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev
...
* commit '17fe99ac01b8b6648d3d703fec1b28a792832331':
Fix NPE in DropBoxManagerService.dump()
2014-11-14 21:09:47 +00:00
Jeff Sharkey
84998e2858
Merge "Reduce spammy PackageManager critical logs." into lmp-mr1-dev
2014-11-14 21:06:47 +00:00
Jeff Sharkey
17fe99ac01
Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev
2014-11-14 21:06:22 +00:00
George Mount
20559079ab
Fix Visibility transitions canceling when nothing has changed.
...
Bug 18377719
Change-Id: I4ba282bba928781e7b8a62e813cb83f8bf78b58c
2014-11-14 21:02:42 +00:00
Raph Levien
58fa003577
am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev
...
* commit '505ffe3633f45778e493e23ad8c163f09ed1dbb5':
Check bounds on CharSequence drawText methods
2014-11-14 20:56:46 +00:00
Raph Levien
fbe0e8f418
am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev
...
* commit '25f7c4b99284cd1e118f50bd585e6534acfad7c4':
Update hint text color even when text present
2014-11-14 20:56:40 +00:00
Raph Levien
be1ad50b34
am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
...
* commit 'cda81f2ded39b53dd813071760ad235363292d52':
Fudge clipRect in TextView for extra cursor width
2014-11-14 20:56:35 +00:00