OSDN Git Service
Erik Kline [Thu, 18 May 2017 03:54:30 +0000 (03:54 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07 am:
96f9371a66
am:
945ff184c2
Change-Id: Ia9d15f0dcc49ce070f8684eb8c8481310859faa5
Erik Kline [Thu, 18 May 2017 03:47:16 +0000 (03:47 +0000)]
Merge "Expand logging capabilities of Tethering subsystem" am:
0373340b07
am:
96f9371a66
Change-Id: I58f88c3f5505b83539654c75e05de4eb29b64f15
Hugo Benichi [Thu, 18 May 2017 03:44:20 +0000 (03:44 +0000)]
Merge "Fix NetworkNotificationManagerTest" am:
c13a80deee am:
13f0d10115
am:
31c566037b
Change-Id: Ib880777290f74eaa565839632eb7518642fcc4f3
Erik Kline [Thu, 18 May 2017 03:38:43 +0000 (03:38 +0000)]
Merge "Expand logging capabilities of Tethering subsystem"
am:
0373340b07
Change-Id: I1381b8457781dcfafe52371a5dc7628282cb8efc
Hugo Benichi [Thu, 18 May 2017 03:36:50 +0000 (03:36 +0000)]
Merge "Fix NetworkNotificationManagerTest" am:
c13a80deee
am:
13f0d10115
Change-Id: Icf4e4e9c9dde7f6c8308adb79e3ca8b63d6f604b
Hugo Benichi [Thu, 18 May 2017 03:29:50 +0000 (03:29 +0000)]
Merge "Fix NetworkNotificationManagerTest"
am:
c13a80deee
Change-Id: I8f02be13da5790d0fd60f04886e87de04c96de08
Treehugger Robot [Thu, 18 May 2017 03:25:28 +0000 (03:25 +0000)]
Merge "Expand logging capabilities of Tethering subsystem"
Hugo Benichi [Thu, 18 May 2017 03:20:50 +0000 (03:20 +0000)]
Merge "Fix NetworkNotificationManagerTest"
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: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
Hugo Benichi [Thu, 23 Mar 2017 03:32:27 +0000 (12:32 +0900)]
Fix NetworkNotificationManagerTest
The testNotificationsShownAndCleared test was not doing anything
because the list of notification to show was always empty.
This patch fixes this issue and actually makes the test loop on
non-empty collections, and also fixes another ordering issue in
assertions themselves, hidden until now by the first issue.
Bug:
32561414
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
Merged-In: I4837b1175d7c9133e9156e33acaa1e7e3341cc62
Change-Id: Ia30587bd68a87b83b62f57eeeb28fef7d95dbf81
(cherry picked from commit
f8b804be5aeb5d0a36ff88649d7c5ecdc47c3ad1)
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"
TreeHugger Robot [Thu, 18 May 2017 01:55:42 +0000 (01:55 +0000)]
Merge "Optimize latency when unlocking phone" into oc-dev
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 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
Erik Kline [Fri, 12 May 2017 07:52:48 +0000 (16:52 +0900)]
Expand logging capabilities of Tethering subsystem
Introduce a SharedLog that can be shared among all Tethering
components. All log entries go to the same log, and each includes
its subsystem name. Additionally, all entries emitted to the
system log shared the same tag, so can easily be watched.
More subsystems can inherit a SharedLog, but to minimize cherry-pick
conflicts we limit ourselves to these changes only.
Test: as follows
- built
- flashed
- booted
- log output observed via dumpsys
- runtest frameworks-net passes
Bug:
32163131
Bug:
36988090
Bug:
38218697
Change-Id: I1229d4c55987402d84b0d4a2c8a595e0c829aa3e
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: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
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
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"
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
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 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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot [Wed, 17 May 2017 17:24:02 +0000 (17:24 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch"
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
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
Wale Ogunwale [Wed, 17 May 2017 15:56:03 +0000 (08:56 -0700)]
Reset hidden state of AppToken that was cleared due to starting window
If a starting window is tranferred to a token from another token that is
visible, we also make the receiving token visible, however we don't
reset the start when the starting window is tranferred out again when no
other windows were added to the token. We now do.
Fixes:
38317227
Test: Launch Audible app music player and verify the LibraryActivity
token isn't in the visible state.
Change-Id: I0186c79aa24d64362f742229d60c75eb0c1a3f97
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
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
Colin Cross [Wed, 17 May 2017 15:29:29 +0000 (15:29 +0000)]
Merge "Convert libmedia_jni to Android.bp"
am:
85faffa7ef
Change-Id: I7afbf6dda3dab6a3c36576e2c118b1accdcc2a17
Colin Cross [Wed, 17 May 2017 15:19:25 +0000 (15:19 +0000)]
Merge "Convert libmedia_jni to Android.bp"
Colin Cross [Wed, 17 May 2017 15:17:14 +0000 (15:17 +0000)]
Merge "Convert libmedia_jni to Android.bp" into oc-dev-plus-aosp
Aurimas Liutikas [Wed, 17 May 2017 15:17:09 +0000 (08:17 -0700)]
Fix TimePicker crash on rotation.
We were using two different types of layouts in landscape and portrait.
I unintentionally changed it from RelativeLayout to LinearLayout originally,
without even removing relative layout params.
Bug:
37650833
Test: Manual check that TimePicker no longer crashes on device rotation
Change-Id: If951e83c32377c0ed52d553ceb80683c4fba8b85
Hugo Benichi [Tue, 16 May 2017 01:56:46 +0000 (10:56 +0900)]
Move NetworkNotificationManagerTest to tests/net
Bug:
32561414
Test: no functional change
Change-Id: Iad17e3336a4a589da5cf88fd6359323e34b747e1
Hugo Benichi [Mon, 15 May 2017 00:53:44 +0000 (09:53 +0900)]
Finish moving NetworkStats tests to tests/net
Follow-up of commit
c86013be936f36c61fa0cdfad95141f6de3c6ef7.
Also add @SmallTest annotation to classes moved to tests/net.
Test: no functional change
Bug:
32561414
Change-Id: I0a0e8865d37ba7bae06ce352d3fc385989adc300
Charles He [Wed, 17 May 2017 13:15:42 +0000 (13:15 +0000)]
Merge "Fingerprint: call onRemovalSucceeded with # of remaining templates." into oc-dev
am:
50be382341
Change-Id: I5c6f8dfed5777de8098fa6a02d5a3124addedf22