Chad Brubaker
bb656a2dbe
Allow ephemeral apps to access SOUND_EFFECTS_ENABLED
...
Test: Manual
Change-Id: I9e574f35b5f007cf62665a60f075fc8ee5096158
2017-01-30 10:28:43 -08:00
TreeHugger Robot
3416cc2800
Merge "mediaplayer: add buffering settings API"
2017-01-25 21:53:32 +00:00
Jerry Zhang
5b15e37678
Merge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0" into nyc-mr2-dev-plus-aosp
...
am: 7fef16ff24
2017-01-25 21:41:30 +00:00
Jerry Zhang
8f5f089457
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0
...
am: 473e3953f5
2017-01-25 21:41:25 +00:00
Josh Gao
8d2f9e0cf3
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49 am: e801810553 am: a07e5312cc
...
am: 0ebf87e3e7
2017-01-25 21:39:57 +00:00
Jerry Zhang
40832f9be2
Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 4882496232 -s ours
...
am: 270c4bcd86
2017-01-25 21:32:16 +00:00
Jerry Zhang
86d39a602c
Clean up persistent usb state on boot. am: bfc5d563aa -s ours
...
am: 6cf9bfde00
2017-01-25 21:31:24 +00:00
Android Build Merger (Role)
7fef16ff24
Merge "Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0" into nyc-mr2-dev-plus-aosp
2017-01-25 21:31:12 +00:00
Jerry Zhang
469fc8cb94
Fixed handling of usb state during adb changes. am: 541295a9a5 -s ours
...
am: e5a8b4f12c
2017-01-25 21:30:08 +00:00
Jerry Zhang
473e3953f5
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev
...
am: 55772c73c0
2017-01-25 21:30:07 +00:00
Josh Gao
0ebf87e3e7
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49 am: e801810553
...
am: a07e5312cc
2017-01-25 21:30:03 +00:00
Josh Gao
a07e5312cc
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set." am: 273b886c49
...
am: e801810553
2017-01-25 21:25:23 +00:00
Jerry Zhang
270c4bcd86
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
...
am: 4882496232
2017-01-25 21:23:54 +00:00
Jerry Zhang
6cf9bfde00
Clean up persistent usb state on boot.
...
am: bfc5d563aa
2017-01-25 21:22:54 +00:00
Jerry Zhang
e5a8b4f12c
Fixed handling of usb state during adb changes.
...
am: 541295a9a5
2017-01-25 21:22:07 +00:00
Josh Gao
e801810553
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
...
am: 273b886c49
2017-01-25 21:21:29 +00:00
Josh Gao
273b886c49
Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
2017-01-25 21:16:58 +00:00
Dianne Hackborn
c5d458930c
Merge "Add some new experiment constants for activity and power manager."
2017-01-25 21:12:12 +00:00
Shuzhen Wang
b44dee8e22
Merge "Camera2: Handle (0, 0) size for deferred OutputConfiguration"
2017-01-25 21:05:45 +00:00
Abodunrinwa Toki
e363f427f8
Merge "Implement TextClassifierImpl.getLinks"
2017-01-25 21:05:03 +00:00
Winson Chung
8779446466
Skip resizing the stack when there is no current bounds.
...
- When initially calling loadConfigurationsAndApply(), the state is
set to STATE_NO_PIP when there is no pinned stack. As of change
ag/1725150, resizeStack no longer fails silently when there is no
such stack to resize. This CL skips the call to resizeStack() when
the PiP mode is set to STATE_NO_PIP.
Bug: 34692144
Test: Try and launch Fugu
Change-Id: Ic539f4431c2f94e7c10520c383fa49157d1d0631
2017-01-25 21:03:59 +00:00
Jerry Zhang
55772c73c0
Merge changes from topic 'usb_bugfix' into nyc-mr2-dev
...
* changes:
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
Clean up persistent usb state on boot.
Fixed handling of usb state during adb changes.
2017-01-25 20:30:22 +00:00
George Burgess IV
85895792f0
Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7 am: 0c6283e396
...
am: 858852a6dc
2017-01-25 20:23:58 +00:00
Shuzhen Wang
e56e606f82
Camera2: Handle (0, 0) size for deferred OutputConfiguration
...
We need to handle below sequence of events:
1. OutputConfiguration(Size(0, 0), klass)
2. addSurface(surface)
3. createCameraCaptureSession
In this case, allow the addSurface() to succeed.
Test: camera works in keep/hangouts/contacts
Bug: 34697112
Change-Id: I726c60cce9a11c69b050aad47f4ed4a0a7a0870e
2017-01-25 12:22:01 -08:00
Mark Rathjen
8bd8564a18
Merge "Resolve Android security comments for Android ID migration."
2017-01-25 20:20:29 +00:00
TreeHugger Robot
a92c180107
Merge "Also parse "1" as true for ContentValues#getAsBoolean"
2017-01-25 20:19:11 +00:00
George Burgess IV
858852a6dc
Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7
...
am: 0c6283e396
2017-01-25 20:19:05 +00:00
George Burgess IV
0c6283e396
Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206
...
am: f77f2cb3e7
2017-01-25 20:14:00 +00:00
Android Build Merger (Role)
73c945de33
Merge "Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0 am: deac669a53"
2017-01-25 20:13:03 +00:00
TreeHugger Robot
260dedceda
Merge "[clipboard] Clipboard sharing"
2017-01-25 20:12:17 +00:00
Ruchi Kandoi
2a13fbae73
Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0
...
am: deac669a53
2017-01-25 20:12:06 +00:00
George Burgess IV
f77f2cb3e7
Merge "Fix a use-of-uninitialized-value warning."
...
am: 500cf67206
2017-01-25 20:09:26 +00:00
Ruchi Kandoi
deac669a53
Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614
...
am: 40c14a83d0
2017-01-25 20:07:23 +00:00
Josh Gao
59972218f8
zygote: don't drop CAP_SYS_PTRACE from the bounding set.
...
crash_dump needs to acquire CAP_SYS_PTRACE to be able to ptrace
processes with capabilities. selinux should hopefully be sufficient for
restricting ptrace to processes that should do it.
Bug: http://b/34694637
Test: debuggerd `pidof system_server`
Change-Id: If46f0b9baa54529780f7767f309f76b102a42ab4
2017-01-25 12:03:02 -08:00
Ruchi Kandoi
40c14a83d0
Merge "nfc: Make NDEF validation stricter" am: f3a6269fed
...
am: e6cb2aa614
2017-01-25 20:03:00 +00:00
Treehugger Robot
500cf67206
Merge "Fix a use-of-uninitialized-value warning."
2017-01-25 20:01:34 +00:00
Ruchi Kandoi
e6cb2aa614
Merge "nfc: Make NDEF validation stricter"
...
am: f3a6269fed
2017-01-25 19:59:16 +00:00
Rubin Xu
1b60614ae9
Merge "Fix build breakage"
2017-01-25 19:56:40 +00:00
Jason Monk
d5e96800d2
Merge "Fix up the tests (yet again)"
2017-01-25 19:55:37 +00:00
Wei Jia
23dfee521a
mediaplayer: add buffering settings API
...
Test: compiles, ensured that params is passed all the way to source
Bug:32524218
Change-Id: I90d65e10012ecc1a78989eba80d025d513ceaadf
2017-01-25 11:54:56 -08:00
Treehugger Robot
f3a6269fed
Merge "nfc: Make NDEF validation stricter"
2017-01-25 19:54:01 +00:00
Selim Cinek
6825542381
Merge "Started visual hierarchy for min priority notifications"
2017-01-25 19:53:49 +00:00
TreeHugger Robot
000f7cd646
Merge "Initial IME integration."
2017-01-25 19:44:33 +00:00
TreeHugger Robot
13fd7f1899
Merge "Fix issue with PiP hiding when dragging divider."
2017-01-25 19:31:56 +00:00
TreeHugger Robot
79e5cf1cc7
Merge "Fixing issue with wrong bounds being reported in StackInfo."
2017-01-25 19:29:00 +00:00
TreeHugger Robot
142cbdd474
Merge "Expose intents for launching channel settings."
2017-01-25 19:20:21 +00:00
TreeHugger Robot
fbcb01cde7
Merge "Move theme out of tuner and into display settings"
2017-01-25 19:17:22 +00:00
Rubin Xu
06c39bc07f
Fix build breakage
...
Implement new methods in MockStorageManager
Test: it builds
Change-Id: Icdd49a1b6709ab63a8b00328b9da8120482bbc8a
2017-01-25 19:13:27 +00:00
Evan Rosky
df7f283520
Merge "Changed cluster kb navigation shortcut to meta+[shift]+tab"
2017-01-25 19:04:22 +00:00
Robert Sesek
037e758db5
Merge changes I100dac6b,Ibbecac7e
...
* changes:
Enable multiprocess WebView by default.
Prepare to enable multiprocess by default.
2017-01-25 19:00:44 +00:00
