OSDN Git Service
Bill Yi [Thu, 18 May 2017 18:09:54 +0000 (11:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibad5c6b398c06b5dd61e9c41b9cf7388e48d7e63
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 17 May 2017 22:18:21 +0000 (22:18 +0000)]
Merge "Fix incorrect documentation on TvContract.buildProgramsUriForChannel()"
Colin Cross [Wed, 17 May 2017 22:10:02 +0000 (22:10 +0000)]
Merge "Convert libsoundpool to Android.bp" am:
dde9ee9edd am:
e9ffa404ae am:
13ea256d71
am:
0bd45d3f2c -s ours
Change-Id: If02ccea2cf3276521969a2b38a56b2f16195286a
Colin Cross [Wed, 17 May 2017 22:03:06 +0000 (22:03 +0000)]
Merge "Convert libsoundpool to Android.bp" am:
dde9ee9edd am:
e9ffa404ae
am:
13ea256d71
Change-Id: I8af55458b0bba29701249f7a8165f30055262f46
Colin Cross [Wed, 17 May 2017 21:55:19 +0000 (21:55 +0000)]
Merge "Convert libsoundpool to Android.bp" am:
dde9ee9edd
am:
e9ffa404ae
Change-Id: I792b4f48d57181b4ee55b2a73c597272826844e2
Colin Cross [Wed, 17 May 2017 21:45:33 +0000 (21:45 +0000)]
Merge "Convert libsoundpool to Android.bp"
am:
dde9ee9edd
Change-Id: Ia7bb54b658031c68036ee2a218e5b229d32b1d25
Treehugger Robot [Wed, 17 May 2017 21:31:16 +0000 (21:31 +0000)]
Merge "Convert libsoundpool to Android.bp"
Lei Yu [Wed, 17 May 2017 21:10:27 +0000 (21:10 +0000)]
Merge "Add settings constants for anomaly detection"
Jonathan Solnit [Wed, 17 May 2017 21:01:41 +0000 (21:01 +0000)]
Merge "Only launch on camera lift from locked or asleep"
Phil Weaver [Wed, 17 May 2017 20:55:06 +0000 (20:55 +0000)]
Merge "Match attributes to actions for pip a11y" into oc-dev am:
95cf170ce9
am:
b5c21e85d9
Change-Id: I442b3b3552c5439dad36fcd2ef319f1fb8a23afc
Tyler Gunn [Wed, 17 May 2017 20:40:29 +0000 (20:40 +0000)]
Merge "Add config option to enable/disable pause workaround." into oc-dev am:
93db1a698c
am:
3f71b1492e
Change-Id: I2d66953d5a5defc7eac1f585e706359523e2e0de
Phil Weaver [Wed, 17 May 2017 20:32:26 +0000 (20:32 +0000)]
Merge "Match attributes to actions for pip a11y" into oc-dev
am:
95cf170ce9
Change-Id: I992904b2062bed551ea0587797b99fc26b74711f
Phil Weaver [Wed, 17 May 2017 20:25:44 +0000 (20:25 +0000)]
Merge "Match attributes to actions for pip a11y" into oc-dev
Colin Cross [Tue, 16 May 2017 20:08:19 +0000 (13:08 -0700)]
Convert libsoundpool to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
Merged-In: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
(cherry picked from commit
98c127f8cc652d1179871ad47cac99d15ea1a5a0)
Tyler Gunn [Wed, 17 May 2017 20:21:43 +0000 (20:21 +0000)]
Merge "Add config option to enable/disable pause workaround." into oc-dev
am:
93db1a698c
Change-Id: Ie7acf6e3ed77d28c2d1ccfdb690f559987d3b6cf
Colin Cross [Wed, 17 May 2017 20:15:15 +0000 (20:15 +0000)]
Merge "Convert libsoundpool to Android.bp"
Android Build Merger (Role) [Wed, 17 May 2017 20:05:26 +0000 (20:05 +0000)]
Merge "Merge "We notify VR Core when a 2D intent is running in VR in persistent mode." into oc-dev am:
13fb1d3471 am:
11a2a5097b"
Tyler Gunn [Wed, 17 May 2017 20:05:16 +0000 (20:05 +0000)]
Merge "Add config option to enable/disable pause workaround." into oc-dev
Alex Sakhartchouk [Wed, 17 May 2017 20:03:44 +0000 (20:03 +0000)]
Merge "We notify VR Core when a 2D intent is running in VR in persistent mode." into oc-dev am:
13fb1d3471
am:
11a2a5097b
Change-Id: Ie9c83935480672d997e356b815af9625dee967f6
Android Build Merger (Role) [Wed, 17 May 2017 20:03:20 +0000 (20:03 +0000)]
Merge "Merge "AAPT2: Update locale script filtering logic" into oc-dev am:
3cd6e0bee5 am:
9d6a0d73e6"
Adam Lesinski [Wed, 17 May 2017 20:02:29 +0000 (20:02 +0000)]
Merge "AAPT2: Update locale script filtering logic" into oc-dev am:
3cd6e0bee5
am:
9d6a0d73e6
Change-Id: I0275456778a39ebf3627f0aa848065e8fc9e0db2
Winson Chung [Wed, 17 May 2017 19:55:36 +0000 (19:55 +0000)]
Merge "Fix call to get the current user id from a secondary SystemUI process." into oc-dev am:
2349481d62
am:
1539f47e44
Change-Id: Ieabaad68e518aa1b5a4c38058c1724d9d2ea6d63
Alex Sakhartchouk [Wed, 17 May 2017 19:54:08 +0000 (19:54 +0000)]
Merge "We notify VR Core when a 2D intent is running in VR in persistent mode." into oc-dev
am:
13fb1d3471
Change-Id: If884fd4aa24911db3652926f0941f58048c58448
Chris Tate [Wed, 17 May 2017 19:48:07 +0000 (19:48 +0000)]
Merge "Be resilient to restoring unintelligible network templates"
TreeHugger Robot [Wed, 17 May 2017 19:43:53 +0000 (19:43 +0000)]
Merge "We notify VR Core when a 2D intent is running in VR in persistent mode." into oc-dev
Antony Sargent [Wed, 17 May 2017 19:41:08 +0000 (19:41 +0000)]
Merge "Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev am:
c695e44866" into oc-dev-plus-aosp
am:
5da64d33d9
Change-Id: I685dd7cc62810fbe2fa277ca40869e5e4d0566a2
Michael Wachenschwanz [Wed, 17 May 2017 19:31:35 +0000 (19:31 +0000)]
Merge "Merge "Purge Nonexistent User Jobs on Boot" into oc-dev am:
a61f09f657" into oc-dev-plus-aosp
am:
414acfc033
Change-Id: I9eabccc26062dcbd6dccc56f031b02086da2bcf6
Adam Lesinski [Wed, 17 May 2017 19:28:43 +0000 (19:28 +0000)]
Merge "AAPT2: Update locale script filtering logic" into oc-dev
am:
3cd6e0bee5
Change-Id: Ie5377066de50d828f9f0a183c9dab4ee41f433eb
Winson Chung [Wed, 17 May 2017 19:26:24 +0000 (19:26 +0000)]
Merge "Fix call to get the current user id from a secondary SystemUI process." into oc-dev
am:
2349481d62
Change-Id: I65bea4faf799ea1b5d02ff1c4c514485f174ff1f
Phil Weaver [Wed, 17 May 2017 19:25:02 +0000 (19:25 +0000)]
Merge "Merge "Stop system process crash in TouchExplorer" into oc-dev am:
be70141ed6" into oc-dev-plus-aosp
am:
d41454b684
Change-Id: I9e530a29daed0393c482255eebac0079857becf5
Android Build Merger (Role) [Wed, 17 May 2017 19:21:08 +0000 (19:21 +0000)]
Merge "Merge "Merge "Optimize App -> Recents" into oc-dev am:
22f8290879" into oc-dev-plus-aosp am:
dcfc1aaab5 -s ours"
Tomasz Wasilczyk [Wed, 17 May 2017 19:20:41 +0000 (19:20 +0000)]
Merge changes from topic 'radio-service-6-b'
* changes:
Use ParcelableException to carry RuntimeException over AIDL.
Optimize getProgramList call.
Jorim Jaggi [Wed, 17 May 2017 19:20:13 +0000 (19:20 +0000)]
Merge "Merge "Optimize App -> Recents" into oc-dev am:
22f8290879" into oc-dev-plus-aosp
am:
dcfc1aaab5 -s ours
Change-Id: I109b07b5e7f3aadbe454525190b8c1f1cbe0dfbb
Adam Lesinski [Wed, 17 May 2017 19:15:59 +0000 (19:15 +0000)]
Merge "AAPT2: Update locale script filtering logic" into oc-dev
Android Build Merger (Role) [Wed, 17 May 2017 19:14:11 +0000 (19:14 +0000)]
Merge "Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev am:
c695e44866" into oc-dev-plus-aosp
Antony Sargent [Wed, 17 May 2017 19:12:24 +0000 (19:12 +0000)]
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
am:
c695e44866
Change-Id: I26f967140184851eb61ddd8def352133995f3637
Android Build Merger (Role) [Wed, 17 May 2017 19:11:55 +0000 (19:11 +0000)]
Merge "Merge "Purge Nonexistent User Jobs on Boot" into oc-dev am:
a61f09f657" into oc-dev-plus-aosp
Michael Wachenschwanz [Wed, 17 May 2017 19:10:44 +0000 (19:10 +0000)]
Merge "Purge Nonexistent User Jobs on Boot" into oc-dev
am:
a61f09f657
Change-Id: Ic96e165de9014b1d56ac322fcf2918458b1dd251
Winson Chung [Wed, 17 May 2017 19:10:35 +0000 (19:10 +0000)]
Merge "Fix call to get the current user id from a secondary SystemUI process." into oc-dev
Android Build Merger (Role) [Wed, 17 May 2017 19:10:15 +0000 (19:10 +0000)]
Merge "Merge "Stop system process crash in TouchExplorer" into oc-dev am:
be70141ed6" into oc-dev-plus-aosp
Phil Weaver [Wed, 17 May 2017 19:09:11 +0000 (19:09 +0000)]
Merge "Stop system process crash in TouchExplorer" into oc-dev
am:
be70141ed6
Change-Id: I9b708860ca7fbb51088248b35fb8f88e771fa759
Android Build Merger (Role) [Wed, 17 May 2017 19:08:43 +0000 (19:08 +0000)]
Merge "Merge "Optimize App -> Recents" into oc-dev am:
22f8290879" into oc-dev-plus-aosp
Jorim Jaggi [Wed, 17 May 2017 19:07:36 +0000 (19:07 +0000)]
Merge "Optimize App -> Recents" into oc-dev
am:
22f8290879
Change-Id: Ia9c279622c7b470679bc29e7372f190937684aae
TreeHugger Robot [Wed, 17 May 2017 18:59:48 +0000 (18:59 +0000)]
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
Jorim Jaggi [Wed, 17 May 2017 18:58:16 +0000 (18:58 +0000)]
Merge "Optimize App -> Recents" into oc-dev am:
22f8290879
am:
e7d1c65a3c -s ours
Change-Id: Ie2828bc7abf0c3caef2d10c87770be75a1e7f3e8
Michael Wachenschwanz [Wed, 17 May 2017 18:58:06 +0000 (18:58 +0000)]
Merge "Purge Nonexistent User Jobs on Boot" into oc-dev
Phil Weaver [Wed, 17 May 2017 18:53:43 +0000 (18:53 +0000)]
Merge "Stop system process crash in TouchExplorer" into oc-dev
Philip Quinn [Wed, 17 May 2017 18:52:14 +0000 (18:52 +0000)]
Merge "Remove unused settings."
Marc Hittinger [Wed, 17 May 2017 18:51:52 +0000 (18:51 +0000)]
Merge "Update defaults for isHighEndGfx settings."
Philip Quinn [Tue, 16 May 2017 01:19:10 +0000 (18:19 -0700)]
Remove unused settings.
Bug:
38164441
Test: make -j
Change-Id: I8194f1937c74b93c442153cea19c622877fb8a5b
Roshan Pius [Wed, 17 May 2017 18:43:48 +0000 (18:43 +0000)]
Merge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev am:
26ff5a67ee
am:
f26430a0d8
Change-Id: I31f6e7d74604debe70b1f83ce4436c9e284c4307
Jorim Jaggi [Wed, 17 May 2017 18:32:10 +0000 (18:32 +0000)]
Merge "Optimize App -> Recents" into oc-dev
am:
22f8290879
Change-Id: Ia3e69d2654e2dcf3e3cb60b45c12a0271d141af2
Aurimas Liutikas [Wed, 17 May 2017 18:31:20 +0000 (18:31 +0000)]
Merge "Fix TimePicker crash on rotation." into oc-dev am:
690691336d
am:
4e831d9e64
Change-Id: I12d574d787fd5c06129ba1bf88d97ff2c324432b
Roshan Pius [Wed, 17 May 2017 18:28:51 +0000 (18:28 +0000)]
Merge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev
am:
26ff5a67ee
Change-Id: I73ea001fb5deab02beb2d7c1ffc1d4330e8929a8
Android Build Merger (Role) [Wed, 17 May 2017 18:27:21 +0000 (18:27 +0000)]
Merge "Merge "Fix for Bluetooth not restarting on User Switch" am:
196b72aae5 am:
543261753a am:
5100f55b8b am:
1079411cde"
Ram Periathiruvadi [Wed, 17 May 2017 18:26:26 +0000 (18:26 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch" am:
196b72aae5 am:
543261753a am:
5100f55b8b
am:
1079411cde
Change-Id: I3bfb9095920762253f6aa16a7b27072a480a5279
Android Build Merger (Role) [Wed, 17 May 2017 18:25:51 +0000 (18:25 +0000)]
Merge "Merge "Convert libmedia_jni to Android.bp" am:
85faffa7ef am:
162d19f590 am:
7eb3f1c1c4 -s ours am:
694d492664 -s ours"
Colin Cross [Wed, 17 May 2017 18:24:48 +0000 (18:24 +0000)]
Merge "Convert libmedia_jni to Android.bp" am:
85faffa7ef am:
162d19f590 am:
7eb3f1c1c4 -s ours
am:
694d492664 -s ours
Change-Id: Ic798c8f3473405a0fac8306c1ab7db89f2604efb
Android Build Merger (Role) [Wed, 17 May 2017 18:24:03 +0000 (18:24 +0000)]
Merge "Merge "Add tethering offload HAL call via JNI" am:
8f65e470b0 am:
f421d60824 am:
c967d56ad7 -s ours am:
f11e70418c -s ours"
Aurimas Liutikas [Wed, 17 May 2017 18:23:34 +0000 (18:23 +0000)]
Merge "Fix TimePicker crash on rotation." into oc-dev
am:
690691336d
Change-Id: I942187e2c3f852ce992c421e8b45581833818ccb
Erik Kline [Wed, 17 May 2017 18:23:09 +0000 (18:23 +0000)]
Merge "Add tethering offload HAL call via JNI" am:
8f65e470b0 am:
f421d60824 am:
c967d56ad7 -s ours
am:
f11e70418c -s ours
Change-Id: Iab8e98fdc4d7e4cf682dd4dffec3d64e6cef2556
Android Build Merger (Role) [Wed, 17 May 2017 18:22:22 +0000 (18:22 +0000)]
Merge "Merge "Merge "Add the new RIL requests and NetworkScanResult." am:
0727abc423 am:
a37b511b67 am:
7ae9c06663" into oc-dev-plus-aosp am:
08be35b954"
Ying Xu [Wed, 17 May 2017 18:20:27 +0000 (18:20 +0000)]
Merge "Merge "Add the new RIL requests and NetworkScanResult." am:
0727abc423 am:
a37b511b67 am:
7ae9c06663" into oc-dev-plus-aosp
am:
08be35b954
Change-Id: I11ac85bab6a1c5b8202954d832515a99c32e3f61
Android Build Merger (Role) [Wed, 17 May 2017 18:19:26 +0000 (18:19 +0000)]
Merge "Merge "Add the new RIL requests and NetworkScanResult." into oc-dev-plus-aosp am:
f23578dae3 -s ours"
Ying Xu [Wed, 17 May 2017 18:17:19 +0000 (18:17 +0000)]
Merge "Add the new RIL requests and NetworkScanResult." into oc-dev-plus-aosp
am:
f23578dae3 -s ours
Change-Id: I5fc651038a52470d68230d29702e8f118870c4c8
TreeHugger Robot [Wed, 17 May 2017 18:16:34 +0000 (18:16 +0000)]
Merge "Fix the documentation of onTimeShiftGetCurrentPosition()"
TreeHugger Robot [Wed, 17 May 2017 18:15:37 +0000 (18:15 +0000)]
Merge "Optimize App -> Recents" into oc-dev
Roshan Pius [Wed, 17 May 2017 18:14:30 +0000 (18:14 +0000)]
Merge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 18:09:47 +0000 (18:09 +0000)]
Merge "Fix TimePicker crash on rotation." into oc-dev
Dongwon Kang [Tue, 16 May 2017 22:44:43 +0000 (15:44 -0700)]
Fix incorrect documentation on TvContract.buildProgramsUriForChannel()
Test: documentation fix
Bug:
36791800
Change-Id: I601c72a0f65d53201aadad48c0c368b46431c895
Ram Periathiruvadi [Wed, 17 May 2017 17:51:52 +0000 (17:51 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch" am:
196b72aae5 am:
543261753a
am:
5100f55b8b
Change-Id: I7e897d209b648c583d271904cf6fdcf6c3d227c3
Alex Sakhartchouk [Wed, 17 May 2017 16:34:53 +0000 (12:34 -0400)]
We notify VR Core when a 2D intent is running in VR in persistent mode.
One of the paths that sends these notifications incorrectly indicated
that a VR app was not running. Fix the callsite to include the current
VR component instead of null.
Bug:
38004624
Test: Launch VR app, verify null component is not sent to VR core
while it's running.
Change-Id: I0589ee51952a503bfddec214999ed5bce48715ba
Winson Chung [Wed, 17 May 2017 17:46:49 +0000 (10:46 -0700)]
Fix call to get the current user id from a secondary SystemUI process.
- The secondary SystemUI process's KeyguardUpdateMonitor is not updated
so we can't rely on it to get the current user id.
Bug:
38372598
Test: Switch users, launch some tasks, and switch back. Ensure that original
tasks still exist
Change-Id: I26a7c70b5f7032a106dc1342c8b366e4797e8fa0
Colin Cross [Wed, 17 May 2017 17:43:19 +0000 (17:43 +0000)]
Merge "Convert libmedia_jni to Android.bp" am:
85faffa7ef am:
162d19f590
am:
7eb3f1c1c4 -s ours
Change-Id: If30e083b58365ad922732fc86beaf2f03209cf88
Ram Periathiruvadi [Wed, 17 May 2017 17:41:05 +0000 (17:41 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch" am:
196b72aae5
am:
543261753a
Change-Id: I008ff84f3d3eb0b7c51993d213a9d3a590cd93a6
Erik Kline [Wed, 17 May 2017 17:37:25 +0000 (17:37 +0000)]
Merge "Add tethering offload HAL call via JNI" am:
8f65e470b0 am:
f421d60824
am:
c967d56ad7 -s ours
Change-Id: Ic1c1ab0a51459e390e8607217be8f0c6ef0c2bde
Android Build Merger (Role) [Wed, 17 May 2017 17:34:30 +0000 (17:34 +0000)]
Merge "Merge "Add the new RIL requests and NetworkScanResult." am:
0727abc423 am:
a37b511b67 am:
7ae9c06663" into oc-dev-plus-aosp
Ram Periathiruvadi [Wed, 17 May 2017 17:33:28 +0000 (17:33 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch"
am:
196b72aae5
Change-Id: Id0ef82b93b047f13683f7538740f0544549b0eca
Christopher Tate [Mon, 15 May 2017 23:34:52 +0000 (16:34 -0700)]
Be resilient to restoring unintelligible network templates
Some OEMs have introduced incompatible network bookkeeping. We now
detect and ignore those network definitions at restore time.
In addition, we now
* log when an undefined network match type is used to construct a
NetworkTemplate instance, and
* quietly refuse to match such a NetworkTemplate against any known
network identifier, rather than crashing the inquiring app.
Bug
38151335
Test: manual
Change-Id: I565b6f6b87df1f13a8c0c01ae6049bda270b1e48
Ying Xu [Wed, 17 May 2017 17:32:33 +0000 (17:32 +0000)]
Merge "Add the new RIL requests and NetworkScanResult." am:
0727abc423 am:
a37b511b67
am:
7ae9c06663
Change-Id: I83e6c2b31964625e0beb594d8e440ff5a56359f3
Ying Xu [Wed, 17 May 2017 17:30:28 +0000 (17:30 +0000)]
Merge "Add the new RIL requests and NetworkScanResult." into oc-dev-plus-aosp
Jonathan Solnit [Wed, 17 May 2017 17:28:13 +0000 (10:28 -0700)]
Only launch on camera lift from locked or asleep
Test: Tried gesture when device is awake, locked, and asleep
Change-Id: I8af8eeb18966e8aadbba83681fa5481f8a7ef432
Treehugger Robot [Wed, 17 May 2017 17:24:02 +0000 (17:24 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch"
Jim Van Verth [Wed, 17 May 2017 16:58:17 +0000 (16:58 +0000)]
Merge "Update to new SkShadowUtils interface"
Tomasz Wasilczyk [Mon, 15 May 2017 22:45:03 +0000 (15:45 -0700)]
Use ParcelableException to carry RuntimeException over AIDL.
Test: instrumentation
Bug: b/
36863239
Change-Id: Iff55c0d188c360c8bf8ec74de560c42af6fa998d
Tomasz Wasilczyk [Mon, 15 May 2017 20:40:56 +0000 (13:40 -0700)]
Optimize getProgramList call.
Test: instrumentation
Bug: b/
36863239
Change-Id: I1a15689bb812fa5db618310a2a7f2950d05da112
George Mount [Wed, 17 May 2017 16:37:55 +0000 (16:37 +0000)]
Merge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev am:
7415a5941b
am:
93ad5e0f88
Change-Id: If32172a299096dcaf180d43a10523a22e3b0903a
George Mount [Wed, 17 May 2017 16:26:40 +0000 (16:26 +0000)]
Merge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev
am:
7415a5941b
Change-Id: I14c0522ab05ba5cea0d1800dd45451c8951acd26
TreeHugger Robot [Wed, 17 May 2017 16:18:57 +0000 (16:18 +0000)]
Merge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev
Selim Cinek [Wed, 17 May 2017 16:18:22 +0000 (16:18 +0000)]
Merge changes I858017b8,Ife32b600 into oc-dev am:
63e8bfe1c5
am:
29260fd33b
Change-Id: Ida456542645ab7654705631dcba4d602669372e2
Dongwon Kang [Tue, 16 May 2017 23:45:45 +0000 (16:45 -0700)]
Fix the documentation of onTimeShiftGetCurrentPosition()
Test: documentation fix
Bug:
30254671
Change-Id: If6cb73f6824b9bc6db9aa6eed71319458662be17
Phil Weaver [Tue, 16 May 2017 23:23:18 +0000 (16:23 -0700)]
Stop system process crash in TouchExplorer
We need to straighten out this state machine so we can
fix bugs in it without a high risk of creating others
(b/
38246304). In the meantime, catching this exception at
least allows the device to keep operating.
Bug:
37338581
Test: Reproduced the conditions of the crash. Verified that
we now print the log message.
Change-Id: I1f4f84b5529b2bf638e225d474808e3d42484e78
Selim Cinek [Wed, 17 May 2017 16:09:50 +0000 (16:09 +0000)]
Merge changes I858017b8,Ife32b600 into oc-dev
am:
63e8bfe1c5
Change-Id: Ib280d1e343d5765ea93edcfbc5aae21417e6c590
Tyler Gunn [Mon, 15 May 2017 18:43:25 +0000 (11:43 -0700)]
Add config option to enable/disable pause workaround.
Test: Manual/unit
Bug:
35304446
Change-Id: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
Selim Cinek [Wed, 17 May 2017 15:59:03 +0000 (15:59 +0000)]
Merge changes I858017b8,Ife32b600 into oc-dev
* changes:
Improved the media color extraction algorithm
Fixed broken coretests
TreeHugger Robot [Wed, 17 May 2017 15:55:25 +0000 (15:55 +0000)]
Merge "Add tests for routeSocketDataToOutput."
Andreas Gampe [Wed, 17 May 2017 15:46:26 +0000 (15:46 +0000)]
Merge "PackageManager: Change post-install GC request" into oc-dev am:
89b5189516
am:
0ce0752eac
Change-Id: I5450d0f44c67201e9917f69ec430421d5643f765
Andreas Gampe [Wed, 17 May 2017 15:38:19 +0000 (15:38 +0000)]
Merge "PackageManager: Change post-install GC request" into oc-dev
am:
89b5189516
Change-Id: Iba648c487eeb3fc5a699a641e3bfef9776143466
Colin Cross [Wed, 17 May 2017 15:36:06 +0000 (15:36 +0000)]
Merge "Convert libmedia_jni to Android.bp" am:
85faffa7ef
am:
162d19f590
Change-Id: Iac2f159014051604d36f61dd253fa4e83127030a
TreeHugger Robot [Wed, 17 May 2017 15:32:03 +0000 (15:32 +0000)]
Merge "PackageManager: Change post-install GC request" into oc-dev
OSDN Git Service
