315915 Commits

Author SHA1 Message Date
Christopher Tate
b72714ee23 Merge "Merge "Turn down dynamic toggle for background restriction policy" into oc-dev am: 59047acea7" into oc-dev-plus-aosp
am: c1c3855397

Change-Id: I6c2c43156183ac5389d4ce1b1df94b517540e384
2017-04-14 17:26:00 +00:00
Mady Mellor
b9b4a78562 Merge "Merge "Visual changes to PIP drag to dismiss UI" into oc-dev am: 59c124b755" into oc-dev-plus-aosp
am: 900f022984

Change-Id: I937d985fe18e1e0ebc9e5d1a92c154223d95d6b0
2017-04-14 17:24:22 +00:00
Svet Ganov
3b436b15b7 Merge "Check for non-null parent before delegating to it am: 3a74243ae4" into oc-dev-plus-aosp
am: 37933ae25b

Change-Id: I264ce0527b8d4b4cc751487a9c14eda35cf733fe
2017-04-14 17:23:00 +00:00
Rebecca Silberstein
e9cf2eb6ac Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 am: 6fc5051613 am: 2f7a169618
am: 01d3ad5cf2

Change-Id: Ifa2af8e64e0fa7e9d3033aef303872c3de5dd617
2017-04-14 17:21:25 +00:00
Andreas Huber
b263e71deb Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev am: 9b2ed2b7c4
am: 71a840befa  -s ours

Change-Id: I6c8cfc324a62040b7df5e3f2f8c4dccfcbf09b4e
2017-04-14 17:18:07 +00:00
Roozbeh Pournader
d92030d352 Merge "Add Adlam font to fonts.xml" into oc-dev am: 1ad7ff32b1
am: b9e8d31eca

Change-Id: Icd43178709b25d325a16ea9644aa5ea08bc1d2f6
2017-04-14 17:14:03 +00:00
Yifan Hong
1ac3406335 Merge "Add Java API for libvintf." into oc-dev am: c223d70e64
am: 38bf613c0f

Change-Id: I3d2d7c3db36395aa3fcfcbb2396619c46c353d05
2017-04-14 17:05:01 +00:00
Ta-wei Yen
27a931eb69 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev am: ad989b1711
am: 63668e4396

Change-Id: I51e4f432edb54180cd11e95d5a0df32a1ede546f
2017-04-14 17:03:34 +00:00
Lorenzo Colitti
405fd19da1 resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp
am: d6af00f5e4  -s ours

Change-Id: If109b819ad9cfa71890e6a377a6d2b08d35ead87
2017-04-14 17:02:27 +00:00
Jorim Jaggi
b595d2a08c Merge "Don't consider app as top app if alpha = 0" into oc-dev am: 4a2be133d4
am: 054a99d029

Change-Id: I00fa7330cb0f5452c1d1c11323cf13981c3355fb
2017-04-14 17:01:19 +00:00
Jesse Hall
793f0a3963 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev am: 8cafe5d9b4
am: e20f42b8a9

Change-Id: I5d7df6e69e0f3c1688873cff747d62e5ddd1f78d
2017-04-14 17:00:13 +00:00
Adam Lesinski
82dad75c1f Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev am: b97d51a0d2
am: 48d5b68815

Change-Id: Ic6422832379d008311c7727f99090251d73bba6b
2017-04-14 16:59:07 +00:00
Dianne Hackborn
52a29573ee Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am: 676bd21542
am: 9596d71664

Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f
2017-04-14 16:48:32 +00:00
Daniel Nishi
58e291f1a5 Merge "Don't crash in background after app uninstall." into oc-dev am: 74037d1287
am: f110127aef

Change-Id: Id0c46b2669af8386792dccd12407d8de6dc66d05
2017-04-14 16:47:12 +00:00
Jeff Tinker
835a765a3a Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev am: 92fc8bdd51
am: a29ecc1a1c

Change-Id: I6cb7def4e72bb154227cba3b50ea09ec7f6b5003
2017-04-14 16:46:07 +00:00
jiabin
cc6759b193 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev am: 2ec7decaa5
am: 4f499a0a17

Change-Id: I0622c0f58c5ba2560b5c17c52a613cadcdb24ecc
2017-04-14 16:36:01 +00:00
Romain Guy
b7c30edeb1 Merge "Range check transfer params in float domain" into oc-dev am: 819740cc73
am: 1f1667122a

