OSDN Git Service
Hugo Benichi [Thu, 18 May 2017 03:22:53 +0000 (03:22 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" am:
3a7c4f3337 am:
3bda223110 am:
80eb47ff61
am:
cf9ab571cd
Change-Id: I4c0d711b34c4bcd69a1811a97fe74053bdc2945a
Hugo Benichi [Thu, 18 May 2017 03:15:50 +0000 (03:15 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" am:
3a7c4f3337 am:
3bda223110
am:
80eb47ff61
Change-Id: I5a8e353d33ed70d6f0627dc8f9cc4d8cda8a6f8b
Hugo Benichi [Thu, 18 May 2017 03:08:46 +0000 (03:08 +0000)]
Merge "Captive portals: reinspect http result after fallback probe" am:
3a7c4f3337
am:
3bda223110
Change-Id: Ib154e58cab427aa60740246f3eef930a09261733
Hugo Benichi [Thu, 18 May 2017 02:58:21 +0000 (02:58 +0000)]
Merge "Captive portals: reinspect http result after fallback probe"
am:
3a7c4f3337
Change-Id: Ia9dfbb764909aeb8586066121ddc8106fa14bb7e
Hugo Benichi [Thu, 18 May 2017 02:50:48 +0000 (02:50 +0000)]
Merge "Captive portals: reinspect http result after fallback probe"
Hugo Benichi [Thu, 18 May 2017 02:47:54 +0000 (02:47 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net" am:
c01fbf0f0c am:
9fdc903af7 am:
777bf77c2c -s ours
am:
fe95db3d1b
Change-Id: Ibba873042627166120f4040896c58e96bff2b085
Hugo Benichi [Thu, 18 May 2017 02:40:26 +0000 (02:40 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net" am:
c01fbf0f0c am:
9fdc903af7
am:
777bf77c2c -s ours
Change-Id: I0f63e4f29228a404ec0dac3571b2474806e4c8d6
Hugo Benichi [Thu, 18 May 2017 02:30:44 +0000 (02:30 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net" am:
c01fbf0f0c
am:
9fdc903af7
Change-Id: I06cec2595d67d029e08e4d556130c5956bfb387e
Hugo Benichi [Thu, 18 May 2017 02:23:12 +0000 (02:23 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net"
am:
c01fbf0f0c
Change-Id: I10ce85211ac0305e8d05ca02b58b819297f59bbf
Jorim Jaggi [Thu, 18 May 2017 02:19:43 +0000 (02:19 +0000)]
Merge "Optimize latency when unlocking phone" into oc-dev am:
b114e4ff82
am:
8792859b60 -s ours
Change-Id: Ib7fbe0457a2637348d695ea3702060a3aee910b4
Jorim Jaggi [Thu, 18 May 2017 02:03:40 +0000 (02:03 +0000)]
Merge "Optimize latency when unlocking phone" into oc-dev
am:
b114e4ff82
Change-Id: Ibf9b7f59c6b5d86116dc4405f6ac22f527eb8f8a
Hugo Benichi [Thu, 18 May 2017 02:01:39 +0000 (02:01 +0000)]
Merge "Move NetworkNotificationManagerTest to tests/net"
Rebecca Silberstein [Thu, 18 May 2017 02:00:06 +0000 (02:00 +0000)]
Merge "WifiManager: add unspecified ip mode" into oc-dev am:
f17d3b89d3
am:
b4f1f290c9
Change-Id: Iaa1474bd24d63e957ae82745b66c7571a5f18433
TreeHugger Robot [Thu, 18 May 2017 01:55:42 +0000 (01:55 +0000)]
Merge "Optimize latency when unlocking phone" into oc-dev
Andrii Kulian [Thu, 18 May 2017 01:53:46 +0000 (01:53 +0000)]
Merge "Don't report displays that are going to be removed" into oc-dev am:
5a270bcd66
am:
d6d0dcd4ce
Change-Id: I38e77e306ffc673b7285fdd8b1b94cafcea9fd6d
Rebecca Silberstein [Thu, 18 May 2017 01:50:40 +0000 (01:50 +0000)]
Merge "WifiManager: add unspecified ip mode" into oc-dev
am:
f17d3b89d3
Change-Id: I0d1db7ecb9cf7edd74d95f73d88b23571b87a27f
Andrii Kulian [Thu, 18 May 2017 01:45:05 +0000 (01:45 +0000)]
Merge "Don't report displays that are going to be removed" into oc-dev
am:
5a270bcd66
Change-Id: Ia6ab4420855c9d1e33b7fc29985fceff7cd154fd
TreeHugger Robot [Thu, 18 May 2017 01:44:30 +0000 (01:44 +0000)]
Merge "WifiManager: add unspecified ip mode" into oc-dev
Andrii Kulian [Thu, 18 May 2017 01:36:12 +0000 (01:36 +0000)]
Merge "Don't report displays that are going to be removed" into oc-dev
Ram Periathiruvadi [Thu, 18 May 2017 01:01:34 +0000 (01:01 +0000)]
Fix for Bluetooth not restarting on User Switch am:
88256d1a8a
am:
f251e9bf0e
Change-Id: Ic634e943c6752a98ac170f4becc23f379e16bdea
Hugo Benichi [Thu, 18 May 2017 00:57:00 +0000 (00:57 +0000)]
Merge "Finish moving NetworkStats tests to tests/net" am:
1ae1b6b960 am:
cd821b231a am:
544bcbe78e
am:
c3367ebcf7
Change-Id: I663f5ae4f1e15bd39e8ed927ac71958818452967
Ram Periathiruvadi [Thu, 18 May 2017 00:52:56 +0000 (00:52 +0000)]
Fix for Bluetooth not restarting on User Switch
am:
88256d1a8a
Change-Id: I70f1ee3d651022a0a7c292c783120ee7e4e4591d
Hugo Benichi [Thu, 18 May 2017 00:48:14 +0000 (00:48 +0000)]
Merge "Finish moving NetworkStats tests to tests/net" am:
1ae1b6b960 am:
cd821b231a
am:
544bcbe78e
Change-Id: I5d9a01a5804a7cc6289253db09078ede00fc0dc5
Hugo Benichi [Thu, 18 May 2017 00:37:40 +0000 (00:37 +0000)]
Merge "Finish moving NetworkStats tests to tests/net" am:
1ae1b6b960
am:
cd821b231a
Change-Id: Ic9f06631a7f937a0f3730b167e5db7d8c0dcf775
Ram Periathiruvadi [Thu, 4 May 2017 02:11:20 +0000 (19:11 -0700)]
Fix for Bluetooth not restarting on User Switch
The flag that keeps track of the Bluetooth adapter status(mEnable) is
not guarded correctly and could go out of sync with the adapter status.
This causes User Switch handling to not function correctly since it
checks for the status of the mEnable flag before restarting Bluetooth.
This fix queries the Bluetooth Adapter for the status instead of using
the mEnable flag.
Bug: b/
37648701
Test: Tested switching users multiple times in both phone and carkit.
Also tested pairing and connection for sanity.
Change-Id: I17facecf8e1de90df11c11d5b0a184f48a0356e4
(cherry picked from commit
7d1203a2f4fdbafe26d33421c3cdd83f07a5fba8)
Hugo Benichi [Thu, 18 May 2017 00:27:06 +0000 (00:27 +0000)]
Merge "Finish moving NetworkStats tests to tests/net"
am:
1ae1b6b960
Change-Id: If85e483d5b44872c10e42ef55ddaf209601c7cfa
Jorim Jaggi [Thu, 18 May 2017 00:24:33 +0000 (00:24 +0000)]
Merge "Fix GraphicBuffer leaks in system_server" into oc-dev am:
a40bb1ed4a
am:
ec182d7d1b
Change-Id: I8bb3949bdd5be5fc4357998de4d8073594eed3ac
Wale Ogunwale [Thu, 18 May 2017 00:18:34 +0000 (00:18 +0000)]
Merge "Reset hidden state of AppToken that was cleared due to starting window" into oc-dev am:
a36e3a1320
am:
eed78264ed
Change-Id: I15f93756b44d94baeb71fa2ce73f337a92c3d213
Jorim Jaggi [Thu, 18 May 2017 00:13:52 +0000 (00:13 +0000)]
Merge "Fix GraphicBuffer leaks in system_server" into oc-dev
am:
a40bb1ed4a
Change-Id: Iefb739b06406216a943c9f3ac31fed48cd3eb53b
Hugo Benichi [Thu, 18 May 2017 00:09:53 +0000 (00:09 +0000)]
Merge "Finish moving NetworkStats tests to tests/net"
Wale Ogunwale [Thu, 18 May 2017 00:07:28 +0000 (00:07 +0000)]
Merge "Reset hidden state of AppToken that was cleared due to starting window" into oc-dev
am:
a36e3a1320
Change-Id: I873f31c2a9c5a2ec2236f4efe6d3259b01963faf
TreeHugger Robot [Wed, 17 May 2017 23:55:21 +0000 (23:55 +0000)]
Merge "Fix GraphicBuffer leaks in system_server" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 23:54:48 +0000 (23:54 +0000)]
Merge "Reset hidden state of AppToken that was cleared due to starting window" into oc-dev
Jorim Jaggi [Mon, 15 May 2017 00:40:05 +0000 (02:40 +0200)]
Optimize latency when unlocking phone
Latency when unlocking the phone regressed a bit for two reasons:
- For lockscreen -> app we now have to create a full starting
window containing the snapshot, while previously this was just
showing a surface.
- For lockscreen -> home, we can't use the saved surface anymore
because currently we don't support snapshotting translucent
activities. However, in the long term, we want home screen to be
more involved into transitions anyways, so we'll have to wait for
the first frame draw anyways.
However, crystal ball trainee developer Jorim added some
artificial latency in this transition 3 years ago, because he knew
that it is going to be an issue at some point so we have some
headroom to improve! Genius! On a more serious note, it was because
he didn't understand how to read systraces with binders involved (to
be fair, there was also no binder tracing).
Now, we can completely fix the introduces latencies above by
removing this latency of 100ms, and we are 30-70ms better than
before! However, this requires a lot of discipline in SystemUI.
Currently, the callback to dismiss Keyguard takes around 30ms. By
moving all non-essential binder calls of the main thread or to the
next frame, we bring this down to 5ms, such that window animation
and Keyguard animation starts about at the same time.
Test: Take systrace, unlock phone...profit!
Fixes:
38294347
Change-Id: I481fe4ecf358ed09f7142dd9e7ecd290b53c500c
Merged-In: I3ea672bc2eca47221bc6c9f3d7c56b6899df207d
Jorim Jaggi [Wed, 17 May 2017 23:46:28 +0000 (23:46 +0000)]
Merge "Optimize latency when unlocking phone"
Adam Lesinski [Wed, 17 May 2017 23:22:27 +0000 (23:22 +0000)]
Merge "AAPT2: Respect format attr in <array> resource" into oc-dev am:
dc6da8b4df
am:
e768ad3708
Change-Id: Idc3e83275630f73b5859a86e5101afa982241cbd
Jean-Michel Trivi [Wed, 17 May 2017 23:20:16 +0000 (23:20 +0000)]
Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev am:
1daffb7aac
am:
75b7449b56
Change-Id: I376259e8a0befd910429cbcc00e93cf04be0d225
Adam Lesinski [Wed, 17 May 2017 23:11:04 +0000 (23:11 +0000)]
Merge "AAPT2: Respect format attr in <array> resource" into oc-dev
am:
dc6da8b4df
Change-Id: Ic7aa094d3d663d98fa4bc20eaf436f1f453da5d7
Jean-Michel Trivi [Wed, 17 May 2017 23:03:57 +0000 (23:03 +0000)]
Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev
am:
1daffb7aac
Change-Id: I673355773a045c40f72d9b3a8d93ae667f739491
Adam Lesinski [Wed, 17 May 2017 22:52:20 +0000 (22:52 +0000)]
Merge "AAPT2: Respect format attr in <array> resource" into oc-dev
Jean-Michel Trivi [Wed, 17 May 2017 22:51:35 +0000 (22:51 +0000)]
Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev
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
Jorim Jaggi [Mon, 15 May 2017 00:40:05 +0000 (02:40 +0200)]
Optimize latency when unlocking phone
Latency when unlocking the phone regressed a bit for two reasons:
- For lockscreen -> app we now have to create a full starting
window containing the snapshot, while previously this was just
showing a surface.
- For lockscreen -> home, we can't use the saved surface anymore
because currently we don't support snapshotting translucent
activities. However, in the long term, we want home screen to be
more involved into transitions anyways, so we'll have to wait for
the first frame draw anyways.
However, crystal ball trainee developer Jorim added some
artificial latency in this transition 3 years ago, because he knew
that it is going to be an issue at some point so we have some
headroom to improve! Genius! On a more serious note, it was because
he didn't understand how to read systraces with binders involved (to
be fair, there was also no binder tracing).
Now, we can completely fix the introduces latencies above by
removing this latency of 100ms, and we are 30-70ms better than
before! However, this requires a lot of discipline in SystemUI.
Currently, the callback to dismiss Keyguard takes around 30ms. By
moving all non-essential binder calls of the main thread or to the
next frame, we bring this down to 5ms, such that window animation
and Keyguard animation starts about at the same time.
Test: Take systrace, unlock phone...profit!
Change-Id: I3ea672bc2eca47221bc6c9f3d7c56b6899df207d
Fixes:
38294347
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
Jorim Jaggi [Tue, 16 May 2017 20:26:02 +0000 (22:26 +0200)]
Fix GraphicBuffer leaks in system_server
IWindowId is being kept alive by binder in certain cases, which
will leak WindowState, which can leak a whole lot including
the snapshot GraphicBuffer.
- Fix a leak in WindowContainer.mTmpChain1/2
- When the window gets removed, make sure to release the reference
to the window state so even if Binder keeps IWindowId alive, we
don't keep WindowState alive
- Make sure that even if we leak TaskSnapshotSurface we don't leak
the GraphicBuffer.
Test: Boot, some basic sanity testing.
Bug:
36279079
Change-Id: I4a0a784b32bc2df47934b1bed1d62b0682beb2dd
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
OSDN Git Service
