Jeff Brown
eadefb255a
am bba231d7: Explicitly bind AsyncTask to main looper.
...
automerge: dfe7d21
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
2014-11-15 02:46:45 +00: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
John Reck
ff0c4856f4
am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev
...
automerge: f1812b1
2014-11-14 22:58:50 +00:00
Yuncheol Heo
376dee63f3
am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev
...
automerge: cde2617
2014-11-14 22:57:33 +00: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
Raph Levien
7010d0b6c3
am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev
...
automerge: 58fa003
2014-11-14 21:53:11 +00:00
Raph Levien
c047ca4540
am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev
...
automerge: fbe0e8f
2014-11-14 21:51:44 +00:00
Raph Levien
2d20850525
am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
...
automerge: be1ad50
2014-11-14 21:50:37 +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
Jeff Sharkey
b536c7a693
am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
...
automerge: 47d2c97
2014-11-14 21:47:17 +00:00
Yin-Chia Yeh
19e1512dca
am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev
...
automerge: 46810bf
2014-11-14 21:42:45 +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
Raph Levien
505ffe3633
Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev
2014-11-14 20:54:29 +00:00
Raph Levien
25f7c4b992
Merge "Update hint text color even when text present" into lmp-mr1-dev
2014-11-14 20:53:14 +00:00
Raph Levien
cda81f2ded
Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
2014-11-14 20:51:58 +00:00
Jeff Sharkey
47d2c97e70
am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
...
* commit '27936ad3a677509fab1174c7b6655c894f018143':
Block loading WebView in privileged processes.
2014-11-14 19:33:49 +00:00
Jeff Sharkey
27936ad3a6
Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
2014-11-14 19:24:53 +00:00
Yin-Chia Yeh
46810bf200
am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev
...
* commit 'cb6eae0e2eda2a9383ba2682b739b3616a9eaefc':
Camera: doc update for independent 3A
2014-11-14 19:06:37 +00:00
Jeff Sharkey
85844916b8
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
2014-11-14 11:02:27 -08:00
Yin-Chia Yeh
cb6eae0e2e
Merge "Camera: doc update for independent 3A" into lmp-mr1-dev
2014-11-14 18:36:33 +00:00
Esteban Talavera
fb70be1d1f
am 95162ad2: am 22dc3b7b: New AccountManager method to copy accounts between users.
...
* commit '95162ad2eaa45cf2643b564c7fd03bfe0e4844de':
New AccountManager method to copy accounts between users.
2014-11-14 11:42:48 +00:00
Esteban Talavera
95162ad2ea
am 22dc3b7b: New AccountManager method to copy accounts between users.
...
* commit '22dc3b7ba111e27bce99a7cce966598e7873508c':
New AccountManager method to copy accounts between users.
2014-11-14 11:37:33 +00:00
Esteban Talavera
22dc3b7ba1
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
2014-11-14 11:09:27 +00:00
Sander Alewijnse
75f79bc08b
am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
...
* commit '7bec28c5a1e1c0787542930ed291f5aadfee6e75':
Add extra to enable device admins to skip removal of system apps.
2014-11-14 10:38:44 +00:00
Sander Alewijnse
7bec28c5a1
am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
...
* commit 'f39cec0b068abcf306eb91c304ed2eb76e60f8c0':
Add extra to enable device admins to skip removal of system apps.
2014-11-14 10:32:45 +00:00
Sander Alewijnse
f39cec0b06
Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev
2014-11-14 10:26:38 +00:00
Alan Viverette
db3aa6be93
am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
...
* commit '04bea0905724e24ce8b80187134e7f698607ae1a':
Account for window bounds in accessibility view click point computation
2014-11-14 01:56:50 +00:00
Alan Viverette
04bea09057
am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
...
* commit '0224d25db2f897ddfc29a722ad91d67dcf2500a9':
Account for window bounds in accessibility view click point computation
2014-11-14 01:51:38 +00:00
Alan Viverette
0224d25db2
Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev
2014-11-14 01:46:01 +00:00
Alan Viverette
8f5de8c6c0
am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
...
* commit '96dacf3659c6fe9a1ac509ec242eb446307c6833':
Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-14 00:03:27 +00:00
ztenghui
bac3f5a6f0
am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
...
* commit '9f67155332e49686ef622b096b715ee62845d401':
Fix the starting pen's position when a path close.
2014-11-14 00:03:16 +00:00
Abhijith Shastry
0f0642075e
am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev
...
* commit '530f25d629f0e78ca2e0cd372e907207d2318182':
new sms/mms carrier app API
2014-11-14 00:02:51 +00:00
Alan Viverette
96dacf3659
am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
...
* commit '24859ba016f740c16113e04271ebe6b3eb61a241':
Don't dismiss AutoCompleteTextView on focus change while temp detached
2014-11-13 23:53:13 +00:00
ztenghui
9f67155332
am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
...
* commit '475569e98a7d8d42b981df54c70974ad99336328':
Fix the starting pen's position when a path close.
2014-11-13 23:53:03 +00:00
Abhijith Shastry
530f25d629
am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev
...
* commit 'fb8db1c84b7fd59f596a6c090a8035fab08ef2f5':
new sms/mms carrier app API
2014-11-13 23:50:12 +00:00
Ruben Brunk
0c22e6919a
camera2: Add READ_SETTINGS capability.
...
Bug: 18281970
Change-Id: I28be92a85f0a843c690f9ff49263440cd871e40d
2014-11-13 15:15:07 -08:00
Alan Viverette
24859ba016
Merge "Don't dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev
2014-11-13 22:45:12 +00:00
ztenghui
475569e98a
Merge "Fix the starting pen's position when a path close." into lmp-mr1-dev
2014-11-13 22:41:55 +00:00
Abhijith Shastry
fb8db1c84b
Merge "new sms/mms carrier app API" into lmp-mr1-dev
2014-11-13 22:15:46 +00:00
Yuncheol Heo
417a95685e
CEC: Fix a bug in HdmiPortInfo.createFromParcel().
...
- Added equals() for the testing.
Bug: 18376178
Change-Id: Icc7d5fe78b3132bf51754fc3bb0d5a40e0d3b20a
2014-11-14 06:43:31 +09:00
Alan Viverette
df68999dc7
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
2014-11-13 12:59:37 -08:00
