Commit Graph

322152 Commits

Author SHA1 Message Date
Kenny Guy
75377cd237 Merge "Cleanup API that is already @removed" into oc-dev am: 33b4964874
am: ddf5448ef9

Change-Id: I2e937e78c4506698c26bb9fdadf0d5ce3198b8ab
2017-05-12 07:48:24 +00:00
Aurimas Liutikas
28af8cbabc Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev am: cd32b42e1c
am: 85934c2855

Change-Id: I6838576d68ba9781662e3bb7b271e9d9bf52fffe
2017-05-12 07:40:00 +00:00
Hall Liu
37c72cdf05 Merge "getStreamingServices for embms" am: b73fe9a751 am: 1d274ca5ec am: a73e417752
am: cf4e147769

Change-Id: I5700f1d2f6b537db453e923e3e9cdcdb9fe44fec
2017-05-12 07:31:29 +00:00
nharold
8dc741fda0 Merge "Add hidden APIs to get the cached SignalStrength from SST" am: 5b8a9c873f am: cca5fbe779 am: 8d361350ff
am: c5c4f5a45e

Change-Id: I8f8d3c142a6a01cfe47a1c14e349b04ed97d857a
2017-05-12 07:17:10 +00:00
Andrii Kulian
0ea47c185a Merge "Merge "Fix app bounds for pinned stack" into oc-dev am: 4116913e3a" into oc-dev-plus-aosp
am: cebdb917ce

Change-Id: I026e233f8f55d96ff80e5a6c4c669b0b7bd9d7a1
2017-05-12 06:47:11 +00:00
Svetoslav Ganov
7c5e0fd431 Merge "Init MemoryIntArray#mFd with -1" am: d6eaa80590 am: a3f14a1531 am: b1274a057f
am: 88993e244a

Change-Id: I2c01823fd8bc0e1485352ea7edba32d84f31cd6a
2017-05-12 06:41:52 +00:00
Brad Ebinger
65633ea1b4 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
2017-05-12 06:27:44 +00:00
Robert Shih
d4e79f09d8 Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev am: ffb563d82d
am: 6033c043ff

Change-Id: I7879b4b76a202dce3cebad1ad37aac3ddb599278
2017-05-12 06:14:39 +00:00
Felipe Leme
1f3179a7c4 Merge "Decrease default number of partitions from 64 to 10." into oc-dev am: 203ec51e2b
am: f777637df7

Change-Id: I5f3e6c19428376c97a8dffbf9c599e8424be0b70
2017-05-12 06:04:04 +00:00
Evan Rosky
5f607f135a 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
2017-05-12 05:05:11 +00:00
Chen Xu
e579bfd6f9 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
2017-05-12 04:24:01 +00:00
Martijn Coenen
ec1f2bcad2 Merge "Merge "Only spawn one binder thread for screencap." into oc-dev am: b1edc48db0" into oc-dev-plus-aosp
am: 6fa0f075e2

Change-Id: Iac9144bacbd7ee247fae3f01408687d8f13b0479
2017-05-12 04:19:07 +00:00
Android Build Merger (Role)
07017f2ebe Merge "Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0 am: 44cb5df46f am: 6771979e22" 2017-05-12 04:13:16 +00:00
Chen Xu
741cd8542f Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0 am: 44cb5df46f
am: 6771979e22

Change-Id: I5dcae8caba569d6b5750b4bd45683ea5573524f2
2017-05-12 04:11:13 +00:00
Android Build Merger (Role)
9deb20ab1f Merge "Merge "Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb am: 50c5253c2d" into oc-dev-plus-aosp am: b78aad827c" 2017-05-12 04:10:41 +00:00
Siarhei Vishniakou
fcece390bf Merge "Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb am: 50c5253c2d" into oc-dev-plus-aosp
am: b78aad827c

Change-Id: Ibcc53460472ded8fdfa6e366957635d8711eaa91
2017-05-12 04:08:20 +00:00
Chen Xu
0443aeb3f5 Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0 am: 44cb5df46f
am: 6771979e22

Change-Id: Iafd00fc14ab5ae21d6d3b6c6177f215e9b5bed39
2017-05-12 03:54:28 +00:00
Kenny Guy
ddf5448ef9 Merge "Cleanup API that is already @removed" into oc-dev
am: 33b4964874

Change-Id: I933de065f75417e16541c86089e981b3a9fbd362
2017-05-12 03:51:39 +00:00
Siarhei Vishniakou
d2b712fae9 Merge "Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb am: 50c5253c2d" into oc-dev-plus-aosp
am: b78aad827c

Change-Id: Ifbef6c022fc9d944e6126051977f181eca49a29a
2017-05-12 03:49:55 +00:00
Aurimas Liutikas
85934c2855 Merge "Suppress AppCacheTest tests that cause am instrument failure." into oc-dev
am: cd32b42e1c

Change-Id: I357809d19e5ae3f51ae11693675899e45f79152b
2017-05-12 03:47:09 +00:00
Adam Lesinski
58a772cfa7 Merge "Fix support for @empty in style resolution" into oc-dev am: 7d75f49175
am: 0532e76302

Change-Id: I0c5ed6e6d149982e98578a02a7afbaa7d6cdfa6c
2017-05-12 03:46:31 +00:00
Dianne Hackborn
b1080dbf95 Merge "Merge "Finish issue #37815224: DeviceManagementService is incorrectly..." into oc-dev am: 8d0ba598cf" into oc-dev-plus-aosp
am: e0375adaaf

Change-Id: I675107ab7e7cb5a497e56ca10307aed50e6df735
2017-05-12 03:43:09 +00:00
Hall Liu
cf4e147769 Merge "getStreamingServices for embms" am: b73fe9a751 am: 1d274ca5ec
am: a73e417752

Change-Id: I027359f2f9591ca1600b9b270413ae9b74fb7909
2017-05-12 03:30:07 +00:00
nharold
c5c4f5a45e Merge "Add hidden APIs to get the cached SignalStrength from SST" am: 5b8a9c873f am: cca5fbe779
am: 8d361350ff

Change-Id: Ief9ba9b1fcd36db763d403c60be53b42c3d18890
2017-05-12 03:18:54 +00:00
Adrian Roos
cd9c540f38 Merge "Merge "AOD: Fix wakeup animation duration" into oc-dev am: 34480d2ce0" into oc-dev-plus-aosp
am: f7f39c90bd

Change-Id: I865c86ea152bad569fd303bd82f186ed491b3bd6
2017-05-12 03:04:59 +00:00
Android Build Merger (Role)
cebdb917ce Merge "Merge "Fix app bounds for pinned stack" into oc-dev am: 4116913e3a" into oc-dev-plus-aosp 2017-05-12 02:54:50 +00:00
Android Build Merger (Role)
9ceb446a17 Merge "Merge "Don't skip intents where config changed." am: 29a28235b8 am: d2e44e8d11 am: f94abc1009 -s ours am: 3a3417dd7e" 2017-05-12 02:53:13 +00:00
Andrii Kulian
0715cf4db6 Merge "Fix app bounds for pinned stack" into oc-dev
am: 4116913e3a

Change-Id: I8e58fd93793d2f55f008551022aafdaa7d3693b8
2017-05-12 02:51:14 +00:00
TreeHugger Robot
15f6c205c8 Merge "Prevent multiple copies of android.hidl.manager-V1.0-java" 2017-05-12 02:50:16 +00:00
Jerry Zhang
4b68c7232d Merge "Don't skip intents where config changed." am: 29a28235b8 am: d2e44e8d11 am: f94abc1009 -s ours
am: 3a3417dd7e

Change-Id: I62ba35be21ad89f2cfdda8a5c5427a44fd98fd30
2017-05-12 02:49:25 +00:00
Svetoslav Ganov
88993e244a Merge "Init MemoryIntArray#mFd with -1" am: d6eaa80590 am: a3f14a1531
am: b1274a057f

Change-Id: I1db50e323b452520c766be40a0c6524a12e14194
2017-05-12 02:48:26 +00:00
Android Build Merger (Role)
9486a4f666 Merge "Merge "Add key for carrier_volte_provisioned" am: 79d3648cc2 am: e050b5196b am: 4c91fdbd0b -s ours" into oc-dev-plus-aosp 2017-05-12 02:36:15 +00:00
Brad Ebinger
ade2c4f909 Merge "Add key for carrier_volte_provisioned" am: 79d3648cc2 am: e050b5196b
am: 4c91fdbd0b  -s ours

Change-Id: I03ba14bdabdd55fe607bf834102f116489eb4ce0
2017-05-12 02:29:28 +00:00
Robert Shih
6033c043ff Merge "AudioCapabilities: handle non-standard codec max input channels" into oc-dev
am: ffb563d82d

Change-Id: I9762506997220b4f22589cc3c6542798175d873c
2017-05-12 02:28:18 +00:00
Felipe Leme
f777637df7 Merge "Decrease default number of partitions from 64 to 10." into oc-dev
am: 203ec51e2b

Change-Id: I41e7c2fe4b0022330d1b67580334030e411dfbce
2017-05-12 02:20:59 +00:00
Android Build Merger (Role)
4b5e7163ac Merge "Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev am: f14aea9f8b" into oc-dev-plus-aosp 2017-05-12 02:16:31 +00:00
Android Build Merger (Role)
06b6687fbd 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 2017-05-12 02:16:24 +00:00
Evan Rosky
efdfcaad7e Merge "Only save focus in keyboard navigation clusters when appropriate" into oc-dev
am: f14aea9f8b

Change-Id: If113fe3fc6516b293a532a076ed37c566eddac2f
2017-05-12 02:14:40 +00:00
Chen Xu
b96d82b417 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
2017-05-12 02:14:29 +00:00
Android Build Merger (Role)
6fa0f075e2 Merge "Merge "Only spawn one binder thread for screencap." into oc-dev am: b1edc48db0" into oc-dev-plus-aosp 2017-05-12 02:14:17 +00:00
Julia Reynolds
e1a8dfff2e Merge "Lock relevant fields on channel update" into oc-dev am: 6307ac52e5
am: ffe68af92c

Change-Id: I80eae8f14233f7cdf051b088a6678f2934919066
2017-05-12 02:13:25 +00:00
Hall Liu
a73e417752 Merge "getStreamingServices for embms" am: b73fe9a751
am: 1d274ca5ec

Change-Id: Iabec728e0525a0c8d4cf0b8a2627e9198fa0f5c5
2017-05-12 02:12:34 +00:00
Martijn Coenen
eb6c916533 Merge "Only spawn one binder thread for screencap." into oc-dev
am: b1edc48db0

Change-Id: I251c7b72196f8996051b538a59fd466b65757ce4
2017-05-12 02:09:15 +00:00
Chen Xu
6771979e22 Merge "Telephony: Fix the failure of copying SMS to SIM card for sub2" am: 7eca824ce3 am: 1f354082c0
am: 44cb5df46f

Change-Id: I3a7b4f735da8c92a839e6d4f3a00378f68397fa6
2017-05-12 02:08:51 +00:00
Svet Ganov
45bd1bbd33 Merge "Detect isVisibleToUser post layout" into oc-dev am: a7af385208
am: 73d5b089b9

Change-Id: I1369c5ccb51f7b147144a4cd3576729f920e5bbd
2017-05-12 02:06:50 +00:00
Hall Liu
1d274ca5ec Merge "getStreamingServices for embms"
am: b73fe9a751

Change-Id: I391004c1ee0e5815147349f488b537ed4d645e73
2017-05-12 01:52:29 +00:00
nharold
8d361350ff Merge "Add hidden APIs to get the cached SignalStrength from SST" am: 5b8a9c873f
am: cca5fbe779

Change-Id: I960302ca13d4dd9373186745ee2c72de348bceb8
2017-05-12 01:50:29 +00:00
Android Build Merger (Role)
b78aad827c Merge "Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb am: 50c5253c2d" into oc-dev-plus-aosp 2017-05-12 01:17:54 +00:00
Siarhei Vishniakou
4bb8bea04a Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb
am: 50c5253c2d

Change-Id: I965b2ad6b603dba82116180a43fc20684d2f1b59
2017-05-12 01:00:34 +00:00
Hall Liu
b73fe9a751 Merge "getStreamingServices for embms" 2017-05-12 01:00:29 +00:00