OSDN Git Service
Tomasz Wasilczyk [Fri, 20 Apr 2018 14:02:48 +0000 (07:02 -0700)]
Merge "Don't check program selector's type for equality." into pi-dev
am:
a2015451a7
Change-Id: Id2bf66e26c54a2a8cc86b408b240d6984fb5b97b
Tomasz Wasilczyk [Fri, 20 Apr 2018 13:49:39 +0000 (13:49 +0000)]
Merge "Don't check program selector's type for equality." into pi-dev
Adrian Roos [Fri, 20 Apr 2018 13:41:02 +0000 (06:41 -0700)]
Merge "WM: Only update magnification bounds when they are visible" into pi-dev
am:
8788cffd05
Change-Id: I8b69b0f4d3f9d35e5e341a3638ac13106918f015
TreeHugger Robot [Fri, 20 Apr 2018 13:31:12 +0000 (13:31 +0000)]
Merge "WM: Only update magnification bounds when they are visible" into pi-dev
Adrian Roos [Fri, 20 Apr 2018 12:31:58 +0000 (05:31 -0700)]
Merge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev
am:
d8c77c94ff
Change-Id: Icc60544a98e6a0357207d45600c8f943efc0d169
TreeHugger Robot [Fri, 20 Apr 2018 12:04:12 +0000 (12:04 +0000)]
Merge "AOD: Add additional delayed dozeTimeTick after unpausing" into pi-dev
Bernie Innocenti [Fri, 20 Apr 2018 11:54:18 +0000 (04:54 -0700)]
Merge "Adjust APF interpreter tests to match APFv4" into pi-dev
am:
580a1ed904
Change-Id: Ibe5ad60bb0a7872e1d23ff181933a882fb5873f1
Chalard Jean [Fri, 20 Apr 2018 11:49:43 +0000 (04:49 -0700)]
Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev
am:
f12a2130a4
Change-Id: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
TreeHugger Robot [Fri, 20 Apr 2018 11:41:52 +0000 (11:41 +0000)]
Merge "Adjust APF interpreter tests to match APFv4" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 11:23:56 +0000 (11:23 +0000)]
Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev
Jorim Jaggi [Fri, 20 Apr 2018 11:17:20 +0000 (04:17 -0700)]
Merge "Fix cutout with temp inset bounds" into pi-dev
am:
db704ca8bf
Change-Id: I53a97c7e9a64e583678f61cb12c5329cbf090c37
Jorim Jaggi [Fri, 20 Apr 2018 11:09:16 +0000 (11:09 +0000)]
Merge "Fix cutout with temp inset bounds" into pi-dev
David Brazdil [Fri, 20 Apr 2018 10:59:17 +0000 (03:59 -0700)]
Merge "Add intrinsics on light greylist" into pi-dev
am:
9aa2a33cf3
Change-Id: I6ecc66df22631f0f5cd4766659f5d18530a96b43
David Brazdil [Fri, 20 Apr 2018 10:45:26 +0000 (10:45 +0000)]
Merge "Add intrinsics on light greylist" into pi-dev
Nicolas Geoffray [Fri, 20 Apr 2018 09:53:43 +0000 (02:53 -0700)]
Merge "Light grey java.net.HttpCookie fields." into pi-dev
am:
75d3d96084
Change-Id: I873079b40dcdce17655f08d9d50bacc93cb52e91
Nicolas Geoffray [Fri, 20 Apr 2018 09:48:56 +0000 (02:48 -0700)]
Merge "Add some widget APIS to light grey." into pi-dev
am:
2c321ccd7e
Change-Id: I85c636d73f89845c4657eb4adbe66ba8c0257eaa
Nicolas Geoffray [Fri, 20 Apr 2018 09:37:36 +0000 (09:37 +0000)]
Merge "Light grey java.net.HttpCookie fields." into pi-dev
Nicolas Geoffray [Fri, 20 Apr 2018 09:37:06 +0000 (09:37 +0000)]
Merge "Add some widget APIS to light grey." into pi-dev
Bernie Innocenti [Mon, 16 Apr 2018 14:27:51 +0000 (23:27 +0900)]
Adjust APF interpreter tests to match APFv4
Change-Id: I4311c754f1cb79633d49c5c1c0b4e27c8dde727e
Bug:
73804303
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
(cherry picked from commit
545d9367e24d1d55b2539c02273f92c61da74af0)
Mathew Inwood [Fri, 20 Apr 2018 08:20:19 +0000 (01:20 -0700)]
Merge "StrictMode: fix non-SDK API usage detection." into pi-dev
am:
c72ee1a4f2
Change-Id: If0db894c3cb9660eb187280cda21423866387799
Mathew Inwood [Fri, 20 Apr 2018 08:04:07 +0000 (08:04 +0000)]
Merge "StrictMode: fix non-SDK API usage detection." into pi-dev
Chalard Jean [Wed, 11 Apr 2018 07:36:41 +0000 (16:36 +0900)]
Add the list of private DNS addresses to LinkProperties
Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug:
73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
Lucas Dupin [Fri, 20 Apr 2018 07:38:47 +0000 (00:38 -0700)]
Merge changes I7c48a326,I7395ecd4 into pi-dev
am:
4e4b6ff508
Change-Id: I90fddaaf9a2fd3027d689bf356d2929c93323d5e
TreeHugger Robot [Fri, 20 Apr 2018 07:26:35 +0000 (07:26 +0000)]
Merge changes I7c48a326,I7395ecd4 into pi-dev
* changes:
Fix wrong bouncer translation during hint animation
Keep animating bouncer when fingerprint
Lucas Dupin [Fri, 20 Apr 2018 04:08:52 +0000 (12:08 +0800)]
Fix wrong bouncer translation during hint animation
It's not correct to assume that the bouncer translation is 0 when the
unlock hint animation is running. The correct translation is 1 since
the view is completely hidden.
FalsingManager was receiving the wrong bouncer state, and this caused
the rejection swipe gestures.
Change-Id: I7c48a326f054a2c09809e5a1096ca42907472eac
Fixes:
78108854
Test: tap on scrim, swipe notification
Test: turn on flasing logs, look at logcat
Test: go/sysui-bouncer-tests
Bernie Innocenti [Fri, 20 Apr 2018 03:21:11 +0000 (20:21 -0700)]
Merge "apf: Add immediate encoding tests for LI" am:
9ee5bb0037
am:
b0e8ab677b
Change-Id: Ia02de6226d85713037fcd86726fec4a04d5d630a
Jin Seok Park [Fri, 20 Apr 2018 03:09:37 +0000 (20:09 -0700)]
Merge "ExifInterface: Prevent infinite loop" into pi-dev
am:
6cc4575ced
Change-Id: I67d83deefa067c16e98b2fbd64f48295a3bee69f
Jeff Sharkey [Fri, 20 Apr 2018 03:00:48 +0000 (20:00 -0700)]
Merge "Never interact with "phone" while holding locks." into pi-dev
am:
d101084db7
Change-Id: I570994cd8ab5c7499dfa94b17e42687181637de0
Bernie Innocenti [Fri, 20 Apr 2018 02:57:40 +0000 (19:57 -0700)]
Merge "apf: Add immediate encoding tests for LI"
am:
9ee5bb0037
Change-Id: I1fa1423342efc4af8cf68a512b6ffe05a3c07f8b
Jeff Sharkey [Fri, 20 Apr 2018 02:55:24 +0000 (19:55 -0700)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
am:
ddb15c471c
Change-Id: Ieccbac3a53b14f196a3ceb7924f7bb6880660c97
gopinath [Fri, 20 Apr 2018 02:50:52 +0000 (19:50 -0700)]
Merge "Add more trace categories." into pi-dev
am:
6d9f7943fb
Change-Id: Ib0817f4a53ab63e895a8a57d33841a362e358fa6
TreeHugger Robot [Fri, 20 Apr 2018 02:43:54 +0000 (02:43 +0000)]
Merge "ExifInterface: Prevent infinite loop" into pi-dev
Jeff Sharkey [Fri, 20 Apr 2018 02:38:09 +0000 (02:38 +0000)]
Merge "Never interact with "phone" while holding locks." into pi-dev
Jeff Sharkey [Fri, 20 Apr 2018 02:38:01 +0000 (02:38 +0000)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
Lucas Dupin [Fri, 20 Apr 2018 02:28:07 +0000 (10:28 +0800)]
Keep animating bouncer when fingerprint
Before we wouldn't update the bouncer expansion after being unlocked,
this leads to a border case where the bouncer would be stuck if the user
authenticates with fingerprint while dragging up.
Change-Id: I7395ecd400957c656671640c7510fb279c671af3
Fixes:
78035213
Test: go/sysui-bouncer-tests
Pavlin Radoslavov [Fri, 20 Apr 2018 02:26:19 +0000 (19:26 -0700)]
[automerger skipped] Merge "Fix the implementation of BluetoothCodecStatus.equals()" into pi-dev
am:
1c75189a0a -s ours
Change-Id: I6317f4dd82a03daa5ec05844605b84baba72a9bc
TreeHugger Robot [Fri, 20 Apr 2018 02:12:44 +0000 (02:12 +0000)]
Merge "Add more trace categories." into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 02:12:09 +0000 (02:12 +0000)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()" into pi-dev
Winson Chung [Fri, 20 Apr 2018 02:07:23 +0000 (19:07 -0700)]
Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev
am:
1c0d00fac4
Change-Id: Iaf7247b5134efe7334edfa0d16a56fb8b31af392
Winson Chung [Fri, 20 Apr 2018 01:54:09 +0000 (01:54 +0000)]
Merge "Workaround to ensure we cancel the recents animation prior to starting home" into pi-dev
Bernie Innocenti [Fri, 20 Apr 2018 01:45:10 +0000 (18:45 -0700)]
Merge "Add support for reading a snapshot of the APF data" into pi-dev
am:
20c294be69
Change-Id: I3b940f5a3b795f85d244882eaa7eca56bd9e167d
Brad Stenning [Fri, 20 Apr 2018 01:38:41 +0000 (18:38 -0700)]
Merge "Allow more than one temp view to be registered at a time" into pi-dev
am:
501889c7d1
Change-Id: I301a2dabdd968e50d6c145ec3208e237329091fb
Jin Seok Park [Fri, 30 Mar 2018 09:07:30 +0000 (18:07 +0900)]
ExifInterface: Prevent infinite loop
A corrupted image file may create two problems.
1. A corrupted IFD pointer may point to an IFD that has already
been read, thus creating an infinite loop and a stack overflow.
2. A corrupted IFD offset value may have a negative value, thus
prompting a random reading of the file and creating an infinite
loop.
This CL addresses these issues.
Bug:
63800695
Test: Run cts (ExifInterfaceTest)
Change-Id: I706a0c3eae6af8301af69407333ea88e5681df3c
TreeHugger Robot [Fri, 20 Apr 2018 01:26:49 +0000 (01:26 +0000)]
Merge "Add support for reading a snapshot of the APF data" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 01:23:05 +0000 (01:23 +0000)]
Merge "Allow more than one temp view to be registered at a time" into pi-dev
Android Build Merger (Role) [Fri, 20 Apr 2018 01:09:56 +0000 (01:09 +0000)]
Merge "Merge "Fix the implementation of BluetoothCodecStatus.equals()" am:
3a1ca762c9 am:
493dbf789f" into pi-dev-plus-aosp
Treehugger Robot [Fri, 20 Apr 2018 01:09:33 +0000 (01:09 +0000)]
Merge "apf: Add immediate encoding tests for LI"
Pavlin Radoslavov [Fri, 20 Apr 2018 01:08:38 +0000 (18:08 -0700)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()" am:
3a1ca762c9
am:
493dbf789f
Change-Id: I5e10a7e35a7befe7d88cd875d7dbcc9b6a7bbb8f
Lucas Dupin [Fri, 20 Apr 2018 01:04:51 +0000 (18:04 -0700)]
Merge "Clock padding and motion adjustments" into pi-dev
am:
96b4b4bd4e
Change-Id: I932fab6fe4d87fc55e3275b2ca0903fd6b34a34f
Pavlin Radoslavov [Fri, 20 Apr 2018 00:59:36 +0000 (17:59 -0700)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()"
am:
3a1ca762c9
Change-Id: I159c2128068021b5ca5e0a7bf3eae218de0bdf1b
gopinath [Fri, 20 Apr 2018 00:54:06 +0000 (17:54 -0700)]
Add more trace categories.
Add tracing for additional filters as well.
Bug : b/
78244687, b/
78301352
Test: atest hot-nodropcache-stable-test
Change-Id: Ie6fd109b645c92dcfa414e3c41cc5f43032fe6fd
Erik Kline [Fri, 20 Apr 2018 00:53:50 +0000 (17:53 -0700)]
[automerger skipped] Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev
am:
dd08f4b96a -s ours
Change-Id: Id8753d01a14d062baaeb313437b15f03161d1477
Salvador Martinez [Fri, 20 Apr 2018 00:45:51 +0000 (17:45 -0700)]
Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev
am:
c2120a10f7
Change-Id: I06fddba7f72558bdc2b32fb768e550317264dbfe
TreeHugger Robot [Fri, 20 Apr 2018 00:43:53 +0000 (00:43 +0000)]
Merge "Clock padding and motion adjustments" into pi-dev
TreeHugger Robot [Fri, 20 Apr 2018 00:39:14 +0000 (00:39 +0000)]
Merge "Actually resolve all IPs for Private DNS hostname" into pi-dev
Pavlin Radoslavov [Thu, 19 Apr 2018 21:16:15 +0000 (14:16 -0700)]
Fix the implementation of BluetoothCodecStatus.equals()
Previously, the BluetoothCodecStatus.equals() implementation
was incorrect when comparing arrays of capabilities.
In the new implementation, the arrays are compared correctly,
and also the ordering of the capabilities in each array is ignored.
Also, added unit tests for class BluetoothCodecConfig and class
BluetoothCodecStatus.
Bug:
73404858
Bug:
73379307
Test: Unit tests (in frameworks/base)
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecConfigTest.java
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecStatusTest.java
Change-Id: If22087465397b7c4175c33f7d1909a15d957fb24
Merged-In: If22087465397b7c4175c33f7d1909a15d957fb24
(cherry picked from commit
9d36e6babc38cf7017726a587b656bdd6f8b0051)
Sanry Huang [Fri, 20 Apr 2018 00:21:11 +0000 (17:21 -0700)]
Merge "Fix b/
77867175: Clear all of NavigationPanel is missing" into pi-dev
am:
f0b7418f1b
Change-Id: I31ed361998a6824a54af7ba27c503263fdcc6e1e
TreeHugger Robot [Fri, 20 Apr 2018 00:15:45 +0000 (00:15 +0000)]
Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev
Jack He [Fri, 20 Apr 2018 00:13:45 +0000 (17:13 -0700)]
Merge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev
am:
6664f982a7
Change-Id: Id5dfb9bb2176d2117a4b4fb1477bc7e3009ddc2e
Sanry Huang [Fri, 20 Apr 2018 00:03:33 +0000 (00:03 +0000)]
Merge "Fix b/
77867175: Clear all of NavigationPanel is missing" into pi-dev
Treehugger Robot [Thu, 19 Apr 2018 23:55:31 +0000 (23:55 +0000)]
Merge "Fix the implementation of BluetoothCodecStatus.equals()"
Felipe Leme [Thu, 19 Apr 2018 23:55:11 +0000 (16:55 -0700)]
Merge changes from topic "revert_save_info" into pi-dev
am:
4dddd61fa8
Change-Id: Iff89691076a2136bafa1130f97cb71fa1177737d
Amin Shaikh [Thu, 19 Apr 2018 23:49:03 +0000 (16:49 -0700)]
Merge "Update wifi enabled state when connected." into pi-dev
am:
8a87e9ddd8
Change-Id: Iaf5108f48f89406a9c0371fdbc97f5ad81bda559
Amin Shaikh [Thu, 19 Apr 2018 23:44:08 +0000 (16:44 -0700)]
Merge "Allow QS expansion in switch access mode." into pi-dev
am:
caa429eada
Change-Id: I9282dd8321a5fb5c9149d6e4287882ae757e8620
TreeHugger Robot [Thu, 19 Apr 2018 23:37:40 +0000 (23:37 +0000)]
Merge "AudioService: Add warning log when handleDeviceConnection failed" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 23:32:46 +0000 (23:32 +0000)]
Merge changes from topic "revert_save_info" into pi-dev
* changes:
Document compatibility mode limitations.
Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."
TreeHugger Robot [Thu, 19 Apr 2018 23:30:08 +0000 (23:30 +0000)]
Merge "Update wifi enabled state when connected." into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 23:29:13 +0000 (23:29 +0000)]
Merge "Allow QS expansion in switch access mode." into pi-dev
Mike Digman [Thu, 19 Apr 2018 22:57:46 +0000 (15:57 -0700)]
Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev
am:
0b2f7503a8
Change-Id: I50fad5324559a37634a3f20dd7e40e9927e1feb4
TreeHugger Robot [Thu, 19 Apr 2018 22:32:10 +0000 (22:32 +0000)]
Merge "Reset sticky navbar timeout when rotate btn shown" into pi-dev
Felipe Leme [Thu, 19 Apr 2018 17:33:20 +0000 (10:33 -0700)]
Document compatibility mode limitations.
Test: mmm -j108 frameworks/base/:doc-comment-check-docs
Fixes:
77655074
Change-Id: I527d882850442c7e6e9379b1b423673885e07f2b
Felipe Leme [Wed, 18 Apr 2018 23:12:04 +0000 (16:12 -0700)]
Revert "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode."
Save has many limitations on compat mode, so we better not change the SaveInfo
behavior but rather document then.
This reverts commit
4f74a018c8ee9801f1d5ce2c7ec726251efc4fbf.
Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityTest \
CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest
Bug:
77655074
Change-Id: I36bd28ca546dcedefe75de7815b76b8b5827aee3
Abodunrinwa Toki [Thu, 19 Apr 2018 22:20:09 +0000 (15:20 -0700)]
Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev
am:
993890fbf4
Change-Id: Ie71ca3cc2144b6f700f1e9376fc2f571d3e19ce7
Brad Stenning [Wed, 18 Apr 2018 17:28:24 +0000 (10:28 -0700)]
Allow more than one temp view to be registered at a time
Without this we can't put the status bar above the full screen user
selection page
Bug:
77148007
Test: with a second set of hvac
Change-Id: If422ad4cd2c3ad6ef4beb1d919327fed96184ba6
Stanley Tng [Thu, 19 Apr 2018 22:12:57 +0000 (15:12 -0700)]
Cleanup documentation for LE CoC in BluetoothAdapter
am:
0d5aa574d6
Change-Id: I73a3fd4d9c8dd908ca38f3b9877cafaf7847ff09
Stanley Tng [Thu, 19 Apr 2018 22:09:04 +0000 (15:09 -0700)]
Merge "Clarify API doc for BluetoothGattServer::addService" into pi-dev
am:
fb4da73e76
Change-Id: Ib28fec7dc7ee25de883569c054012a75fd1043f2
Abodunrinwa Toki [Thu, 19 Apr 2018 22:05:17 +0000 (22:05 +0000)]
Merge "Fix non-unique PendingIntent issue with TCImpl." into pi-dev
Jack He [Thu, 19 Apr 2018 22:03:43 +0000 (15:03 -0700)]
AudioService: Add warning log when handleDeviceConnection failed
Bug:
78284878
Test: make, no functional change
Change-Id: I3c0b90afe8f345fa63812a1f91350baccb59516e
Ryan Mitchell [Thu, 19 Apr 2018 21:58:17 +0000 (14:58 -0700)]
Merge "AAPT2: Support id reference chaining from AAPT" into pi-dev
am:
247ecfa498
Change-Id: I507b421d60294ea9262d5be579f22fdc2892c7fe
Stanley Tng [Thu, 5 Apr 2018 01:33:46 +0000 (18:33 -0700)]
Cleanup documentation for LE CoC in BluetoothAdapter
Test: Compile
Bug:
77631591
Change-Id: Ic3c7f13e560534a048bf5c8b274fe62190c214c7
(cherry picked from commit
dac8e140184f3ac52210ff3638af3f53edca1ba0)
Stanley Tng [Thu, 19 Apr 2018 21:56:38 +0000 (21:56 +0000)]
Merge "Clarify API doc for BluetoothGattServer::addService" into pi-dev
Jeff Sharkey [Thu, 19 Apr 2018 17:20:57 +0000 (11:20 -0600)]
Protect usage data with OP_GET_USAGE_STATS.
APIs that return package usage data (such as the new ArtManager)
must ensure that callers hold both the PACKAGE_USAGE_STATS permission
and the OP_GET_USAGE_STATS app-op.
Bug:
77662908
Test: atest vendor/xts/gts-tests/hostsidetests/dexapis/host/
Change-Id: I7a85d959f1682d2bd5cf3684415e368fece88101
Pavlin Radoslavov [Thu, 19 Apr 2018 21:16:15 +0000 (14:16 -0700)]
Fix the implementation of BluetoothCodecStatus.equals()
Previously, the BluetoothCodecStatus.equals() implementation
was incorrect when comparing arrays of capabilities.
In the new implementation, the arrays are compared correctly,
and also the ordering of the capabilities in each array is ignored.
Also, added unit tests for class BluetoothCodecConfig and class
BluetoothCodecStatus.
Bug:
73404858
Bug:
73379307
Test: Unit tests (in frameworks/base)
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecConfigTest.java
runtest --path core/tests/bluetoothtests/src/android/bluetooth/BluetoothCodecStatusTest.java
Change-Id: If22087465397b7c4175c33f7d1909a15d957fb24
Ryan Mitchell [Thu, 19 Apr 2018 21:35:59 +0000 (21:35 +0000)]
Merge "AAPT2: Support id reference chaining from AAPT" into pi-dev
Eugene Susla [Thu, 19 Apr 2018 21:24:07 +0000 (14:24 -0700)]
Merge "[DO NOT MERGE] [Companion] Call notifyDataSetChanged on main thread" into pi-dev
am:
bb35e9e0e9
Change-Id: Icd60c59691d8a563a5e47cd56c9b677df708beb9
Tomasz Wasilczyk [Thu, 19 Apr 2018 21:04:08 +0000 (14:04 -0700)]
Don't check program selector's type for equality.
As the comments of the whole class says, primary ID is the field used
for checking for equality of the selectors. Current implementation also
checks program type, which is a deprecated field that can be inferred
from primary ID.
Test: open car.Media, add AM station to favorites
Bug:
78296701
Change-Id: I0423f831c2fdca2d1d126ed8a3b8fe40f28022ac
TreeHugger Robot [Thu, 19 Apr 2018 21:11:57 +0000 (21:11 +0000)]
Merge "[DO NOT MERGE] [Companion] Call notifyDataSetChanged on main thread" into pi-dev
Android Build Merger (Role) [Thu, 19 Apr 2018 21:07:09 +0000 (21:07 +0000)]
Merge "Merge "Fix channels --stats dump" into pi-dev am:
5de9459c81" into pi-dev-plus-aosp
Julia Reynolds [Thu, 19 Apr 2018 21:06:38 +0000 (14:06 -0700)]
Merge "Fix channels --stats dump" into pi-dev
am:
5de9459c81
Change-Id: I56f1641dbd0f3180fbce8f88b2571be43dcc68a0
Cassie Han [Thu, 19 Apr 2018 21:04:53 +0000 (14:04 -0700)]
[automerger skipped] Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'" am:
122a7b33ad
am:
0036df97ca -s ours
Change-Id: Ie27e541ed60edc43f518f041f7200d29612677c5
Winson Chung [Thu, 19 Apr 2018 00:53:15 +0000 (17:53 -0700)]
Workaround to ensure we cancel the recents animation prior to starting home
- It is possible for the call from SystemUI to cancel the recents animation
to be processed and handled after the virtual key has been processed in
PhoneWindowManager. This causes a misordering in which the canceling of
the Recents animation clears the pending start activity remote animation
(which is waiting for app transition ready).
Instead, move the canceling of the Recents animation to PhoneWindowManager
where the nav button is handled, to ensure that we cancel the animation
on the same thread before we start the activity.
Bug:
73188263
Test: Only able to reproduce so far artificially, which points to this
misordering
Change-Id: I1f3477acdf988953a5b3cef2e3b2b402af2d9909
Signed-off-by: Winson Chung <winsonc@google.com>
TreeHugger Robot [Thu, 19 Apr 2018 20:55:49 +0000 (20:55 +0000)]
Merge "Fix channels --stats dump" into pi-dev
Cassie Han [Thu, 19 Apr 2018 20:54:12 +0000 (13:54 -0700)]
Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'"
am:
122a7b33ad
Change-Id: I5acb34ef6d16fd5eab73951811d220049b60a988
Jeff Sharkey [Wed, 18 Apr 2018 21:42:57 +0000 (15:42 -0600)]
Never interact with "phone" while holding locks.
We've seen devices where heavy communication between "system_server"
and the "phone" process can exhuast Binder threads, especially when
calling while holding locks. To mitigate this, we now interact with
the "phone" process before acquiring any locks.
Update our internal data structures either when we see a connectivity
change, or when SubscriptionManager tells us something changed.
Fix bug in resolveSubscriptionPlan() that always picked the 0'th
SubscriptionPlan instead of looking for the currently active plan;
we now use the same logic for both NSS and NPMS.
Bug:
77908520,
77154412
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: atest com.android.server.net.NetworkStatsServiceTest
Change-Id: I177d3fa6cddc78d745b35a9ede12451d458b892c
Mike Ma [Thu, 19 Apr 2018 20:29:13 +0000 (13:29 -0700)]
Merge "Fix screen on count text dump" into pi-dev
am:
dd61c7e8e7
Change-Id: Ia2072936a3c02516a4f3add73895ee8e291cdc04
Evan Rosky [Thu, 19 Apr 2018 20:24:41 +0000 (13:24 -0700)]
Merge "Don't crash during layout of non-attached but focused view" into pi-dev
am:
62bb0802f9
Change-Id: I5b091f4fc17586a80934bbea0437323f794d6465
TreeHugger Robot [Thu, 19 Apr 2018 20:16:28 +0000 (20:16 +0000)]
Merge "Fix screen on count text dump" into pi-dev
TreeHugger Robot [Thu, 19 Apr 2018 20:13:32 +0000 (20:13 +0000)]
Merge "Don't crash during layout of non-attached but focused view" into pi-dev
Julia Reynolds [Thu, 19 Apr 2018 19:50:31 +0000 (15:50 -0400)]
Fix channels --stats dump
Test: manual inspection
Bug:
78292990
Change-Id: Iab75627494213870184e503bc2585cc8644ca1dd
Cassie Han [Thu, 19 Apr 2018 19:23:58 +0000 (19:23 +0000)]
Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'"