OSDN Git Service
Chris Tate [Wed, 3 May 2017 20:23:32 +0000 (20:23 +0000)]
Merge "Don't mix "current dataset" tokens for different backup transports" into oc-dev
am:
70a2316ec7
Change-Id: Ifc4be7cab333d1956b3b6543e846489f686981ed
Chris Tate [Wed, 3 May 2017 20:15:49 +0000 (20:15 +0000)]
Merge "Don't mix "current dataset" tokens for different backup transports" into oc-dev
Android Build Merger (Role) [Wed, 3 May 2017 20:00:09 +0000 (20:00 +0000)]
Merge "Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev am:
34ab1f6a31" into oc-dev-plus-aosp
Wei Wang [Wed, 3 May 2017 19:59:17 +0000 (19:59 +0000)]
Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev
am:
34ab1f6a31
Change-Id: Ib10efb3a99686901653775abb1662ffa5c4ded4d
Hemant Gupta [Wed, 3 May 2017 19:57:08 +0000 (19:57 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected" am:
7485f047ba am:
799be11e6f
am:
4cec063b7e
Change-Id: I924d65b3366edbb79f22085225de062ceec241ab
Wei Wang [Wed, 3 May 2017 19:52:56 +0000 (19:52 +0000)]
Merge "Fix RttManager documation unit issue." into oc-dev
am:
41c1e3f1aa
Change-Id: I45d508c6f5ecf97f5166dbfb52d61fc8465b51b5
Hemant Gupta [Wed, 3 May 2017 19:52:35 +0000 (19:52 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected" am:
7485f047ba
am:
799be11e6f
Change-Id: I4ed170d7558b108ddbd794bc07b750a75d706583
TreeHugger Robot [Wed, 3 May 2017 19:50:53 +0000 (19:50 +0000)]
Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev
Hemant Gupta [Wed, 3 May 2017 19:46:41 +0000 (19:46 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected"
am:
7485f047ba
Change-Id: I1c222eda83abf4a056535790b48819d857fdd1de
Wei Wang [Wed, 3 May 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Fix RttManager documation unit issue." into oc-dev
Treehugger Robot [Wed, 3 May 2017 19:38:55 +0000 (19:38 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected"
Hemant Gupta [Thu, 5 Nov 2015 08:42:01 +0000 (14:12 +0530)]
Bluetooth: OBEX: Don't close transport when obex is disconnected
Precondition: PTS 7.0
Usecase:
Execute test case TC_TG_CA_BI_02_C for AVRCP 1.6
Expectation:
Test case should pass
Observation:
Test case fails
Root cause:
Disconnection of OBEX from PTS leads to disconnection of transport
(initiated by DUT) leading to test case failure. Obex server was
unnecessary assuming that transport would be disconnected so was
informing registered users that transport has been disconnected,
which was leading to issues on new obex connect on same transport
channel from remote obex client
Fix:
Remove check to break out of loop after obex disconnection, as that is
already handled in case when read would return -1 in case transport
is closed.
Test: TC_TG_CA_BI_02_C can be passed after the patch.
Bug:
35590000
Change-Id: Ic1682ce77c07cf2e43da09dc95fff2214338f758
Jason Monk [Wed, 3 May 2017 19:09:01 +0000 (19:09 +0000)]
Merge "Fix QS visibility logs missing some info" into oc-dev
am:
df9b2e8d80
Change-Id: I0587ba086e5903549f629cf43755b57ec9d6952f
TreeHugger Robot [Wed, 3 May 2017 19:04:29 +0000 (19:04 +0000)]
Merge "Fix QS visibility logs missing some info" into oc-dev
Abodunrinwa Toki [Wed, 3 May 2017 18:56:42 +0000 (18:56 +0000)]
Merge "TextClassifier: Append to url intents that need one." into oc-dev
am:
3baad0234b
Change-Id: Ia33a42abf1ef4d8d05498649979d5697b898c64e
TreeHugger Robot [Wed, 3 May 2017 18:49:14 +0000 (18:49 +0000)]
Merge "TextClassifier: Append to url intents that need one." into oc-dev
Narayan Kamath [Wed, 3 May 2017 18:19:00 +0000 (18:19 +0000)]
Merge "preloaded-classes: Add android.text.Html$HtmlParser" into oc-dev
am:
3bfbfead35
Change-Id: Ibabd9fd9825d5f24f99468f004dc4e5424b280cd
Winson Chung [Wed, 3 May 2017 18:13:55 +0000 (18:13 +0000)]
Merge "Only remove task if activity fails to start." into oc-dev
am:
53bac3d927
Change-Id: Ibb614910e47ddc31fbf671ba83b5f148bfc74875
Rob Carr [Wed, 3 May 2017 18:11:56 +0000 (18:11 +0000)]
Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev
am:
2ad5beb807
Change-Id: I02af0aa5ef03eff1ee25169011b63bd6b9e06d7e
Narayan Kamath [Wed, 3 May 2017 18:03:03 +0000 (18:03 +0000)]
Merge "preloaded-classes: Add android.text.Html$HtmlParser" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 18:02:49 +0000 (18:02 +0000)]
Merge "Only remove task if activity fails to start." into oc-dev
Rob Carr [Wed, 3 May 2017 18:01:11 +0000 (18:01 +0000)]
Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev
Tianjie Xu [Wed, 3 May 2017 17:56:39 +0000 (17:56 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures" am:
2db2f6d265 am:
c2a0d6776c
am:
1b0da0cdfd
Change-Id: I967edc50dff44d830e475b94678c0194a379dba1
Tianjie Xu [Wed, 3 May 2017 17:51:56 +0000 (17:51 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures" am:
2db2f6d265
am:
c2a0d6776c
Change-Id: I2061f6c122f64d9156ca4c17ec3d410eff213a07
Tianjie Xu [Wed, 3 May 2017 17:44:32 +0000 (17:44 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures"
am:
2db2f6d265
Change-Id: I8361a38d9a913072541e805176bfccdc728f333c
Jorim Jaggi [Wed, 3 May 2017 17:37:01 +0000 (17:37 +0000)]
Merge "Fix snapshots for secure windows" into oc-dev
am:
bf08eb6da7
Change-Id: I3142f4b13683f6189e0eccd155c36c0b65f3b820
Tianjie Xu [Wed, 3 May 2017 17:34:27 +0000 (17:34 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures"
TreeHugger Robot [Wed, 3 May 2017 17:29:16 +0000 (17:29 +0000)]
Merge "Fix snapshots for secure windows" into oc-dev
Santos Cordon [Wed, 3 May 2017 17:15:00 +0000 (17:15 +0000)]
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
am:
e4e953ae4c
Change-Id: Ifbfc389a5c72493a06de9fa33828ff50ff0d46a5
TreeHugger Robot [Wed, 3 May 2017 17:08:21 +0000 (17:08 +0000)]
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
Christine Franks [Wed, 3 May 2017 17:06:42 +0000 (17:06 +0000)]
Merge "Night display status restores on reboot/user change" into oc-dev
am:
78e03b44c3
Change-Id: I4cd13b8858f731ad66c5d0697cb95993317890ca
TreeHugger Robot [Wed, 3 May 2017 17:02:10 +0000 (17:02 +0000)]
Merge "Night display status restores on reboot/user change" into oc-dev
Julia Reynolds [Wed, 3 May 2017 16:53:22 +0000 (16:53 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev
am:
b0744b820a
Change-Id: I2d9bc9ba84109408d765d2af34020f7d49921e2f
Julia Reynolds [Wed, 3 May 2017 16:50:27 +0000 (16:50 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev
Chen Xu [Wed, 3 May 2017 16:47:09 +0000 (16:47 +0000)]
Merge "support locale change for notification channels" into oc-dev
am:
dd373a838d
Change-Id: I7773fb08018925589a271baccf35ce3d9cb3c7b7
Chen Xu [Wed, 3 May 2017 16:42:43 +0000 (16:42 +0000)]
Merge "support locale change for notification channels" into oc-dev
Wale Ogunwale [Wed, 3 May 2017 16:26:53 +0000 (16:26 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
am:
9304756c28
Change-Id: I81df798a1f2897837c6adbc622ffa64766030a6a
Roozbeh Pournader [Wed, 3 May 2017 16:21:52 +0000 (16:21 +0000)]
Merge "Update unit tests for forward delete" into oc-dev
am:
995b4a2185
Change-Id: Idc9e02ae6c792194db32070557ad3921aceca49d
TreeHugger Robot [Wed, 3 May 2017 16:21:36 +0000 (16:21 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 16:13:10 +0000 (16:13 +0000)]
Merge "Update unit tests for forward delete" into oc-dev
Julia Reynolds [Wed, 3 May 2017 15:46:07 +0000 (15:46 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
am:
abfa176b45
Change-Id: I238c7b739ed7bf359804e9488cf13c27fbb21d2c
TreeHugger Robot [Wed, 3 May 2017 15:39:26 +0000 (15:39 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
Jorim Jaggi [Wed, 3 May 2017 13:21:26 +0000 (15:21 +0200)]
Fix snapshots for secure windows
First, also draw system bar backgrounds when drawing a fake
snapshot. For that, refactor the drawing into a separate class so
it can be reused. Also enable fake snapshots for secure windows.
Test: com.android.server.wm.TaskSnapshotControllerTest
Test: com.android.server.wm.TaskSnapshotSurfaceTest
Test: Secure activity with resuming delay, make sure system bars
are covered when reopening app.
Bug:
35710126
Change-Id: I2f0ebc7e7acb80015780a4e882f0a472599efa30
Bartosz Fabianowski [Wed, 3 May 2017 15:15:20 +0000 (15:15 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
am:
c8ca16a85a
Change-Id: I3d9d26ce66c74c307cb9f2cd06537b2bb3a22487
TreeHugger Robot [Wed, 3 May 2017 15:10:10 +0000 (15:10 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
Christine Franks [Sat, 11 Feb 2017 01:36:10 +0000 (17:36 -0800)]
Night display status restores on reboot/user change
Fixes:
30086742
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services
Change-Id: I264be077e607baf8e19496f0c57549a907668005
Jason Monk [Wed, 3 May 2017 14:37:34 +0000 (10:37 -0400)]
Fix QS visibility logs missing some info
Test: runtest systemui
Change-Id: I6deb71576b137dfbd51f863e88ad939d4f3fab1b
Fixes:
35454347
Julia Reynolds [Mon, 1 May 2017 13:20:30 +0000 (09:20 -0400)]
Treat apps that use channels as O apps
... even if they don't target O
- Delete misc channel
- Read settings from channel instead of notification
Test: runtest systemui-notification
Change-Id: I00814959eddd10998806dd67cc30421091ae9aab
Fixes:
37540996
Fixes:
35378789
Wale Ogunwale [Tue, 2 May 2017 21:49:04 +0000 (14:49 -0700)]
Only allow AM to update display orientation based on app containers
Activity manager choregraphs several app states when starting an
activity including when the display orientation should be updated based
on the app that is now in the foreground. It is possible for a call to
originate within WM after AM adds the starting app token, but before AM
makes the app visible and resumed. E.g. A relayout call due to a
starting window. When this happens WM can prematurely update the display
orientation with incomplete information causing the starting app to be
in an incorrect orientation initially.
To fix this problem we now only factor in app containers (stacks, task,
..) when updating the display orientation if the call to update is
coming from AM. Otherwise we only use the non-app/system containers to
determine the orientation or return the last orientation.
Change-Id: I431ce9260ee31257732311a548c62cbcdb27eae7
Fixes:
37550022
Test: Launch 2 apps that don't fix orientation and use the recent button
to switch between them while holding the device in landscape.
Johan Torås Halseth [Wed, 3 May 2017 14:02:11 +0000 (14:02 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
am:
3eafb6e2c6
Change-Id: I33cac59253e106423680c70d5f79d83402109afd
TreeHugger Robot [Wed, 3 May 2017 13:55:49 +0000 (13:55 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
Adrian Roos [Wed, 3 May 2017 13:49:41 +0000 (13:49 +0000)]
Merge "DozePlugin: Remove" into oc-dev
am:
b2484f2258
Change-Id: Id660a1dcfd49aeb6f46285927696a822a8e8c8f9
Julia Reynolds [Tue, 2 May 2017 19:04:34 +0000 (15:04 -0400)]
Sorting and intrusiveness updates
- The intrusiveness extractor needs to know about channels
- Allow comparisons by contact affinity even in the min bucket.
Test: cts-verifier, attention management test
Bug:
36197567
Change-Id: I1bb53d758fc2334aad5e380620fc6e39a724195c
TreeHugger Robot [Wed, 3 May 2017 13:43:14 +0000 (13:43 +0000)]
Merge "DozePlugin: Remove" into oc-dev
Jorim Jaggi [Wed, 3 May 2017 13:21:52 +0000 (13:21 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
am:
251894b134
Change-Id: I63323963266b4194f61c8e6d6cc30a63f9af78eb
Geoffrey Pitsch [Wed, 3 May 2017 13:19:03 +0000 (13:19 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev
am:
b9ee2d4677
Change-Id: Icef88789844286860a348fab200ec8169dabbe51
Bartosz Fabianowski [Tue, 18 Apr 2017 12:39:23 +0000 (14:39 +0200)]
Add more explicit documentation for install reason
This CL adds more explicit documentation of the install reason argument /
return value to PackageInstaller.SessionInfo.
Bug:
37324584
Test: None
Change-Id: I2450cc669b194e611c5dc07c6a0a5cd78a98c039
TreeHugger Robot [Wed, 3 May 2017 13:16:27 +0000 (13:16 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
Geoffrey Pitsch [Wed, 3 May 2017 13:15:16 +0000 (13:15 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev
Abodunrinwa Toki [Wed, 3 May 2017 12:40:34 +0000 (12:40 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev
am:
d30044407e
Change-Id: Ie6b8c7e95e47c5e382d3f2dab505faee1c03a6e8
TreeHugger Robot [Wed, 3 May 2017 12:35:17 +0000 (12:35 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev
Johan Torås Halseth [Wed, 26 Apr 2017 20:20:32 +0000 (21:20 +0100)]
Increase timeout for ADB backup/restore of SharedStorage.
It previously used a backup timeout of 5 min, and restore timeout of 1
min, that would always timeout if the files on shared storage were big.
Now increase both to 60 minutes.
Bug:
37201952
Test: adb backup -shared && adb restore backup.ab
Merged-In: Ice6648554933baf76e96fd151b506564487c91c6
Change-Id: I99095249e960fd47fc742154bc513347bf506548
Jorim Jaggi [Tue, 2 May 2017 16:02:46 +0000 (18:02 +0200)]
Fix lock contention: Call into power manager service from handler
Make sure to not hold the wm lock when calling into power manager
service, because PWM will acquire a lock that might be contended.
Test: Make sure user activity timeout is still respected on
Keyguard
Test: Have activity with screenBrightness=1.0, make sure screen
is fully bright when opened
Bug:
37888898
Bug:
36631902
Change-Id: I4b5433dbaf8aa151465ae32232d3b3b8597715df
Narayan Kamath [Wed, 3 May 2017 09:39:29 +0000 (10:39 +0100)]
preloaded-classes: Add android.text.Html$HtmlParser
This class creates a singleton HTMLSchema instance in <clinit> and
we want this done in the zygote. HTMLSchema.<init> is too large for
the compiler and can allocate ~100k of objects on the heap. This also
saves ~50ms in the execution of Html.fromHtml on a lightly loaded
marlin-userdebug.
Test: manual
Bug:
36678451
Change-Id: Icdd3af35018bbe283b3e3690c696e6517452165d
Andrei Stingaceanu [Wed, 3 May 2017 09:48:11 +0000 (09:48 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev
am:
e0857a5800
Change-Id: I295b78a4397bb6409eef1963362b766c0ea78640
Andrei Stingaceanu [Wed, 3 May 2017 09:45:52 +0000 (09:45 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev
am:
2b0d0671b8
Change-Id: I8f5457aacd79bdaf7be72f7cdc082d0c915f61c6
TreeHugger Robot [Wed, 3 May 2017 09:42:01 +0000 (09:42 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev
Nicolas Geoffray [Wed, 3 May 2017 08:10:55 +0000 (08:10 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
am:
e4f36952ab
Change-Id: I37102edeba93a4b18c943c16946b609f04c1f0eb
Nicolas Geoffray [Wed, 3 May 2017 08:04:28 +0000 (08:04 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
Vladislav Kaznacheev [Wed, 3 May 2017 07:38:47 +0000 (07:38 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
am:
33f2b3b3b1
Change-Id: I212a872da24ea6e64a90e3339cfc9e68f2eaa933
TreeHugger Robot [Wed, 3 May 2017 07:31:44 +0000 (07:31 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
Tianjie Xu [Tue, 2 May 2017 19:41:56 +0000 (12:41 -0700)]
Add error/cause code reporting for Non A/B OTA failures
Read and report the error_code & cause_code from last_install.
Bug:
36866437
Test: mma & observe the sysui event in logcat -b events
Change-Id: I5357861fc758e14ed3235bfc8cc76d7561ccea58
Sundeep Ghuman [Wed, 3 May 2017 04:30:05 +0000 (04:30 +0000)]
Merge "Updating network info state should return true." into oc-dev
am:
703a233b03
Change-Id: Ib8a36b3880b65ea333a93dc4bd3ab5bca66272e7
Sundeep Ghuman [Wed, 3 May 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Updating network info state should return true." into oc-dev
Ruben Brunk [Wed, 3 May 2017 03:56:01 +0000 (03:56 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
am:
24f4743f92
Change-Id: I23f5fdf5b3584861818bc378b85f98fc2e33ebb8
TreeHugger Robot [Wed, 3 May 2017 03:48:19 +0000 (03:48 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
Wei Wang [Tue, 2 May 2017 03:24:19 +0000 (20:24 -0700)]
Fix Wakelock underlock in GnssLocationProvider.
Added a separate wakelock for xtra download so it won't
interfer with any wakelocks.
Test: manual
Bug:
37545729
Change-Id: I0867166f03802d1ed133437bcd85b0062db69947
Wei Wang [Wed, 3 May 2017 03:30:28 +0000 (20:30 -0700)]
Fix RttManager documation unit issue.
Bug:
35138520
Test: Build passes. Nothing else to test as this only changes javadocs.
Change-Id: Id522eba4cf8dba2be670582e7d734bd9203b2aae
Ben Lin [Wed, 3 May 2017 02:30:29 +0000 (02:30 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
am:
d6bfaba59c
Change-Id: I807eaa3090e655fdc959a10fe2652c2f4d932b01
Ben Lin [Wed, 3 May 2017 02:25:03 +0000 (02:25 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
Daichi Hirono [Wed, 3 May 2017 02:18:52 +0000 (02:18 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev
am:
9e37a2e419
Change-Id: I7377848132c5334f0becc640ea82255ff41dee7c
Todd Kennedy [Wed, 3 May 2017 02:12:28 +0000 (02:12 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev
am:
1f1d60c5a1
Change-Id: I78725fadab5bb7222f9d4528d21b22d881df45a1
TreeHugger Robot [Wed, 3 May 2017 02:12:03 +0000 (02:12 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 02:06:29 +0000 (02:06 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev
Dianne Hackborn [Wed, 3 May 2017 01:54:08 +0000 (01:54 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev
am:
6ff7df502b
Change-Id: Ic7de70297ab0eae610aeb5c359da381264779d6b
Dianne Hackborn [Wed, 3 May 2017 01:46:25 +0000 (01:46 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev
Roozbeh Pournader [Wed, 3 May 2017 01:33:12 +0000 (18:33 -0700)]
Update unit tests for forward delete
Changes in the definition of grapheme boundaries for emoji (which
now relies more on what actually ligates in a font) need updating the
unit tests. The changes in the unit tests are cases where the old
code in Minikin assumed a single grapheme, but the new code looks in
the font and finds that there are two grapheme clusters indeed.
Change-Id: Icd3d2563776fb295f48e70b67a8af8e6bd3f4b38
Fixes:
37769578
Test: updated tests pass
fionaxu [Tue, 2 May 2017 22:56:58 +0000 (15:56 -0700)]
support locale change for notification channels
Bug:
37911731
Test: Manual test with different languages
Change-Id: I36ce985dfc8fdb0f6c2b8b20c411b63099942f44
Sundeep Ghuman [Fri, 21 Apr 2017 04:25:41 +0000 (21:25 -0700)]
Updating network info state should return true.
Update AccessPoint.java so that network state changes return updated
equals true, so that corresponding UI elements will updated
appropriately.
Bug: b/
37289220
Test: runtest --path
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I1bc74997227b46468ef11efbf183a95ec0d2b15f
Andrii Kulian [Wed, 3 May 2017 00:14:14 +0000 (00:14 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev
am:
40d0f86783
Change-Id: I20f2cbc97202417d57cd36aa37ebd85e4ec27bd6
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.
This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.
Bug:
37544152
Bug:
37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
Michael Wright [Wed, 3 May 2017 00:08:11 +0000 (00:08 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev
am:
adb87ec50b
Change-Id: I5ede652c22717b2a986b6fd7608a97e6a3531fa0
Todd Kennedy [Wed, 26 Apr 2017 19:58:28 +0000 (12:58 -0700)]
Optionally let the instant app into disambig
When a user clicks "view on web", it's not assumed this is meant to be
forever. In this case, we will adjust the instant app's verification
status so that the instant isn't automatically run.
Change-Id: I246de901dafb23159a064d205fdb614d657a99dc
Fixes:
37686922
Test: Manual
Test: 1) Install instant app
Test: 2) Set to always-ask -- adb shell pm set-app-link package.name always-ask
Test: 3) Notice that we get a disambig w/ the instant app and chrome as options
Test: 4) Set to never -- adb shell pm set-app-link package.name never
Test: 5) Notice that we don't get the instant app
Andrii Kulian [Wed, 3 May 2017 00:03:25 +0000 (00:03 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:59:46 +0000 (23:59 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev
* changes:
Revert "Resource ID fixup."
Resource ID fixup.
Makoto Onuki [Tue, 2 May 2017 23:57:45 +0000 (23:57 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev
am:
e497b698d2
Change-Id: I0d5ace9d9b302e8f924d096fb245a81a3dfa8568
TreeHugger Robot [Tue, 2 May 2017 23:51:33 +0000 (23:51 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev
Wale Ogunwale [Tue, 2 May 2017 23:51:32 +0000 (23:51 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev
am:
5772ffcb9f
Change-Id: Ia344564dd1a9f6221e0737691eb4e8c8b9e27310
TreeHugger Robot [Tue, 2 May 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev