OSDN Git Service
Vikas Marwaha [Fri, 14 Apr 2017 18:36:10 +0000 (18:36 +0000)]
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev am:
e768104f9b
am:
358ec57382
Change-Id: I56c2a327f56ec5108f8654907a1a0cc288c9e7d9
Wale Ogunwale [Fri, 14 Apr 2017 18:34:34 +0000 (18:34 +0000)]
Merge "Move stack to front in-sync with task reparenting" into oc-dev am:
c4555784be
am:
7654775b8a
Change-Id: Icdfa610740ae34fe46e83dd3b604651392466ad9
Svet Ganov [Fri, 14 Apr 2017 18:33:22 +0000 (18:33 +0000)]
Fix NPE in autofill am:
833c68e9fd
am:
651a974dd1
Change-Id: I3227f1272f123c8de934c4c22d6ebc1355ddf7b5
Daniel Nishi [Fri, 14 Apr 2017 18:32:11 +0000 (18:32 +0000)]
Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev am:
864d53d6fc
am:
33f74edaa4
Change-Id: Ifd1b2a4c522cb87bed58b47653292567a48c7aa2
Dongwon Kang [Fri, 14 Apr 2017 18:27:05 +0000 (18:27 +0000)]
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev am:
0cdc7c8874
am:
294176e988
Change-Id: I7332f731883c94f49477258357b3b392b4e21961
Alan Viverette [Fri, 14 Apr 2017 18:25:53 +0000 (18:25 +0000)]
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am:
7c8ab2651b
am:
efc602c307
Change-Id: Id991d413933d8435a05b129bf13e917941371c01
Alan Viverette [Fri, 14 Apr 2017 18:24:27 +0000 (18:24 +0000)]
Merge "Update more implementations of findViewById()" into oc-dev am:
b7f0db8d89
am:
2de6b0dab0
Change-Id: I03772206b8849237e1138303229c6ed1c3c2b432
Chad Brubaker [Fri, 14 Apr 2017 18:18:33 +0000 (18:18 +0000)]
Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev am:
8ee12087e6
am:
4ad2d2b4d0
Change-Id: I784ba8d936046e65bcec1612ba77ff8aaba26975
Hugo Benichi [Fri, 14 Apr 2017 18:17:31 +0000 (18:17 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback." am:
1a8f04b1b2 am:
4d80366762 am:
e505b37ec5
am:
9b7453f3c6
Change-Id: I04d6b51bef76c8937227c038c5825ed486812b71
Vikas Marwaha [Fri, 14 Apr 2017 18:13:49 +0000 (18:13 +0000)]
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev
am:
e768104f9b
Change-Id: Ica12fabb8ab667da444cb70a54dafa26225a1458
Seigo Nonaka [Fri, 14 Apr 2017 18:09:55 +0000 (18:09 +0000)]
Merge "Use provided style for fallback font selection" into oc-dev am:
43112fd26e
am:
83c52e0a40
Change-Id: Ia42f6a377c2617c8da9a84cb8bd7781326e464a1
Hugo Benichi [Fri, 14 Apr 2017 18:07:43 +0000 (18:07 +0000)]
Merge "Captive portal: rotate fallback urls" into oc-dev am:
a622b24d3a -s ours
am:
af18992066 -s ours
Change-Id: I86641338b2551a9b0136704dcfeed6327c639407
Vikas Marwaha [Fri, 14 Apr 2017 18:06:18 +0000 (18:06 +0000)]
Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev
Jorim Jaggi [Fri, 14 Apr 2017 18:05:30 +0000 (18:05 +0000)]
Merge "Implement new splash screen API" into oc-dev am:
46ae660bf2
am:
27af670d9a -s ours
Change-Id: I4f772359bf0dab72caa298597da2a995db463979
Andrew Scull [Fri, 14 Apr 2017 18:01:24 +0000 (18:01 +0000)]
Merge "Service for OEM lock management." into oc-dev am:
e52a1bfede
am:
d4be031c76
Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2
Svet Ganov [Fri, 14 Apr 2017 17:58:47 +0000 (17:58 +0000)]
Add back an id used by CTS am:
3de36a3cc1
am:
1ded7a1ab1
Change-Id: I68ef269ecd75d3ffffc62b0ca0dd357221353d47
Casey Burkhardt [Fri, 14 Apr 2017 17:57:42 +0000 (17:57 +0000)]
Merge "Icon assets for magnification" into oc-dev am:
4d386d5ce7
am:
549a439b53
Change-Id: I9cc4e50292a04becf92548ab5be4c54d19736a54
Jakub Pawlowski [Fri, 14 Apr 2017 17:56:35 +0000 (17:56 +0000)]
Bluetooth 5 PHY simplification am:
a51513747a
am:
ed6ce8637b
Change-Id: I336f047a649f5ff89c35ce5f69a0916b27ed0df5
Hugo Benichi [Fri, 14 Apr 2017 17:55:26 +0000 (17:55 +0000)]
Merge "Captive portal: rotate fallback urls" am:
76b3537dfd am:
605eafe0a5 am:
4479901ff3
am:
43cdbc943d
Change-Id: I4f3bd72a8cfa75853474039e7f6e44a5a89bf950
Jorim Jaggi [Fri, 14 Apr 2017 17:54:07 +0000 (17:54 +0000)]
Merge "Make sure theme attributes don't get lost" into oc-dev am:
9d2f03ec5d
am:
5cf511907d
Change-Id: If65a78ae543335a9f3689e92665cca00e1fd5efd
Winson Chung [Fri, 14 Apr 2017 17:53:03 +0000 (17:53 +0000)]
Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev am:
2e86be7653
am:
3a32d35723
Change-Id: Ie6ef27e0d233debca4884c5628c076121c8a5b34
Romain Guy [Fri, 14 Apr 2017 17:51:58 +0000 (17:51 +0000)]
Merge "Fix javadoc typos" into oc-dev am:
4b6e82d237
am:
299ae2f422
Change-Id: Ifac19d190660a0ce129034794abe20bc5d9066dc
Andrii Kulian [Fri, 14 Apr 2017 17:46:46 +0000 (17:46 +0000)]
Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev am:
c66b6ff997
am:
aa412973d9
Change-Id: I2e6394ce9c7bc72f5aa4de90e294defeb2dbf222
Wale Ogunwale [Fri, 14 Apr 2017 17:41:52 +0000 (17:41 +0000)]
Merge "Move stack to front in-sync with task reparenting" into oc-dev
am:
c4555784be
Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
Jesse Evans [Fri, 14 Apr 2017 17:41:47 +0000 (17:41 +0000)]
Merge "Fix instant app filtering in ApplicationsState" into oc-dev am:
9bdaa9c9fa
am:
783026710d
Change-Id: Id5a474354f69264a6959e8334f014860f6c98c8e
Svet Ganov [Fri, 14 Apr 2017 17:40:40 +0000 (17:40 +0000)]
Fix NPE in autofill
am:
833c68e9fd
Change-Id: Iabfff7d35836149e3b823ff7bb05fdaf555c0ea4
Winson Chung [Fri, 14 Apr 2017 17:40:39 +0000 (17:40 +0000)]
Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev am:
4191d99614
am:
7031cdda50
Change-Id: I6eb6069005460d372288d79b8a2387518842e73f
Svet Ganov [Fri, 14 Apr 2017 17:38:13 +0000 (17:38 +0000)]
Merge "Allow custom buttons in autofill UI" into oc-dev am:
249c4d709a
am:
489cef380a
Change-Id: I846ea7cbd275323cf65ed57d37a0acf13b010085
Dmitry Dementyev [Fri, 14 Apr 2017 17:33:46 +0000 (17:33 +0000)]
Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am:
2a30085e5c" into oc-dev-plus-aosp
am:
0bf753d2e5
Change-Id: I362b107071fc3f9c61a5e183d9a4fdd685ded1d7
Wale Ogunwale [Fri, 14 Apr 2017 17:32:59 +0000 (17:32 +0000)]
Merge "Move stack to front in-sync with task reparenting" into oc-dev
Hugo Benichi [Fri, 14 Apr 2017 17:32:27 +0000 (17:32 +0000)]
Merge "Merge changes Id0d536ff,I4fcd0ad7 into oc-dev am:
0e8090b10e" into oc-dev-plus-aosp
am:
562e577b1c -s ours
Change-Id: I87c54fe259d38b87c84485793aa5820b55650583
Jeff Sharkey [Fri, 14 Apr 2017 17:31:12 +0000 (17:31 +0000)]
Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am:
f5d5e5e4bf" into oc-dev-plus-aosp
am:
224b710a4f
Change-Id: Icdfe9487b2aa1d7d9245aaa87ccde048845b899d
Romain Guy [Fri, 14 Apr 2017 17:29:55 +0000 (17:29 +0000)]
Merge "Merge "Add more doc to ColorSpace.getName()" into oc-dev am:
4cae059bb9" into oc-dev-plus-aosp
am:
e9277ebe4a
Change-Id: I187ec4ffcb2db909443e3c7286e1cdde7bc9193b
Svet Ganov [Fri, 14 Apr 2017 17:11:46 +0000 (10:11 -0700)]
Fix NPE in autofill
Test: manual
bug:
37330744
Change-Id: I110ece0b9283adb9998f8df795e2107da772482e
Christopher Tate [Fri, 14 Apr 2017 17:26:00 +0000 (17:26 +0000)]
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
Mady Mellor [Fri, 14 Apr 2017 17:24:22 +0000 (17:24 +0000)]
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
Svet Ganov [Fri, 14 Apr 2017 17:23:00 +0000 (17:23 +0000)]
Merge "Check for non-null parent before delegating to it am:
3a74243ae4" into oc-dev-plus-aosp
am:
37933ae25b
Change-Id: I264ce0527b8d4b4cc751487a9c14eda35cf733fe
Rebecca Silberstein [Fri, 14 Apr 2017 17:21:25 +0000 (17:21 +0000)]
Merge "Add a default SSID prefix for local only hotspot" am:
e98a2942a4 am:
6fc5051613 am:
2f7a169618
am:
01d3ad5cf2
Change-Id: Ifa2af8e64e0fa7e9d3033aef303872c3de5dd617
Daniel Nishi [Fri, 14 Apr 2017 17:18:40 +0000 (17:18 +0000)]
Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev
am:
864d53d6fc
Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c
Andreas Huber [Fri, 14 Apr 2017 17:18:07 +0000 (17:18 +0000)]
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
Roozbeh Pournader [Fri, 14 Apr 2017 17:14:03 +0000 (17:14 +0000)]
Merge "Add Adlam font to fonts.xml" into oc-dev am:
1ad7ff32b1
am:
b9e8d31eca
Change-Id: Icd43178709b25d325a16ea9644aa5ea08bc1d2f6
Dongwon Kang [Fri, 14 Apr 2017 17:13:49 +0000 (17:13 +0000)]
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev
am:
0cdc7c8874
Change-Id: I6d6f9739809aa04ae4f9a23a7d401df990226ded
Daniel Nishi [Fri, 14 Apr 2017 17:11:26 +0000 (17:11 +0000)]
Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev
Dongwon Kang [Fri, 14 Apr 2017 17:05:26 +0000 (17:05 +0000)]
Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev
Yifan Hong [Fri, 14 Apr 2017 17:05:01 +0000 (17:05 +0000)]
Merge "Add Java API for libvintf." into oc-dev am:
c223d70e64
am:
38bf613c0f
Change-Id: I3d2d7c3db36395aa3fcfcbb2396619c46c353d05
Alan Viverette [Fri, 14 Apr 2017 17:04:19 +0000 (17:04 +0000)]
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
am:
7c8ab2651b
Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
Ta-wei Yen [Fri, 14 Apr 2017 17:03:34 +0000 (17:03 +0000)]
Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev am:
ad989b1711
am:
63668e4396
Change-Id: I51e4f432edb54180cd11e95d5a0df32a1ede546f
Lorenzo Colitti [Fri, 14 Apr 2017 17:02:27 +0000 (17:02 +0000)]
resolve merge conflicts of
4db137b0599a to oc-dev-plus-aosp
am:
d6af00f5e4 -s ours
Change-Id: If109b819ad9cfa71890e6a377a6d2b08d35ead87
Jorim Jaggi [Fri, 14 Apr 2017 17:01:19 +0000 (17:01 +0000)]
Merge "Don't consider app as top app if alpha = 0" into oc-dev am:
4a2be133d4
am:
054a99d029
Change-Id: I00fa7330cb0f5452c1d1c11323cf13981c3355fb
Jesse Hall [Fri, 14 Apr 2017 17:00:13 +0000 (17:00 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev am:
8cafe5d9b4
am:
e20f42b8a9
Change-Id: I5d7df6e69e0f3c1688873cff747d62e5ddd1f78d
Adam Lesinski [Fri, 14 Apr 2017 16:59:07 +0000 (16:59 +0000)]
Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev am:
b97d51a0d2
am:
48d5b68815
Change-Id: Ic6422832379d008311c7727f99090251d73bba6b
TreeHugger Robot [Fri, 14 Apr 2017 16:56:23 +0000 (16:56 +0000)]
Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
Dianne Hackborn [Fri, 14 Apr 2017 16:48:32 +0000 (16:48 +0000)]
Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am:
676bd21542
am:
9596d71664
Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f
Daniel Nishi [Fri, 14 Apr 2017 16:47:12 +0000 (16:47 +0000)]
Merge "Don't crash in background after app uninstall." into oc-dev am:
74037d1287
am:
f110127aef
Change-Id: Id0c46b2669af8386792dccd12407d8de6dc66d05
Jeff Tinker [Fri, 14 Apr 2017 16:46:07 +0000 (16:46 +0000)]
Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev am:
92fc8bdd51
am:
a29ecc1a1c
Change-Id: I6cb7def4e72bb154227cba3b50ea09ec7f6b5003
Wale Ogunwale [Fri, 14 Apr 2017 16:45:27 +0000 (09:45 -0700)]
Move stack to front in-sync with task reparenting
When reparenting a task to another stack have window manager move the
destination stack to the front at the same time it is reparenting the
task if REPARENT_MOVE_STACK_TO_FRONT is set to avoid jank.
Test: manual
Bug:
37299899
Change-Id: I45678e742188a4871f93a11178f7ab2b60c7bcc3
jiabin [Fri, 14 Apr 2017 16:36:01 +0000 (16:36 +0000)]
Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev am:
2ec7decaa5
am:
4f499a0a17
Change-Id: I0622c0f58c5ba2560b5c17c52a613cadcdb24ecc
Alan Viverette [Fri, 14 Apr 2017 16:33:14 +0000 (16:33 +0000)]
Merge "Update more implementations of findViewById()" into oc-dev
am:
b7f0db8d89
Change-Id: Iaa7a100c54305623e908ec325575d936ecbaf26a
Romain Guy [Fri, 14 Apr 2017 16:33:12 +0000 (16:33 +0000)]
Merge "Range check transfer params in float domain" into oc-dev am:
819740cc73
am:
1f1667122a
Change-Id: I5240515f1dd5939227f90b8b2aaf59622af6bea7
Peng Xu [Fri, 14 Apr 2017 16:28:04 +0000 (16:28 +0000)]
Merge "Address review suggestions for sensor direct report related APIs" into oc-dev am:
5ebb159a92
am:
70004dd19c
Change-Id: I68cbdfa94e98abde8fa0b072605051f3e0ed561d
TreeHugger Robot [Fri, 14 Apr 2017 16:26:20 +0000 (16:26 +0000)]
Merge "Update more implementations of findViewById()" into oc-dev
Makoto Onuki [Fri, 14 Apr 2017 16:25:50 +0000 (16:25 +0000)]
Merge "Actually remove the chooser APIs" into oc-dev am:
fbadd6dac9
am:
efda6390c9
Change-Id: I0a43d717f62dddace49e63ff2ab80283dea12357
Evan Rosky [Fri, 14 Apr 2017 16:23:44 +0000 (16:23 +0000)]
Merge "Improve rect-level focus ordering" into oc-dev am:
197052d6cb
am:
d6072f2900
Change-Id: Ide53aafb83aa1ca71adb966472ad5a411197e3f3
Adam Lesinski [Fri, 14 Apr 2017 16:20:55 +0000 (16:20 +0000)]
Merge "AAPT2: Fix order-of-destruction crash" into oc-dev am:
62b713ed73
am:
2fc8adc5fc
Change-Id: Ic723218e00e8eea1305bb47083bc056816c6f1a3
Selim Cinek [Fri, 14 Apr 2017 16:19:57 +0000 (16:19 +0000)]
Merge changes Icc9c36f7,I723474e2 into oc-dev am:
07525d4f25
am:
f1f29ca50b
Change-Id: Iff0c951c0a1e27f6285f994df3a6f40c9a3bd8e3
Lei Yu [Fri, 14 Apr 2017 16:18:02 +0000 (16:18 +0000)]
Merge "Refine BatteryInfo and battery drawable" into oc-dev am:
57af565fb7
am:
24638307c2
Change-Id: Ifae38f01a454fe9dcea1fbde0ea1a57a15087d8a
Jean-Michel Trivi [Fri, 14 Apr 2017 16:16:46 +0000 (16:16 +0000)]
Merge "Fix A11y volume persisting/restore" into oc-dev am:
076a0bd0bf
am:
350b39fbc8
Change-Id: I376101c1e68cdab01cdf3ee0db3bbe64b4bcd631
Chad Brubaker [Fri, 14 Apr 2017 16:14:24 +0000 (16:14 +0000)]
Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev
am:
8ee12087e6
Change-Id: I3f02d7e1b8dfba220fca62cea406650ed7851570
Dongwon Kang [Fri, 14 Apr 2017 16:12:49 +0000 (16:12 +0000)]
Merge "TIF: add helper methods for making a channel browsable." into oc-dev am:
b2eb818a7d
am:
3d9ecc264d
Change-Id: I321131835e44d67bb5fab085bc7f36a838dd40e3
Bookatz [Fri, 14 Apr 2017 16:11:50 +0000 (16:11 +0000)]
Merge "Collect background stats: syncs" into oc-dev am:
a8fc7bff5a
am:
53b7ff2014
Change-Id: I30744a569a8617369e52c06de9b897128521cbb4
Jeremy Joslin [Fri, 14 Apr 2017 16:10:34 +0000 (16:10 +0000)]
Merge "Add more NetworkRecommendationProvider documentation." into oc-dev am:
5879aa4b03
am:
9bcbf38e79
Change-Id: I6f57d8b0cc62b9ebe690e6d2efc5c725e90c8fe7
Adam Lesinski [Fri, 14 Apr 2017 16:09:37 +0000 (16:09 +0000)]
Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev am:
4124851b64
am:
b8dc42fcf3
Change-Id: I4874c6683a150b98f8edcd4f1d5e60e69b39e457
Jason Monk [Fri, 14 Apr 2017 16:08:42 +0000 (16:08 +0000)]
Merge "Fix location status bar icon" into oc-dev am:
d2b368a68d
am:
2e55245f98
Change-Id: I2dabf81060d98a2dcbec6487900c7148fc4daa07
Adam Lesinski [Fri, 14 Apr 2017 16:07:45 +0000 (16:07 +0000)]
Merge "Update docs for obtainStyledAttribute" into oc-dev am:
80b7a214ba
am:
f8235c3631
Change-Id: I7235021ff618fd99f5f1470cbf6e7e64420788e2
Chad Brubaker [Fri, 14 Apr 2017 16:07:11 +0000 (16:07 +0000)]
Merge "Implicitly expose SEND intents to Instant Apps" into oc-dev
Bryce Lee [Fri, 14 Apr 2017 16:06:48 +0000 (16:06 +0000)]
Merge "Remove window container from empty task when destroying." into oc-dev am:
61bce9ab13
am:
a27128b8c7
Change-Id: Iadbae988357788bb50bbaebd7e4a580aaefb4308
Adam Lesinski [Fri, 14 Apr 2017 16:04:32 +0000 (16:04 +0000)]
Merge "BatteryStats: Remove reading of cpu power" into oc-dev am:
af85d84050
am:
51d94c82af
Change-Id: I0bef2f7074a06f8336d727dd89c685c76262eca5
Jim Van Verth [Fri, 14 Apr 2017 16:03:13 +0000 (16:03 +0000)]
Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev am:
1be9766a68
am:
c7fd8db8a6
Change-Id: If7f3bfc01496a9fe9b198dc63bd7c064943c9008
Dianne Hackborn [Fri, 14 Apr 2017 16:01:58 +0000 (16:01 +0000)]
Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am:
29c70437b3
am:
76c71a01e2
Change-Id: Ieafe036ee6c2662d5897a8052facd3cd0d9fbed7
Jason Monk [Fri, 14 Apr 2017 16:01:02 +0000 (16:01 +0000)]
Merge "Fix leak in nav bar" into oc-dev am:
0b67d53ba9
am:
cea904333e
Change-Id: I51b2753f46f5b18e791af39020aab2c8547981df
Shuo Qian [Fri, 14 Apr 2017 15:59:28 +0000 (15:59 +0000)]
Merge "ECBM SystemProperty cleanup" into oc-dev am:
efb8882b47
am:
21d8d8095e
Change-Id: I2e92b292366138f1e9b0d559ffec407b702d81ba
Geoffrey Pitsch [Fri, 14 Apr 2017 15:58:22 +0000 (15:58 +0000)]
Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev am:
c4ca1b5677
am:
aa8dcf3751
Change-Id: Ic9780a11f1c3d3bbcbd8c5be350176507c62c685
Jack He [Fri, 14 Apr 2017 15:56:10 +0000 (15:56 +0000)]
Merge "Add developer setting and system API for inband ringing support" into oc-dev am:
aadf525e1a
am:
97164fe986
Change-Id: Iddc91ebca96bcb8e660c1b7117ab3fa57be7d4ee
Todd Kennedy [Fri, 14 Apr 2017 15:42:02 +0000 (15:42 +0000)]
Merge "Filter instant app content providers" into oc-dev am:
3891674204
am:
0bb486bcb4
Change-Id: If96297cade9909d744eb57669aecd96841a27a31
Hugo Benichi [Fri, 14 Apr 2017 15:36:10 +0000 (15:36 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback." am:
1a8f04b1b2 am:
4d80366762
am:
e505b37ec5
Change-Id: I99267e14ab04ce62c5c2385f24f5865e791a24a0
Jason Monk [Fri, 14 Apr 2017 15:35:20 +0000 (15:35 +0000)]
Merge "Update mobile data icon" into oc-dev am:
99856429db
am:
4520cb7ad9
Change-Id: I5fc19134a1ec0da5d4ede330a0d430ed428a53fa
Chris Tate [Fri, 14 Apr 2017 15:34:16 +0000 (15:34 +0000)]
Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev am:
117ac766a9
am:
636915a2ed
Change-Id: I28d8d31b30c9b500be1796566bb9885741b9aedc
Seigo Nonaka [Fri, 14 Apr 2017 15:31:25 +0000 (15:31 +0000)]
Merge "Introduce setFallbackTypeface" into oc-dev am:
729a515e5e
am:
17452ee553
Change-Id: I66fe816727aae3fdf617c41796b25478090704fe
Yu Liu [Fri, 14 Apr 2017 15:30:05 +0000 (15:30 +0000)]
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
Hugo Benichi [Fri, 14 Apr 2017 15:29:09 +0000 (15:29 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback." am:
1a8f04b1b2
am:
4d80366762
Change-Id: I8c5d3fba8aaa19e8ffd1146ddb68c4279140f921
Daniel Sandler [Fri, 14 Apr 2017 15:28:56 +0000 (15:28 +0000)]
Merge "Quick fix to lockscreen text color." into oc-dev am:
f06c2a01a5
am:
dc4fd3c847
Change-Id: Ieb6074d94b85a04ac7c87b5295b52817b2671c8e
Seigo Nonaka [Fri, 14 Apr 2017 15:24:10 +0000 (15:24 +0000)]
Merge "Use provided style for fallback font selection" into oc-dev
am:
43112fd26e
Change-Id: I15c19e1f5ff7919895af967f3ebf2d9564e0ce89
Hugo Benichi [Fri, 14 Apr 2017 15:22:39 +0000 (15:22 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
am:
1a8f04b1b2
Change-Id: I30d3790822430d250d6005cc165e7fa10f56649e
Alan Viverette [Wed, 5 Apr 2017 14:00:01 +0000 (10:00 -0400)]
Remove unnecessary casts on calls to findViewById
Just frameworks/ this time. More paths to come.
Bug:
24137209
Test: make -j32
Change-Id: Iff27abd26fa43296ac2fff8f534fc6742d2ae80c
Seigo Nonaka [Fri, 14 Apr 2017 15:13:12 +0000 (15:13 +0000)]
Merge "Use provided style for fallback font selection" into oc-dev
Treehugger Robot [Fri, 14 Apr 2017 15:10:08 +0000 (15:10 +0000)]
Merge "ConnectivityManager: release all requests mapping to a callback."
Benoit Lamarche [Fri, 14 Apr 2017 13:59:04 +0000 (15:59 +0200)]
resolve merge conflicts of
57fb5872d19c to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8
Hugo Benichi [Mon, 6 Mar 2017 00:17:06 +0000 (09:17 +0900)]
ConnectivityManager: release all requests mapping to a callback.
This patch changes how callback unregistration works in order to be
consistent with undocumented use cases currently de-facto supported
by the API (although in a buggy way):
- callback recycling: releasing then reregistering a callback again.
- multiple request registrations with the same callback.
The second use case is not desirable but needs to be taken into account
for now for the purpose of correctly releasing NetworkRequests
registered in ConnectivityService.
In order to support request release in both use cases with minimal
amount of complexity for the time being the following changes are done:
- request to callback unmapping is done synchronously at callback
release time.
- all requests associated to a callback are unmapped at callback
release time.
This fixes the following issues:
- a callback stops being triggered as soon as it is released.
Otherwise when recycling the callback immediately, it is possible
the previous request associated with it triggers it, confusing the
app.
- when a callback is registered multiple times, the requests are not
leaked.
- when a callback is registered multiple times and then released, the
N-1 first registrations do not trigger the callback anymore.
In the future it would be desirable to enforce the intended 1:1 mapping
between callbacks and requests at registration time.
Bug:
35921499,
35955593,
20701525
Test: - added new tests in ConnectivityManagerTest to test releasing,
recycling, and a disabled test for no multiple regristration.
- new tests catch regression causing b/
35921499, b/
35955593.
Change-Id: Ia0917ac322fc049f76adb4743bc745989fed6d26
Roozbeh Pournader [Fri, 14 Apr 2017 13:15:32 +0000 (13:15 +0000)]
Merge "Switch i18n listeners to use IME hint locales" into oc-dev am:
da97b66f41
am:
18fcf3f0d7
Change-Id: I43faa4ab695c52adf3c6d6f6170ffa5b6bc631f2
Chris Wren [Fri, 14 Apr 2017 13:14:37 +0000 (13:14 +0000)]
Merge "don't interpret milliseconds as nanoseconds" into oc-dev am:
de12503268
am:
a881fc2e2c
Change-Id: I6c803ec08b218203f3880cf0b2b269b3a6cb0692