OSDN Git Service
Christopher Tate [Fri, 12 May 2017 08:30:16 +0000 (08:30 +0000)]
Merge "Accommodate service disconnect / package update race" into oc-dev am:
a3301df508
am:
2496ac8e94
Change-Id: I0358ae03a55fd79f992066aea6ef514f37069142
Andreas Gampe [Fri, 12 May 2017 08:27:22 +0000 (08:27 +0000)]
Merge "OtaDexopt: Ensure float format for progress command" into oc-dev am:
4c8181cb48
am:
b8ae293253
Change-Id: I8a130ded7048abaa1d9011180f01119b313a59ac
Adam Lesinski [Fri, 12 May 2017 08:24:23 +0000 (08:24 +0000)]
Merge "AAPT: Include empty locale in getLocales" into oc-dev am:
19af4cc375
am:
287a372575
Change-Id: I6c49d80d270d3877bce2652d687ef8434a68e333
Adam Lesinski [Fri, 12 May 2017 08:21:40 +0000 (08:21 +0000)]
Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev am:
120d7b219d
am:
c041ea726c
Change-Id: I12dadc8e103e079daffa13773062382207e7fd84
Makoto Onuki [Fri, 12 May 2017 08:10:07 +0000 (08:10 +0000)]
Merge "Make batterystats less chatty" into oc-dev am:
89d64cbbd9
am:
1186287a1e
Change-Id: I4d1b144837979bbcf212d3b647e3b8927c6c33bc
Kenny Guy [Fri, 12 May 2017 07:48:24 +0000 (07:48 +0000)]
Merge "Cleanup API that is already @removed" into oc-dev am:
33b4964874
am:
ddf5448ef9
Change-Id: I2e937e78c4506698c26bb9fdadf0d5ce3198b8ab
Aurimas Liutikas [Fri, 12 May 2017 07:40:00 +0000 (07:40 +0000)]
Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev am:
cd32b42e1c
am:
85934c2855
Change-Id: I6838576d68ba9781662e3bb7b271e9d9bf52fffe
Hall Liu [Fri, 12 May 2017 07:31:29 +0000 (07:31 +0000)]
Merge "getStreamingServices for embms" am:
b73fe9a751 am:
1d274ca5ec am:
a73e417752
am:
cf4e147769
Change-Id: I5700f1d2f6b537db453e923e3e9cdcdb9fe44fec
nharold [Fri, 12 May 2017 07:17:10 +0000 (07:17 +0000)]
Merge "Add hidden APIs to get the cached SignalStrength from SST" am:
5b8a9c873f am:
cca5fbe779 am:
8d361350ff
am:
c5c4f5a45e
Change-Id: I8f8d3c142a6a01cfe47a1c14e349b04ed97d857a
Andrii Kulian [Fri, 12 May 2017 06:47:11 +0000 (06:47 +0000)]
Merge "Merge "Fix app bounds for pinned stack" into oc-dev am:
4116913e3a" into oc-dev-plus-aosp
am:
cebdb917ce
Change-Id: I026e233f8f55d96ff80e5a6c4c669b0b7bd9d7a1
Svetoslav Ganov [Fri, 12 May 2017 06:41:52 +0000 (06:41 +0000)]
Merge "Init MemoryIntArray#mFd with -1" am:
d6eaa80590 am:
a3f14a1531 am:
b1274a057f
am:
88993e244a
Change-Id: I2c01823fd8bc0e1485352ea7edba32d84f31cd6a
Brad Ebinger [Fri, 12 May 2017 06:27:44 +0000 (06:27 +0000)]
Merge "Merge "Add key for carrier_volte_provisioned" am:
79d3648cc2 am:
e050b5196b am:
4c91fdbd0b -s ours" into oc-dev-plus-aosp
am:
9486a4f666 -s ours
Change-Id: I8e32496cc65cb8f6f219bfa4bb521623dd99ebcf
Robert Shih [Fri, 12 May 2017 06:14:39 +0000 (06:14 +0000)]
Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev am:
ffb563d82d
am:
6033c043ff
Change-Id: I7879b4b76a202dce3cebad1ad37aac3ddb599278
Felipe Leme [Fri, 12 May 2017 06:04:04 +0000 (06:04 +0000)]
Merge "Decrease default number of partitions from 64 to 10." into oc-dev am:
203ec51e2b
am:
f777637df7
Change-Id: I5f3e6c19428376c97a8dffbf9c599e8424be0b70
Evan Rosky [Fri, 12 May 2017 05:05:11 +0000 (05:05 +0000)]
Merge "Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev am:
f14aea9f8b" into oc-dev-plus-aosp
am:
4b5e7163ac
Change-Id: Iabddf8006df6b06eaa6349d8299259f5f3496146
Chen Xu [Fri, 12 May 2017 04:24:01 +0000 (04:24 +0000)]
Merge "Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0" into nyc-mr2-dev-plus-aosp am:
94d78f5e31" into oc-dev-plus-aosp
am:
06b6687fbd
Change-Id: I04ffb6f1e45a1f1424084e7986426002e16acee2
Christopher Tate [Fri, 12 May 2017 04:19:12 +0000 (04:19 +0000)]
Merge "Accommodate service disconnect / package update race" into oc-dev
am:
a3301df508
Change-Id: Ibafad32d243ece75a1e034b84fd81f7f0ae3e4b2
Martijn Coenen [Fri, 12 May 2017 04:19:07 +0000 (04:19 +0000)]
Merge "Merge "Only spawn one binder thread for screencap." into oc-dev am:
b1edc48db0" into oc-dev-plus-aosp
am:
6fa0f075e2
Change-Id: Iac9144bacbd7ee247fae3f01408687d8f13b0479
Andreas Gampe [Fri, 12 May 2017 04:16:09 +0000 (04:16 +0000)]
Merge "OtaDexopt: Ensure float format for progress command" into oc-dev
am:
4c8181cb48
Change-Id: I8a243d16573ac5af852515cf8d3f018c00b43655
Android Build Merger (Role) [Fri, 12 May 2017 04:13:09 +0000 (04:13 +0000)]
Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0 am:
44cb5df46f am:
6771979e22"
Chen Xu [Fri, 12 May 2017 04:11:13 +0000 (04:11 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0 am:
44cb5df46f
am:
6771979e22
Change-Id: I5dcae8caba569d6b5750b4bd45683ea5573524f2
Adam Lesinski [Fri, 12 May 2017 04:10:49 +0000 (04:10 +0000)]
Merge "AAPT: Include empty locale in getLocales" into oc-dev
am:
19af4cc375
Change-Id: Idcac3756eede932c7924ccc3ef3edc7e12b7a10b
Android Build Merger (Role) [Fri, 12 May 2017 04:10:35 +0000 (04:10 +0000)]
Merge "Merge "Merge "Adding 'uhid' permission for bluetooth stack." am:
3e010d1353 am:
96d3b668bb am:
50c5253c2d" into oc-dev-plus-aosp am:
b78aad827c"
Siarhei Vishniakou [Fri, 12 May 2017 04:08:20 +0000 (04:08 +0000)]
Merge "Merge "Adding 'uhid' permission for bluetooth stack." am:
3e010d1353 am:
96d3b668bb am:
50c5253c2d" into oc-dev-plus-aosp
am:
b78aad827c
Change-Id: Ibcc53460472ded8fdfa6e366957635d8711eaa91
Adam Lesinski [Fri, 12 May 2017 04:01:26 +0000 (04:01 +0000)]
Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev
am:
120d7b219d
Change-Id: Ib408bed1686392f6bd846071277ac29cc70d54e7
Makoto Onuki [Fri, 12 May 2017 03:54:58 +0000 (03:54 +0000)]
Merge "Make batterystats less chatty" into oc-dev
am:
89d64cbbd9
Change-Id: Icc72768848756547c08eac7958b8e34a410dd6ba
Chen Xu [Fri, 12 May 2017 03:54:28 +0000 (03:54 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0 am:
44cb5df46f
am:
6771979e22
Change-Id: Iafd00fc14ab5ae21d6d3b6c6177f215e9b5bed39
Kenny Guy [Fri, 12 May 2017 03:51:39 +0000 (03:51 +0000)]
Merge "Cleanup API that is already @removed" into oc-dev
am:
33b4964874
Change-Id: I933de065f75417e16541c86089e981b3a9fbd362
Siarhei Vishniakou [Fri, 12 May 2017 03:49:55 +0000 (03:49 +0000)]
Merge "Merge "Adding 'uhid' permission for bluetooth stack." am:
3e010d1353 am:
96d3b668bb am:
50c5253c2d" into oc-dev-plus-aosp
am:
b78aad827c
Change-Id: Ifbef6c022fc9d944e6126051977f181eca49a29a
Aurimas Liutikas [Fri, 12 May 2017 03:47:09 +0000 (03:47 +0000)]
Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev
am:
cd32b42e1c
Change-Id: I357809d19e5ae3f51ae11693675899e45f79152b
Adam Lesinski [Fri, 12 May 2017 03:46:31 +0000 (03:46 +0000)]
Merge "Fix support for @empty in style resolution" into oc-dev am:
7d75f49175
am:
0532e76302
Change-Id: I0c5ed6e6d149982e98578a02a7afbaa7d6cdfa6c
Dianne Hackborn [Fri, 12 May 2017 03:43:09 +0000 (03:43 +0000)]
Merge "Merge "Finish issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev am:
8d0ba598cf" into oc-dev-plus-aosp
am:
e0375adaaf
Change-Id: I675107ab7e7cb5a497e56ca10307aed50e6df735
Hall Liu [Fri, 12 May 2017 03:30:07 +0000 (03:30 +0000)]
Merge "getStreamingServices for embms" am:
b73fe9a751 am:
1d274ca5ec
am:
a73e417752
Change-Id: I027359f2f9591ca1600b9b270413ae9b74fb7909
nharold [Fri, 12 May 2017 03:18:54 +0000 (03:18 +0000)]
Merge "Add hidden APIs to get the cached SignalStrength from SST" am:
5b8a9c873f am:
cca5fbe779
am:
8d361350ff
Change-Id: Ief9ba9b1fcd36db763d403c60be53b42c3d18890
Adrian Roos [Fri, 12 May 2017 03:04:59 +0000 (03:04 +0000)]
Merge "Merge "AOD: Fix wakeup animation duration" into oc-dev am:
34480d2ce0" into oc-dev-plus-aosp
am:
f7f39c90bd
Change-Id: I865c86ea152bad569fd303bd82f186ed491b3bd6
Android Build Merger (Role) [Fri, 12 May 2017 02:54:45 +0000 (02:54 +0000)]
Merge "Merge "Fix app bounds for pinned stack" into oc-dev am:
4116913e3a" into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 12 May 2017 02:53:07 +0000 (02:53 +0000)]
Merge "Merge "Don't skip intents where config changed." am:
29a28235b8 am:
d2e44e8d11 am:
f94abc1009 -s ours am:
3a3417dd7e"
Andrii Kulian [Fri, 12 May 2017 02:51:14 +0000 (02:51 +0000)]
Merge "Fix app bounds for pinned stack" into oc-dev
am:
4116913e3a
Change-Id: I8e58fd93793d2f55f008551022aafdaa7d3693b8
TreeHugger Robot [Fri, 12 May 2017 02:50:08 +0000 (02:50 +0000)]
Merge "Prevent multiple copies of android.hidl.manager-V1.0-java"
Jerry Zhang [Fri, 12 May 2017 02:49:25 +0000 (02:49 +0000)]
Merge "Don't skip intents where config changed." am:
29a28235b8 am:
d2e44e8d11 am:
f94abc1009 -s ours
am:
3a3417dd7e
Change-Id: I62ba35be21ad89f2cfdda8a5c5427a44fd98fd30
Svetoslav Ganov [Fri, 12 May 2017 02:48:26 +0000 (02:48 +0000)]
Merge "Init MemoryIntArray#mFd with -1" am:
d6eaa80590 am:
a3f14a1531
am:
b1274a057f
Change-Id: I1db50e323b452520c766be40a0c6524a12e14194
Android Build Merger (Role) [Fri, 12 May 2017 02:36:09 +0000 (02:36 +0000)]
Merge "Merge "Add key for carrier_volte_provisioned" am:
79d3648cc2 am:
e050b5196b am:
4c91fdbd0b -s ours" into oc-dev-plus-aosp
Brad Ebinger [Fri, 12 May 2017 02:29:28 +0000 (02:29 +0000)]
Merge "Add key for carrier_volte_provisioned" am:
79d3648cc2 am:
e050b5196b
am:
4c91fdbd0b -s ours
Change-Id: I03ba14bdabdd55fe607bf834102f116489eb4ce0
Robert Shih [Fri, 12 May 2017 02:28:18 +0000 (02:28 +0000)]
Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev
am:
ffb563d82d
Change-Id: I9762506997220b4f22589cc3c6542798175d873c
Felipe Leme [Fri, 12 May 2017 02:20:59 +0000 (02:20 +0000)]
Merge "Decrease default number of partitions from 64 to 10." into oc-dev
am:
203ec51e2b
Change-Id: I41e7c2fe4b0022330d1b67580334030e411dfbce
Android Build Merger (Role) [Fri, 12 May 2017 02:16:27 +0000 (02:16 +0000)]
Merge "Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev am:
f14aea9f8b" into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 12 May 2017 02:16:19 +0000 (02:16 +0000)]
Merge "Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0" into nyc-mr2-dev-plus-aosp am:
94d78f5e31" into oc-dev-plus-aosp
Evan Rosky [Fri, 12 May 2017 02:14:40 +0000 (02:14 +0000)]
Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev
am:
f14aea9f8b
Change-Id: If113fe3fc6516b293a532a076ed37c566eddac2f
Chen Xu [Fri, 12 May 2017 02:14:29 +0000 (02:14 +0000)]
Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0" into nyc-mr2-dev-plus-aosp
am:
94d78f5e31
Change-Id: Ic3c4ea573ee8cff925d876e3205e923136a083e2
Android Build Merger (Role) [Fri, 12 May 2017 02:14:12 +0000 (02:14 +0000)]
Merge "Merge "Only spawn one binder thread for screencap." into oc-dev am:
b1edc48db0" into oc-dev-plus-aosp
Julia Reynolds [Fri, 12 May 2017 02:13:25 +0000 (02:13 +0000)]
Merge "Lock relevant fields on channel update" into oc-dev am:
6307ac52e5
am:
ffe68af92c
Change-Id: I80eae8f14233f7cdf051b088a6678f2934919066
Hall Liu [Fri, 12 May 2017 02:12:34 +0000 (02:12 +0000)]
Merge "getStreamingServices for embms" am:
b73fe9a751
am:
1d274ca5ec
Change-Id: Iabec728e0525a0c8d4cf0b8a2627e9198fa0f5c5
Martijn Coenen [Fri, 12 May 2017 02:09:15 +0000 (02:09 +0000)]
Merge "Only spawn one binder thread for screencap." into oc-dev
am:
b1edc48db0
Change-Id: I251c7b72196f8996051b538a59fd466b65757ce4
Chen Xu [Fri, 12 May 2017 02:08:51 +0000 (02:08 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0
am:
44cb5df46f
Change-Id: I3a7b4f735da8c92a839e6d4f3a00378f68397fa6
Svet Ganov [Fri, 12 May 2017 02:06:50 +0000 (02:06 +0000)]
Merge "Detect isVisibleToUser post layout" into oc-dev am:
a7af385208
am:
73d5b089b9
Change-Id: I1369c5ccb51f7b147144a4cd3576729f920e5bbd
Hall Liu [Fri, 12 May 2017 01:52:29 +0000 (01:52 +0000)]
Merge "getStreamingServices for embms"
am:
b73fe9a751
Change-Id: I391004c1ee0e5815147349f488b537ed4d645e73
nharold [Fri, 12 May 2017 01:50:29 +0000 (01:50 +0000)]
Merge "Add hidden APIs to get the cached SignalStrength from SST" am:
5b8a9c873f
am:
cca5fbe779
Change-Id: I960302ca13d4dd9373186745ee2c72de348bceb8
TreeHugger Robot [Fri, 12 May 2017 01:23:12 +0000 (01:23 +0000)]
Merge "Accommodate service disconnect / package update race" into oc-dev
Android Build Merger (Role) [Fri, 12 May 2017 01:17:47 +0000 (01:17 +0000)]
Merge "Merge "Adding 'uhid' permission for bluetooth stack." am:
3e010d1353 am:
96d3b668bb am:
50c5253c2d" into oc-dev-plus-aosp
Siarhei Vishniakou [Fri, 12 May 2017 01:00:34 +0000 (01:00 +0000)]
Merge "Adding 'uhid' permission for bluetooth stack." am:
3e010d1353 am:
96d3b668bb
am:
50c5253c2d
Change-Id: I965b2ad6b603dba82116180a43fc20684d2f1b59
Hall Liu [Fri, 12 May 2017 01:00:25 +0000 (01:00 +0000)]
Merge "getStreamingServices for embms"
Adam Lesinski [Fri, 12 May 2017 01:00:00 +0000 (01:00 +0000)]
Merge "Fix support for @empty in style resolution" into oc-dev
am:
7d75f49175
Change-Id: Ie5a046f75a7c7fa13d330b90f3b9a8ff6c5ac373
TreeHugger Robot [Fri, 12 May 2017 00:56:10 +0000 (00:56 +0000)]
Merge "OtaDexopt: Ensure float format for progress command" into oc-dev
Android Build Merger (Role) [Fri, 12 May 2017 00:34:33 +0000 (00:34 +0000)]
Merge "Merge "Finish issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev am:
8d0ba598cf" into oc-dev-plus-aosp
Dianne Hackborn [Fri, 12 May 2017 00:32:42 +0000 (00:32 +0000)]
Merge "Finish issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
am:
8d0ba598cf
Change-Id: Ie1dd7e7f3ceef9a39439a0bb62770ec90128525a
Android Build Merger (Role) [Fri, 12 May 2017 00:32:17 +0000 (00:32 +0000)]
Merge "Merge "AOD: Fix wakeup animation duration" into oc-dev am:
34480d2ce0" into oc-dev-plus-aosp
Adrian Roos [Fri, 12 May 2017 00:28:50 +0000 (00:28 +0000)]
Merge "AOD: Fix wakeup animation duration" into oc-dev
am:
34480d2ce0
Change-Id: I907a8f5a42f17b0b08e4442952e86dcb32eac4f9
Jerry Zhang [Fri, 12 May 2017 00:26:47 +0000 (00:26 +0000)]
Merge "Don't skip intents where config changed." am:
29a28235b8 am:
d2e44e8d11
am:
f94abc1009 -s ours
Change-Id: Ie32e48f15e13d08ea3ae1a4d795131000f3d50e6
TreeHugger Robot [Fri, 12 May 2017 00:22:40 +0000 (00:22 +0000)]
Merge "AAPT: Include empty locale in getLocales" into oc-dev
Svetoslav Ganov [Fri, 12 May 2017 00:22:00 +0000 (00:22 +0000)]
Merge "Init MemoryIntArray#mFd with -1" am:
d6eaa80590
am:
a3f14a1531
Change-Id: Ieba327ed8b18c66906746e34e857e774c181fcf0
TreeHugger Robot [Fri, 12 May 2017 00:20:42 +0000 (00:20 +0000)]
Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev
nharold [Fri, 12 May 2017 00:19:11 +0000 (00:19 +0000)]
Merge "Add hidden APIs to get the cached SignalStrength from SST"
am:
5b8a9c873f
Change-Id: I8a17af3ea66d723c2f7dfb14848b19b3fd1fc0ef
TreeHugger Robot [Fri, 12 May 2017 00:15:51 +0000 (00:15 +0000)]
Merge "Make batterystats less chatty" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 00:13:51 +0000 (00:13 +0000)]
Merge "Cleanup API that is already @removed" into oc-dev
Julia Reynolds [Fri, 12 May 2017 00:08:17 +0000 (00:08 +0000)]
Merge "Lock relevant fields on channel update" into oc-dev
am:
6307ac52e5
Change-Id: I7f47872b2d166353365517e7407cda43666ae70c
TreeHugger Robot [Thu, 11 May 2017 23:59:49 +0000 (23:59 +0000)]
Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev
Svetoslav Ganov [Thu, 11 May 2017 23:58:56 +0000 (23:58 +0000)]
Merge "Init MemoryIntArray#mFd with -1"
am:
d6eaa80590
Change-Id: I323519cbe3f01464e6ee23c46381237036cf3148
nharold [Thu, 11 May 2017 23:57:14 +0000 (23:57 +0000)]
Merge "Add hidden APIs to get the cached SignalStrength from SST"
Jocelyn Dang [Thu, 11 May 2017 23:48:32 +0000 (23:48 +0000)]
Merge "Don't allocate new array in Parcel#readByteArray"
TreeHugger Robot [Thu, 11 May 2017 23:38:19 +0000 (23:38 +0000)]
Merge "Fix app bounds for pinned stack" into oc-dev
Svet Ganov [Thu, 11 May 2017 23:35:58 +0000 (23:35 +0000)]
Merge "Ensure remote calls to a fill service timeout." into oc-dev am:
208711a1e4
am:
3db119efa8
Change-Id: I60e696d1614bf1bd43dbbeac7e9b021395e7d13c
Svetoslav Ganov [Thu, 11 May 2017 23:34:23 +0000 (23:34 +0000)]
Merge "Init MemoryIntArray#mFd with -1"
Christopher Tate [Sat, 6 May 2017 00:37:43 +0000 (17:37 -0700)]
Accommodate service disconnect / package update race
Ordering of delivery of package monitoring messages and service
disconnect callbacks is indeterminate, but we need to make decisions
about service disconnect based on the package update state. We
address the race by explicitly deferring our reset/timeout logic by
a short time to allow the package monitor to process any pending
updates on the same looper thread before we take action.
Bug
34356215
Test: manual
Change-Id: Icffedbaf19b8eac8830c22fc05f299eb96b54acd
Brad Ebinger [Thu, 11 May 2017 23:21:54 +0000 (23:21 +0000)]
Merge "Add key for carrier_volte_provisioned" am:
79d3648cc2
am:
e050b5196b
Change-Id: I82bb03797c8da4046c232b40e45980b8d18fc20d
Android Build Merger (Role) [Thu, 11 May 2017 23:07:45 +0000 (23:07 +0000)]
Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3 am:
1f354082c0" into nyc-mr2-dev-plus-aosp
Chen Xu [Thu, 11 May 2017 23:05:46 +0000 (23:05 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3
am:
1f354082c0
Change-Id: I539c4fc14ab7e41e5c43799387685186bb9f7f31
TreeHugger Robot [Thu, 11 May 2017 22:40:34 +0000 (22:40 +0000)]
Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 22:37:42 +0000 (22:37 +0000)]
Merge "Decrease default number of partitions from 64 to 10." into oc-dev
Evan Rosky [Thu, 11 May 2017 22:26:09 +0000 (22:26 +0000)]
Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev
Chen Xu [Thu, 11 May 2017 22:13:25 +0000 (22:13 +0000)]
Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am:
7eca824ce3
am:
1f354082c0
Change-Id: Ide900754bb6b41b670a416b9933ad0b7d7bcc79b
Martijn Coenen [Thu, 11 May 2017 22:07:31 +0000 (22:07 +0000)]
Merge "Only spawn one binder thread for screencap." into oc-dev
Siarhei Vishniakou [Thu, 11 May 2017 22:02:06 +0000 (22:02 +0000)]
Merge "Adding 'uhid' permission for bluetooth stack." am:
3e010d1353
am:
96d3b668bb
Change-Id: I38a84e41505f7c55966d5ddedd12ddf5f1e9f403
Svet Ganov [Thu, 11 May 2017 22:00:20 +0000 (22:00 +0000)]
Merge "Detect isVisibleToUser post layout" into oc-dev
am:
a7af385208
Change-Id: Ie6f7a111a329cde1e5cd674ec395af11c8a24e2b
Brad Ebinger [Thu, 11 May 2017 21:56:07 +0000 (21:56 +0000)]
Merge "Add key for carrier_volte_provisioned"
am:
79d3648cc2
Change-Id: Id83abfcabfcbad1bd34b22251403b9555d1b8e9e
TreeHugger Robot [Thu, 11 May 2017 21:55:19 +0000 (21:55 +0000)]
Merge "Fix support for @empty in style resolution" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 21:37:59 +0000 (21:37 +0000)]
Merge "Finish issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
Tony Mak [Thu, 11 May 2017 21:37:12 +0000 (21:37 +0000)]
Merge "Relax the sharedpreference check to look at StorageManager.isUserKeyUnlocked" into oc-dev am:
e35e223a81
am:
dc37e5251f
Change-Id: Iea2d49976f7608cf63809060d6857cd61d42ca2f
Aurimas Liutikas [Thu, 11 May 2017 21:30:27 +0000 (21:30 +0000)]
Suppress AppCacheTest tests that cause am instrument failure.
These tests runs a command to clear application data and by
doing so causes the application that is being instrumented
to restart, which in turn "am instrument' thinks is an app
crash, thus aborting the rest of the tests.
Bug:
38238448
Change-Id: Ida69b828a9950a83d790a3a7628e32c14a04a772
Test: bit FrameworksCoreTests:android.content.pm.AppCacheTest
Brad Ebinger [Thu, 11 May 2017 21:20:28 +0000 (21:20 +0000)]
Merge "Add key for carrier_volte_provisioned"
TreeHugger Robot [Thu, 11 May 2017 21:18:28 +0000 (21:18 +0000)]
Merge "AOD: Fix wakeup animation duration" into oc-dev
OSDN Git Service
