John Spurlock
37e68bdb9c
Sysui: Align projection permission dialog checkbox.
...
Bug: 18392920
Change-Id: Ic74ce8c79c99d91b5493a0b0607cda356f727407
2014-11-16 13:05:59 -05:00
Dan Albert
ddaf804f73
Merge "Move hwui tests to libc++."
2014-11-16 17:44:03 +00:00
Dan Albert
57f81b86a2
Move hwui tests to libc++.
...
Bug: 15193147
Change-Id: I9a3a4104c49810173cbf59e0023baafc4693dd3f
2014-11-15 18:29:03 -08:00
Prashant Malani
7010d230ca
am 673d8659: am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev automerge: 9d2a478
...
* commit '673d86591feff675eb7970486f3815b2c43916f2':
Don't animate screen brightness if there is a pending off transition
2014-11-15 10:21:09 +00:00
Prashant Malani
673d86591f
am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev
...
automerge: 9d2a478
* commit '9d2a47857899845d2e00f4a968a0916deeb1fb2e':
Don't animate screen brightness if there is a pending off transition
2014-11-15 10:13:23 +00: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
dfd827e424
am e9f8d1dd: 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 advertisem
...
* commit 'e9f8d1ddbdfe6bf9d4b4a9cb1fca8703febff742':
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:38:12 +00:00
Tom Turney
e9f8d1ddbd
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
...
automerge: fa90087
* commit 'fa900872742252fd0b56760a3390cea38166adb9':
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:33:04 +00:00
Chong Zhang
e9196c942a
am fcab74b3: am 1c814b5c: Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev automerge: 82e9db4
...
* commit 'fcab74b3ce552f58ffa8367901a8d4924143427c':
implement HDMI-like demo mode for remote display
2014-11-15 03:09:48 +00:00
Jeff Brown
43dc963a43
am eadefb25: am bba231d7: Explicitly bind AsyncTask to main looper. automerge: dfe7d21
...
* commit 'eadefb255a2bda602ccc043531a231413e8ea839':
Explicitly bind AsyncTask to main looper.
2014-11-15 03:09:44 +00:00
Ruben Brunk
82b9f663ec
am 60af60c4: am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev automerge: 73a7f28
...
* commit '60af60c4b04b992f5a9e6a8f613b6b802276552a':
camera2: Add READ_SETTINGS capability.
2014-11-15 03:09:39 +00:00
Christopher Tate
e574c42fa0
am bd20bf7b: am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev automerge: e5e43e9
...
* commit 'bd20bf7b80b115bf64d892f52c2c9c21f8a3cd64':
Teach bmgr that "android" is a valid package name
2014-11-15 03:09:25 +00:00
Geoff Mendal
a798fb21e3
am d083d20b: (-s ours) am 9004fe9a: (-s ours) Import translations. DO NOT MERGE automerge: 712608d -s ours
...
* commit 'd083d20bdeb4ca287688c7f848af1f2e6e703bfb':
Import translations. DO NOT MERGE
2014-11-15 03:09:20 +00:00
Winson Chung
303f32d455
am 46695cf9: am 1c903b4e: Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev automerge: 0d539c2
...
* commit '46695cf934dd21fb2d3ec7a514233c95ba47b87e':
Fixing regression in screen pinning button visibility. (Bug 18390050)
2014-11-15 03:08:47 +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
fcab74b3ce
am 1c814b5c: Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev
...
automerge: 82e9db4
* commit '82e9db49724ae62f7a0adf284c6bc3ae620741c5':
implement HDMI-like demo mode for remote display
2014-11-15 02:49:37 +00:00
Jeff Brown
eadefb255a
am bba231d7: Explicitly bind AsyncTask to main looper.
...
automerge: dfe7d21
* commit 'dfe7d2193cd36099d4395bdee8458c53bf5f1124':
Explicitly bind AsyncTask to main looper.
2014-11-15 02:47:56 +00:00
Ruben Brunk
60af60c4b0
am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
...
automerge: 73a7f28
* commit '73a7f2862c0b9546d9f826ec2d0ae8a97b10c24e':
camera2: Add READ_SETTINGS capability.
2014-11-15 02:46:45 +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
Christopher Tate
bd20bf7b80
am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev
...
automerge: e5e43e9
* commit 'e5e43e9ab88bf6a9951a323ae5f804967dab4c96':
Teach bmgr that "android" is a valid package name
2014-11-15 01:24:30 +00:00
Geoff Mendal
d083d20bde
am 9004fe9a: (-s ours) Import translations. DO NOT MERGE
...
automerge: 712608d -s ours
* commit '712608d356b5a7b1f4e0cb9a955009a70e7f7a2a':
Import translations. DO NOT MERGE
2014-11-15 01:22:53 +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
Winson Chung
46695cf934
am 1c903b4e: Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev
...
automerge: 0d539c2
* commit '0d539c295613442a7926a2c3505a2834ab2b086c':
Fixing regression in screen pinning button visibility. (Bug 18390050)
2014-11-15 01:20:17 +00:00
Ruben Brunk
4d2d97763f
Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev
2014-11-15 01:13:54 +00: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
Marco Nelissen
411418b10c
Merge "Update calls to IInterface::asBinder()"
2014-11-15 00:18:21 +00: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
Geoff Mendal
96d2cd95b5
Import translations. DO NOT MERGE
...
Change-Id: I7078d7365c176fea33e2daf657e0bf78c2edea93
Auto-generated-cl: translation import
2014-11-14 15:58:46 -08: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
36f3b81440
am f1faf930: am 553aeed9: Merge "CEC: Buffer messages coming from unknown device" into lmp-mr1-dev automerge: cccafac
...
* commit 'f1faf93094c2e49782a3ba26c2d0e67b13199238':
CEC: Buffer messages coming from unknown device
2014-11-14 23:18:16 +00:00
Jinsuk Kim
f1faf93094
am 553aeed9: Merge "CEC: Buffer messages coming from unknown device" into lmp-mr1-dev
...
automerge: cccafac
* commit 'cccafac36c7c0297afbfb17d4389951b77066cab':
CEC: Buffer messages coming from unknown device
2014-11-14 23:13:22 +00:00
John Reck
eb4afaeedd
am ff0c4856: am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev automerge: f1812b1
...
* commit 'ff0c4856f4f912f483c8293a72657d82b1dd14a9':
Document that circular reveal is async
2014-11-14 23:05:36 +00:00
Yuncheol Heo
f946a522b7
am 376dee63: am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev automerge: cde2617
...
* commit '376dee63f383d31f547a09d9708103592d9e0dd9':
CEC: Fix a bug in HdmiPortInfo.createFromParcel().
2014-11-14 23:01:05 +00:00
John Spurlock
c8782e4c2f
am ec74a7e7: am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev automerge: 8f84f62
...
* commit 'ec74a7e725dbf04b38cf959e6749a18bee5344b4':
Volume: Move "Muted by" string from sysui to frameworks.
2014-11-14 23:01:01 +00:00
John Reck
ff0c4856f4
am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev
...
automerge: f1812b1
* commit 'f1812b17bb3396a28f3be8d19e0086de2be613a6':
Document that circular reveal is async
2014-11-14 22:58:50 +00:00