Jinsuk Kim
7de1ed9d63
Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev
2015-01-22 02:19:37 +00:00
Wonsik Kim
a80c07633b
am 67add1d2: Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev automerge: 0313a0e
...
* commit '67add1d26257eb298918a6e2c75f21afd59dadba':
TIF: TvInputHardwareManager puts multiple sink ports into audio patch
2015-01-22 02:02:39 +00:00
Wonsik Kim
67add1d262
Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev
...
automerge: 0313a0e
2015-01-22 01:54:49 +00:00
Wonsik Kim
0313a0e9b7
Merge "TIF: TvInputHardwareManager puts multiple sink ports into audio patch" into lmp-mr1-dev
2015-01-22 01:52:08 +00:00
Miao Wang
118245d939
Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev automerge: dbfcf3f
...
automerge: a710b83
2015-01-22 01:26:24 +00:00
Miao Wang
a710b839a2
Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev
...
automerge: dbfcf3f
2015-01-22 01:19:28 +00:00
Miao Wang
dbfcf3f812
Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev
2015-01-22 01:16:30 +00:00
Eino-Ville Talvala
fa0b9a00b4
Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
...
Add missing implementation.
Also improve docs for flexible Surface sources.
Bug: 19076351
Change-Id: I1f1126a291480dcb68d3dd90825b5994e54dcc99
2015-01-21 16:49:59 -08:00
Craig Mautner
f6ab9afc46
am d56352db: am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'd56352dbcb447ed0a93f2d46183e6217800add80':
Resume home activity can skip resume and cause ANR. DO NOT MERGE
2015-01-22 00:36:10 +00:00
Craig Mautner
d56352dbcb
am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'c79a8ea0c4e1cb30c667f84276820f7e14bfb3b1':
Resume home activity can skip resume and cause ANR. DO NOT MERGE
2015-01-22 00:29:56 +00:00
Craig Mautner
c79a8ea0c4
Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
2015-01-22 00:25:19 +00:00
Jason Sams
c9870c145f
Fix default compute thread priority
...
bug 16651474
Compute inherited graphics default thread priority of Display. This
was not intended.
Change-Id: I0dd9a230ce8ceba64e971b024cbe518927cd2550
2015-01-21 16:12:37 -08:00
Robert Greenwalt
ed25274e71
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
...
automerge: 9e7cb40
2015-01-22 00:00:43 +00:00
Robert Greenwalt
8379688475
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
...
automerge: 0343e1a
2015-01-21 23:59:09 +00:00
Robert Greenwalt
9e7cb40ddf
am ab42bbb9: Merge "Fix legacy request removal." into lmp-mr1-dev
...
* commit 'ab42bbb9024d10579a913049147f6fc25b57df83':
Fix legacy request removal.
2015-01-21 23:56:07 +00:00
Robert Greenwalt
0343e1a704
am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
...
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
Rerun entitlementcheck on sim change.
2015-01-21 23:56:02 +00:00
Robert Greenwalt
ab42bbb902
Merge "Fix legacy request removal." into lmp-mr1-dev
2015-01-21 23:50:27 +00:00
Robert Greenwalt
7ca16ff8c6
Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev
2015-01-21 23:49:12 +00:00
Andrew Solovay
ea4c21ea28
am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d
...
* commit 'a1838a9d78eeadc0e578e250b9ff71b1f720148e':
docs: WebView security notes for apps on pre-K devices
2015-01-21 23:46:27 +00:00
Luan Nguyen
2c27edc0e0
am 349e3b5a: am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge:
...
* commit '349e3b5ad1e3d2f55fadce05a3726f27c8a2b5d5':
docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
2015-01-21 23:46:20 +00:00
Andrew Solovay
a1838a9d78
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d
...
automerge: 63e822d
2015-01-21 23:40:51 +00:00
Luan Nguyen
349e3b5ad1
am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda automerge: de9bd40
...
automerge: 2b01cfb
2015-01-21 23:39:29 +00:00
Rich Slogar
d7ffcad49b
docs: linux requirements update
...
b/18371514
Change-Id: I8e320b53bca248d37bff22e4313041d0c138779f
2015-01-21 15:36:02 -08:00
Andrew Solovay
63e822df58
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954
...
automerge: d4cf09d
* commit 'd4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
docs: WebView security notes for apps on pre-K devices
2015-01-21 23:33:10 +00:00
Luan Nguyen
2b01cfbefc
am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda
...
automerge: de9bd40
2015-01-21 23:31:44 +00:00
Andrew Solovay
d4cf09d3a0
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
...
automerge: e628954
2015-01-21 23:22:45 +00:00
Luan Nguyen
de9bd40e21
am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs
...
automerge: 8884eda
2015-01-21 23:21:24 +00:00
Andrew Solovay
e628954ea4
am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
...
* commit '78f4342fac982a130a62dac2a459cef2a4c29f5a':
docs: WebView security notes for apps on pre-K devices
2015-01-21 23:10:59 +00:00
Luan Nguyen
8884edaaeb
am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs
...
* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
2015-01-21 23:10:55 +00:00
Jinsuk Kim
8913a0e1e8
CEC: Let playback device switch TV input after bootup
...
Saves users from having to switch TV input manually to a playback device
after it boots up.
Bug: 19046176
Change-Id: I0a4fae1036138ce2e19cbac9fdd9dda41bdcf89f
2015-01-21 22:47:10 +00:00
Rich Slogar
b01e3fa104
docs: studio emulator platform update
...
b/5122160
Change-Id: I82966b0e9f32dc6e6641681f7726a8a8074525ff
2015-01-21 13:52:56 -08:00
louis_chang
b4d43538d7
Resume home activity can skip resume and cause ANR. DO NOT MERGE
...
Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.
Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.
Solution:
Just resume the next activity if already in home stack
Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354
2015-01-21 21:38:31 +00:00
Miao Wang
b590b354ef
[Renderscript] Add check for Allocation.copyTo(Array) and
...
Fix the input allocation type check for Histogram Intrinsic.
Bug: 19035242
Change-Id: I0ef2672bf816854db90fc92dc9ef51d1d231c246
2015-01-21 21:17:19 +00:00
Alan Viverette
2aacb861f4
Avoid ripple buffer creation for empty bounds automerge: b74155c
...
automerge: e6e216c
2015-01-21 21:09:39 +00:00
Alan Viverette
e6e216c48e
Avoid ripple buffer creation for empty bounds
...
automerge: b74155c
2015-01-21 21:02:58 +00:00
Jim Miller
b5db57a27d
Clarify getTrustAgentConfiguration() documentation.
...
Fixes bug 18983802
Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
2015-01-21 21:01:02 +00:00
Jason Monk
17f3c3f4fb
Show connect dialog when selecting secure QS wifi
...
Use startSettingsActivity (QSTileHost) to make sure we use the right flags
and get the keyguard out of the way so the user always sees the
connect dialog for secure networks when they are sent to settings.
Bug: 18987307
Change-Id: I9027393ab8743e6dfe702221cb3bc1bb4e213708
2015-01-21 20:58:47 +00:00
Alan Viverette
b74155cf01
Avoid ripple buffer creation for empty bounds
...
Bug: 19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
2015-01-21 12:30:49 -08:00
Robert Greenwalt
52f25f7b30
am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f
...
* commit 'b73f431dddc0ba9260a342f2322e818460cf6f34':
Add + code handling logic for SMS Global Roaming
2015-01-21 20:01:50 +00:00
Robert Greenwalt
b73f431ddd
Merge "Add + code handling logic for SMS Global Roaming"
...
automerge: f19176f
2015-01-21 19:56:25 +00:00
Robert Greenwalt
f19176ff2f
Merge "Add + code handling logic for SMS Global Roaming"
2015-01-21 19:52:21 +00:00
Andrew Solovay
78f4342fac
Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
2015-01-21 19:20:58 +00:00
Dianne Hackborn
f6b4b1a432
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695
...
automerge: 5346a21#18201239 : ANRs in com.google.process.gapps:
2015-01-21 18:55:12 +00:00
Dianne Hackborn
5346a21bad
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev
...
automerge: 2132695#18201239 : ANRs in com.google.process.gapps:
2015-01-21 18:47:11 +00:00
Dianne Hackborn
213269599b
Merge "Work on issue #18201239 : ANRs in com.google.process.gapps:" into lmp-mr1-dev
2015-01-21 18:41:38 +00:00
Svetoslav
2b2b1a9b89
AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd
...
automerge: 03944ce
2015-01-21 18:39:34 +00:00
Svetoslav
03944ce664
AlertActivity now behaves as a dialog for accessibility purposes.
...
automerge: 76ff4dd
2015-01-21 18:31:46 +00:00
Svetoslav
76ff4dd0de
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
2015-01-21 18:28:03 +00:00
Dianne Hackborn
455625e298
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
2015-01-21 09:55:13 -08:00
Nicolas Prevot
daf92066db
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
2015-01-21 17:53:11 +00:00