Change-Id: I5240515f1dd5939227f90b8b2aaf59622af6bea7
2017-04-14 16:33:12 +00:00
Peng Xu
3242ee7920 Merge "Address review suggestions for sensor direct report related APIs" into oc-dev am: 5ebb159a92
am: 70004dd19c

Change-Id: I68cbdfa94e98abde8fa0b072605051f3e0ed561d
2017-04-14 16:28:04 +00:00
Makoto Onuki
c40f2ab76e Merge "Actually remove the chooser APIs" into oc-dev am: fbadd6dac9
am: efda6390c9

Change-Id: I0a43d717f62dddace49e63ff2ab80283dea12357
2017-04-14 16:25:50 +00:00
Evan Rosky
3efa8c8fed Merge "Improve rect-level focus ordering" into oc-dev am: 197052d6cb
am: d6072f2900

Change-Id: Ide53aafb83aa1ca71adb966472ad5a411197e3f3
2017-04-14 16:23:44 +00:00
Adam Lesinski
c645e732b9 Merge "AAPT2: Fix order-of-destruction crash" into oc-dev am: 62b713ed73
am: 2fc8adc5fc

Change-Id: Ic723218e00e8eea1305bb47083bc056816c6f1a3
2017-04-14 16:20:55 +00:00
Selim Cinek
58c5d5abca Merge changes Icc9c36f7,I723474e2 into oc-dev am: 07525d4f25
am: f1f29ca50b

Change-Id: Iff0c951c0a1e27f6285f994df3a6f40c9a3bd8e3
2017-04-14 16:19:57 +00:00
Lei Yu
f69156ff95 Merge "Refine BatteryInfo and battery drawable" into oc-dev am: 57af565fb7
am: 24638307c2

Change-Id: Ifae38f01a454fe9dcea1fbde0ea1a57a15087d8a
2017-04-14 16:18:02 +00:00
Jean-Michel Trivi
dc36701751 Merge "Fix A11y volume persisting/restore" into oc-dev am: 076a0bd0bf
am: 350b39fbc8

Change-Id: I376101c1e68cdab01cdf3ee0db3bbe64b4bcd631
2017-04-14 16:16:46 +00:00
Dongwon Kang
08b24d1507 Merge "TIF: add helper methods for making a channel browsable." into oc-dev am: b2eb818a7d
am: 3d9ecc264d

Change-Id: I321131835e44d67bb5fab085bc7f36a838dd40e3
2017-04-14 16:12:49 +00:00
Bookatz
c2c9363c7a Merge "Collect background stats: syncs" into oc-dev am: a8fc7bff5a
am: 53b7ff2014

Change-Id: I30744a569a8617369e52c06de9b897128521cbb4
2017-04-14 16:11:50 +00:00
Jeremy Joslin
ce66b0d019 Merge "Add more NetworkRecommendationProvider documentation." into oc-dev am: 5879aa4b03
am: 9bcbf38e79

Change-Id: I6f57d8b0cc62b9ebe690e6d2efc5c725e90c8fe7
2017-04-14 16:10:34 +00:00
Adam Lesinski
08551954aa Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev am: 4124851b64
am: b8dc42fcf3

Change-Id: I4874c6683a150b98f8edcd4f1d5e60e69b39e457
2017-04-14 16:09:37 +00:00
Jason Monk
e30503f485 Merge "Fix location status bar icon" into oc-dev am: d2b368a68d
am: 2e55245f98

Change-Id: I2dabf81060d98a2dcbec6487900c7148fc4daa07
2017-04-14 16:08:42 +00:00
Adam Lesinski
c7c66e7f78 Merge "Update docs for obtainStyledAttribute" into oc-dev am: 80b7a214ba
am: f8235c3631

Change-Id: I7235021ff618fd99f5f1470cbf6e7e64420788e2
2017-04-14 16:07:45 +00:00
Bryce Lee
5aa7e073bc Merge "Remove window container from empty task when destroying." into oc-dev am: 61bce9ab13
am: a27128b8c7

Change-Id: Iadbae988357788bb50bbaebd7e4a580aaefb4308
2017-04-14 16:06:48 +00:00
Adam Lesinski
c96e4b0f76 Merge "BatteryStats: Remove reading of cpu power" into oc-dev am: af85d84050
am: 51d94c82af

Change-Id: I0bef2f7074a06f8336d727dd89c685c76262eca5
2017-04-14 16:04:32 +00:00
Jim Van Verth
99effcccbc Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev am: 1be9766a68
am: c7fd8db8a6

Change-Id: If7f3bfc01496a9fe9b198dc63bd7c064943c9008
2017-04-14 16:03:13 +00:00
Dianne Hackborn
cc04f02b44 Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am: 29c70437b3
am: 76c71a01e2

Change-Id: Ieafe036ee6c2662d5897a8052facd3cd0d9fbed7
2017-04-14 16:01:58 +00:00
Jason Monk
108b8ec82a Merge "Fix leak in nav bar" into oc-dev am: 0b67d53ba9
am: cea904333e

Change-Id: I51b2753f46f5b18e791af39020aab2c8547981df
2017-04-14 16:01:02 +00:00
Shuo Qian
2480cc7e09 Merge "ECBM SystemProperty cleanup" into oc-dev am: efb8882b47
am: 21d8d8095e

Change-Id: I2e92b292366138f1e9b0d559ffec407b702d81ba
2017-04-14 15:59:28 +00:00
Geoffrey Pitsch
e1a00e34db Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev am: c4ca1b5677
am: aa8dcf3751

Change-Id: Ic9780a11f1c3d3bbcbd8c5be350176507c62c685
2017-04-14 15:58:22 +00:00
Jack He
79418b63e3 Merge "Add developer setting and system API for inband ringing support" into oc-dev am: aadf525e1a
am: 97164fe986

Change-Id: Iddc91ebca96bcb8e660c1b7117ab3fa57be7d4ee
2017-04-14 15:56:10 +00:00
Todd Kennedy
5fb012e45d Merge "Filter instant app content providers" into oc-dev am: 3891674204
am: 0bb486bcb4

Change-Id: If96297cade9909d744eb57669aecd96841a27a31
2017-04-14 15:42:02 +00:00
Jason Monk
ecb4a9b390 Merge "Update mobile data icon" into oc-dev am: 99856429db
am: 4520cb7ad9

Change-Id: I5fc19134a1ec0da5d4ede330a0d430ed428a53fa
2017-04-14 15:35:20 +00:00
Chris Tate
d593e402c2 Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev am: 117ac766a9
am: 636915a2ed

Change-Id: I28d8d31b30c9b500be1796566bb9885741b9aedc
2017-04-14 15:34:16 +00:00
Seigo Nonaka
659c9cfac3 Merge "Introduce setFallbackTypeface" into oc-dev am: 729a515e5e
am: 17452ee553

Change-Id: I66fe816727aae3fdf617c41796b25478090704fe
2017-04-14 15:31:25 +00:00
Yu Liu
c831fe6183 Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev am: e425b366ba
am: 5303f33bdc

Change-Id: I138cf20ba4b804fb3627458acf6796203c37be39
2017-04-14 15:30:05 +00:00
Daniel Sandler
7775be8a74 Merge "Quick fix to lockscreen text color." into oc-dev am: f06c2a01a5
am: dc4fd3c847

Change-Id: Ieb6074d94b85a04ac7c87b5295b52817b2671c8e
2017-04-14 15:28:56 +00:00
Benoit Lamarche
309335e727 resolve merge conflicts of 57fb5872d19c to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8
2017-04-14 15:59:04 +02:00
Roozbeh Pournader
20041c2d00 Merge "Switch i18n listeners to use IME hint locales" into oc-dev am: da97b66f41
am: 18fcf3f0d7

Change-Id: I43faa4ab695c52adf3c6d6f6170ffa5b6bc631f2
2017-04-14 13:15:32 +00:00
Chris Wren
12ac68a26f Merge "don't interpret milliseconds as nanoseconds" into oc-dev am: de12503268
am: a881fc2e2c

Change-Id: I6c803ec08b218203f3880cf0b2b269b3a6cb0692
2017-04-14 13:14:37 +00:00
Steve McKay
64b0757448 Merge "Remove support for auto-paging of cursors." into oc-dev am: 7f0d8c8076
am: 0b28e794de

Change-Id: I96a8d2c4a0a90fdf70d4eced90306fe9ac75175c
2017-04-14 13:12:16 +00:00
Daichi Hirono
57f94d02ba Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev am: 73b54bfd6d
am: 8bf30a7826

Change-Id: I48091d9868233f0ef329d0c2db4ffac5bba04eac
2017-04-14 13:11:01 +00:00
Andrew Solovay
47cdd3d8e9 Merge "doc: Add note to Context.bindService()" into oc-dev am: 2c63aa3be7
am: 7cfe7cf19b

Change-Id: I6cd7cf2e25c0038afcf96a26ea2b8635a8ca7d95
2017-04-14 13:09:59 +00:00