OSDN Git Service
Martijn Coenen [Thu, 29 Dec 2016 09:12:22 +0000 (09:12 +0000)]
Merge "Add (un)linkToDeath support to HwBinder." am:
7705363166
am:
010d0be575
Change-Id: Ibabccaf8555bd0229add18a798bff685c6a1c433
Martijn Coenen [Thu, 29 Dec 2016 09:04:49 +0000 (09:04 +0000)]
Merge "Add (un)linkToDeath support to HwBinder."
am:
7705363166
Change-Id: I007b2fc2982d164176607cd8f2d0ccc9ebde982c
Martijn Coenen [Thu, 29 Dec 2016 08:07:44 +0000 (08:07 +0000)]
Merge "Add (un)linkToDeath support to HwBinder."
Martijn Coenen [Tue, 27 Dec 2016 13:33:09 +0000 (14:33 +0100)]
Add (un)linkToDeath support to HwBinder.
This is mostly copied over from binder's existing
death recipient support. The implementation keeps
a list of registered recipients, both for being
able to map a native recipient back to the corresponding
Java recipient, as well as being able to unregister
recipients correctly.
Test: mma, hidl_test_java
Bug:
31632518
Change-Id: Id313fd248be6925056c4ade8298fe5fb04e007cc
ashutoshj [Thu, 29 Dec 2016 01:45:34 +0000 (01:45 +0000)]
Merge "Change the name of the contexthub service." am:
fba752e64c
am:
8a3f7c0738
Change-Id: I02265e27f7245a13cdfc705dba4cd4de33ed0253
ashutoshj [Thu, 29 Dec 2016 01:38:30 +0000 (01:38 +0000)]
Merge "Change the name of the contexthub service."
am:
fba752e64c
Change-Id: Ie354f06495f0c3fb73aa053956ecc371716bab3f
ashutoshj [Thu, 29 Dec 2016 01:29:41 +0000 (01:29 +0000)]
Merge "Change the name of the contexthub service."
Adrian Roos [Wed, 28 Dec 2016 23:51:30 +0000 (23:51 +0000)]
Merge "QS - Fix race condition in accessibility" am:
302efd6125
am:
3c0a8bba3c
Change-Id: I3e05c8c127c021dc321b0ef130159ff7a021a9e8
Adrian Roos [Wed, 28 Dec 2016 23:43:46 +0000 (23:43 +0000)]
Merge "QS - Fix race condition in accessibility"
am:
302efd6125
Change-Id: I13c4959fde96684c52124ff8809d6921fc404a42
Adrian Roos [Wed, 28 Dec 2016 23:29:58 +0000 (23:29 +0000)]
Merge "QS - Fix race condition in accessibility"
Ashutosh Joshi [Tue, 27 Dec 2016 17:32:49 +0000 (09:32 -0800)]
Change the name of the contexthub service.
Change the name used by the contexthub service. Specifically, this
change switches from using the "ContexthubService.CONTEXTHUB_SERVICE"
constant to using the "Context.CONTEXTHUB_SERVICE" constant- which is in
line with the other Android services.
Merged-In: I18ae73ed0fda2f938e3233670dc52b5692d321ae
Test: GTS tests pass.
Change-Id: I18ae73ed0fda2f938e3233670dc52b5692d321ae
Andrew Solovay [Wed, 28 Dec 2016 20:32:13 +0000 (20:32 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev am:
61dad4b2fc
am:
897df2b5af
Change-Id: I06cea8a7d84e02346047e0e0bf88cf30f9da4120
Andrew Solovay [Wed, 28 Dec 2016 20:31:08 +0000 (20:31 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported. am:
40ba793b33
am:
2891357f4d
Change-Id: Id95f2f8c11a98b56f656b3688accd632fe6da43d
Andrew Solovay [Wed, 28 Dec 2016 20:24:34 +0000 (20:24 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
am:
61dad4b2fc
Change-Id: I1918b70ad644f7aded33d27bcc55e05478d9f773
Andrew Solovay [Wed, 28 Dec 2016 20:24:30 +0000 (20:24 +0000)]
[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported.
am:
40ba793b33
Change-Id: I5d15df8192fee8362dca8dcc53d84b75af29a13f
Andrew Solovay [Wed, 28 Dec 2016 20:16:26 +0000 (20:16 +0000)]
Merge "[DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer supported." into nyc-mr1-dev
Jeremy Joslin [Wed, 28 Dec 2016 20:10:35 +0000 (20:10 +0000)]
Merge "Cleanup the evaluateBinding() method." am:
c26aa87a2b
am:
b12af1b18a
Change-Id: I65d005aa303102b212c93b0b2702941bf554526d
Jeremy Joslin [Wed, 28 Dec 2016 20:03:05 +0000 (20:03 +0000)]
Merge "Cleanup the evaluateBinding() method."
am:
c26aa87a2b
Change-Id: Iaac51cf5114ed6af55246b3580b9f5403a1bb3bd
Treehugger Robot [Wed, 28 Dec 2016 19:52:41 +0000 (19:52 +0000)]
Merge "Cleanup the evaluateBinding() method."
Jeremy Joslin [Wed, 21 Dec 2016 21:35:02 +0000 (13:35 -0800)]
Cleanup the evaluateBinding() method.
Small refactor to remove 1 level of nesting.
Test: build, run.
Change-Id: Ic46a65036b207ff73fefced914e0928de2f2b500
Merged-In: I38836ca9d18c5fcd3c6edf5931b58de3b08614ee
Joe LaPenna [Wed, 28 Dec 2016 02:56:34 +0000 (02:56 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider." am:
1471ad3ea7
am:
ddff9e586c
Change-Id: Ie86fbc9c427e3f238e0d83a03240fc7045a61e5e
Joe LaPenna [Wed, 28 Dec 2016 02:49:01 +0000 (02:49 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider."
am:
1471ad3ea7
Change-Id: I9b052e48c067dc50111c6ce6bf1b200232676aa2
Treehugger Robot [Wed, 28 Dec 2016 02:36:22 +0000 (02:36 +0000)]
Merge "Send RECOMMEND_NETWORKS action when binding to provider."
Joe LaPenna [Tue, 27 Dec 2016 22:50:14 +0000 (14:50 -0800)]
Send RECOMMEND_NETWORKS action when binding to provider.
Some services use action to disambiguate which binder to return in
onBind.
Test: built && installed && bound.
BUG:
33905890
Change-Id: I83ae41b472c597661b93f5467b64b258e9056f5f
Merged-In: I83ae41b472c597661b93f5467b64b258e9056f5f
Jorim Jaggi [Tue, 27 Dec 2016 16:32:24 +0000 (16:32 +0000)]
Merge "Fix window transformation related issue" am:
8760e60da5
am:
1200cfb48d
Change-Id: I6a105898193544119e3ca7a911faed67e46e539d
Jorim Jaggi [Tue, 27 Dec 2016 16:23:49 +0000 (16:23 +0000)]
Merge "Fix window transformation related issue"
am:
8760e60da5
Change-Id: I686b637ea76402c4d4c666b60ece83755a24a5d1
Jorim Jaggi [Tue, 27 Dec 2016 16:08:43 +0000 (16:08 +0000)]
Merge "Fix window transformation related issue"
dooyoung.hwang [Thu, 22 Dec 2016 11:04:20 +0000 (20:04 +0900)]
QS - Fix race condition in accessibility
When users try to open panel, initialization of accessibility is called
in Main Thread by this callstack.
at android.view.ViewGroup.buildOrderedChildList
at android.view.View.populateAccessibilityNodeInfoDrawingOrderInParent
at android.view.View.onInitializeAccessibilityNodeInfoInternal
at android.view.View.onInitializeAccessibilityNodeInfo
at android.view.View.createAccessibilityNodeInfoInternal
at android.view.View.createAccessibilityNodeInfo
at android.view.accessibility.AccessibilityRecord.setSource
...
at android.view.View.setFlags
at android.view.View.setVisibility
at com.android.systemui.qs.QSContainer.updateQsState
at com.android.systemui.qs.QSContainer.setExpanded
at com.android.systemui.statusbar.phone.NotificationPanelView.updateQsState
And another initialization is tried in QSTileHost Thread by this callstack.
at android.view.ViewGroup.buildOrderedChildList
at android.view.View.populateAccessibilityNodeInfoDrawingOrderInParent
at android.view.View.onInitializeAccessibilityNodeInfoInternal
at android.view.ViewGroup.onInitializeAccessibilityNodeInfoInternal
at android.view.View.onInitializeAccessibilityNodeInfo
at android.view.View.createAccessibilityNodeInfoInternal
at android.view.View.createAccessibilityNodeInfo
at android.view.accessibility.AccessibilityRecord.setSource
...
at android.view.View.announceForAccessibility
at com.android.systemui.qs.QSPanel.onAnnouncementRequested
at com.android.systemui.qs.QSTile.handleStateChanged
This race condition can cause crashes, because the same ArrayList
(mPreSortedChildren or mTempArrayList in ViewGroup) is modified by two
different thread.
Test : manual
Change-Id: I9e0ad1fef4be7dc378463c06d10854e0e4c5b3d6
Joe LaPenna [Thu, 22 Dec 2016 21:47:00 +0000 (21:47 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig." am:
4ce798f45f
am:
6f87331902
Change-Id: I3681893e43949060922f72c65f8f106090005d14
Joe LaPenna [Thu, 22 Dec 2016 21:41:23 +0000 (21:41 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig."
am:
4ce798f45f
Change-Id: I7343422cd3405628d6c2b90092af631b77eb37a7
Treehugger Robot [Thu, 22 Dec 2016 21:29:56 +0000 (21:29 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig."
Steven Moreland [Thu, 22 Dec 2016 20:53:52 +0000 (20:53 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder" am:
380697ca79
am:
b6022b9fa0
Change-Id: I7135d790ed299f21975c5b27b534714d83ccf440
Steven Moreland [Thu, 22 Dec 2016 20:48:17 +0000 (20:48 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder"
am:
380697ca79
Change-Id: I301b1f9e9344a8b314a6debff3fef2e7c8362f1a
Treehugger Robot [Thu, 22 Dec 2016 20:41:01 +0000 (20:41 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder"
Joe LaPenna [Thu, 22 Dec 2016 04:17:08 +0000 (20:17 -0800)]
Add simplified_network_settings_bool to CarrierConfig.
Some carriers want to further simplify network settings based on a
variety of wifi or cellular related bundles. Expose a config a
carrier might set to allow SysUi, Settings and platform to adjust.
BUG:
33111931
Test: runtest carrierconfig-unit
Change-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804
Merged-In: I35a7ef15bbba23cf9e0380432fc001804c7e1804
Alex Klyubin [Thu, 22 Dec 2016 19:22:46 +0000 (19:22 +0000)]
Merge "Make users of MtpServer fill in DeviceInfo field values" am:
933ea68aca
am:
e988e8f1f6
Change-Id: Icce6e31723d4dac12cf2c2e389e69c067dd66a91
Sundeep Ghuman [Thu, 22 Dec 2016 19:16:13 +0000 (19:16 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest." am:
5e055b6a18
am:
80f1e2e52a
Change-Id: I08fe2e52a4926dc3d2fae02bf90c3fcf5b60ee82
Sundeep Ghuman [Thu, 22 Dec 2016 19:14:48 +0000 (19:14 +0000)]
Merge "Cherrypick: Define the calculateRankingScore method and Key." am:
425af45d02
am:
41577a0029
Change-Id: I7807d92a705a8ec9d9c7b04159e1cd2290846e38
Jeremy Joslin [Thu, 22 Dec 2016 19:12:47 +0000 (19:12 +0000)]
Merge changes I40f055df,I562713df am:
4a04c07df4
am:
8eff13b521
Change-Id: I758eaa79b9707073fcfea1454e59c48c58a80e4d
Jeremy Joslin [Thu, 22 Dec 2016 19:11:48 +0000 (19:11 +0000)]
Stay bound to the most current active scorer. am:
b1365852cc
am:
d79019a616
Change-Id: Ib3c7a4cdaea80ad4ac84c6baa92d879396c0f483
Jeremy Joslin [Thu, 22 Dec 2016 19:10:46 +0000 (19:10 +0000)]
Clear and restore the calling ID. am:
29ed4a99bf
am:
3588b8d44c
Change-Id: I43b6f2899b5d82d4781937766907d6d7afa6b2bd
Alex Klyubin [Thu, 22 Dec 2016 19:10:00 +0000 (19:10 +0000)]
Merge "Make users of MtpServer fill in DeviceInfo field values"
am:
933ea68aca
Change-Id: Iacecf43819f8cd6c0e8df7a53105e0538075c188
Sundeep Ghuman [Thu, 22 Dec 2016 19:05:44 +0000 (19:05 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest."
am:
5e055b6a18
Change-Id: I52e23144730acc15c943fa6485a872a88ee0a787
Sundeep Ghuman [Thu, 22 Dec 2016 19:04:22 +0000 (19:04 +0000)]
Merge "Cherrypick: Define the calculateRankingScore method and Key."
am:
425af45d02
Change-Id: Ib61f91087967f1b026cd2ba77175ccf47943bc53
Jeremy Joslin [Thu, 22 Dec 2016 19:02:45 +0000 (19:02 +0000)]
Merge changes I40f055df,I562713df
am:
4a04c07df4
Change-Id: Ie951518a0a472691d1cd8b90a025e3a67b1acd53
Jeremy Joslin [Thu, 22 Dec 2016 19:02:38 +0000 (19:02 +0000)]
Stay bound to the most current active scorer.
am:
b1365852cc
Change-Id: I8313d23450b47f23f73eb050e6b4244bc0d37622
Jeremy Joslin [Thu, 22 Dec 2016 19:01:43 +0000 (19:01 +0000)]
Clear and restore the calling ID.
am:
29ed4a99bf
Change-Id: Ie5752ca772e6f5c8fed8092d23e0604f44598b24
Alex Klyubin [Thu, 22 Dec 2016 19:01:13 +0000 (19:01 +0000)]
resolve merge conflicts of
febd982 to stage-aosp-master
am:
5c53fdb893
Change-Id: Ib0878f0f17c3799ff9ffb92d7e85904fc91fdab7
Alex Klyubin [Thu, 22 Dec 2016 18:20:23 +0000 (10:20 -0800)]
resolve merge conflicts of
febd982 to stage-aosp-master
Change-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937
Tom O'Neill [Thu, 22 Dec 2016 18:09:50 +0000 (18:09 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e am:
3b7d90c024
am:
f035e8b411
Change-Id: I6a73e11687db11cd0d6814999e955c20fe7b8ad5
Tom O'Neill [Thu, 22 Dec 2016 18:04:44 +0000 (18:04 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f am:
2da05d0f9e
am:
3b7d90c024
Change-Id: I46c1bf565b04175c8c97c9faeceed55bda41dbde
Tom O'Neill [Thu, 22 Dec 2016 17:59:47 +0000 (17:59 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6 am:
7cec76de0f
am:
2da05d0f9e
Change-Id: I8c94a06f5fa722312436484609bafcb0585d6d18
Tom O'Neill [Thu, 22 Dec 2016 17:54:44 +0000 (17:54 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51 am:
56098f81b6
am:
7cec76de0f
Change-Id: I9168d45717c26e71bb356dd7304276e23c519bd9
Tom O'Neill [Thu, 22 Dec 2016 17:44:46 +0000 (17:44 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc am:
1ac8affd51
am:
56098f81b6
Change-Id: I14fcacaede569580c8ca8e5bbbebb408ddcce76a
Tom O'Neill [Thu, 22 Dec 2016 17:39:18 +0000 (17:39 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66 am:
d82f8a67fc
am:
1ac8affd51
Change-Id: I965c900e266a9189c595612cef6ddac839498949
Tom O'Neill [Thu, 22 Dec 2016 17:34:11 +0000 (17:34 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2 am:
1f458fdc66
am:
d82f8a67fc
Change-Id: I25e43680e464c5169e8a5b9e8151b0dab2d2cf86
Tom O'Neill [Thu, 22 Dec 2016 17:29:05 +0000 (17:29 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344 am:
d28eef0cc2
am:
1f458fdc66
Change-Id: I61d4b25ee0264397693f30e2091997c058d0c5fc
Tom O'Neill [Thu, 22 Dec 2016 17:23:39 +0000 (17:23 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b am:
1684e5f344
am:
d28eef0cc2
Change-Id: If937d91cee2bb06406cf3cd1ae6ac3402a51e88d
Tom O'Neill [Thu, 22 Dec 2016 17:19:10 +0000 (17:19 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b
am:
1684e5f344
Change-Id: I0ebd2856e2e2f3793273ba952b44dc77e85b021e
Tom O'Neill [Thu, 22 Dec 2016 17:14:05 +0000 (17:14 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516
am:
0a8978f04b
Change-Id: I693665a57465ec57f946fad57cda9ce48389408f
Tom O'Neill [Thu, 22 Dec 2016 17:09:09 +0000 (17:09 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872
am:
3380a77516
Change-Id: Ice61f337e1fcfd0569431538e475d94f9d205423
Alex Klyubin [Thu, 22 Dec 2016 17:06:06 +0000 (17:06 +0000)]
Merge "Make users of MtpServer fill in DeviceInfo field values"
Tom O'Neill [Thu, 22 Dec 2016 17:04:07 +0000 (17:04 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e
am:
d417e54872
Change-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db
Tom O'Neill [Thu, 22 Dec 2016 16:58:33 +0000 (16:58 +0000)]
Fix exploit where can hide the fact that a location was mocked
am:
a206a0f17e
Change-Id: Ib3af056919a4b909d3d11dd3fe2b46eaa7cdf0f4
Treehugger Robot [Thu, 22 Dec 2016 03:11:57 +0000 (03:11 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest."
Sundeep Ghuman [Thu, 22 Dec 2016 00:44:46 +0000 (16:44 -0800)]
Fix failing WifiNetworkScoreCacheTest.
There was a NPE thrown by an unintialized mock.
Bug:
33818187
Test: Android unit tests
Change-Id: I478885dcebaf41f93488a6a12bb83652ad462be5
Treehugger Robot [Thu, 22 Dec 2016 00:03:56 +0000 (00:03 +0000)]
Merge "Cherrypick: Define the calculateRankingScore method and Key."
Treehugger Robot [Wed, 21 Dec 2016 22:58:40 +0000 (22:58 +0000)]
Merge changes I40f055df,I562713df
* changes:
Stay bound to the most current active scorer.
Clear and restore the calling ID.
Sundeep Ghuman [Wed, 7 Dec 2016 21:32:33 +0000 (13:32 -0800)]
Cherrypick: Define the calculateRankingScore method and Key.
Define the key to be used to store the rankingScoreOffset inside the
ScoredNetwork bundle. Implement a platform API method to calculate the
ranking score for a given rssi.
OCL: ag/
1688711
Bug:
33049302
Test: Unit tests
Change-Id: Ia3fea2197d7c211a2313fced8713d79d8d5f4f6e
Merged-In: Ia3fea2197d7c211a2313fced8713d79d8d5f4f6e
Topic: ScoredNetworkRankingScore
Alex Klyubin [Wed, 21 Dec 2016 19:19:52 +0000 (11:19 -0800)]
Make users of MtpServer fill in DeviceInfo field values
This is part of weaning apps off accessing system identifiers via
system properties API. Apps should use android.os.Build API instead.
Bug:
33700679
Test: Enable MTP mode then check that mtp-detect output same as before this commit
Change-Id: I4e6696cdee18b9c3e987c432c095911e85a997db
Jeremy Joslin [Wed, 21 Dec 2016 00:59:26 +0000 (16:59 -0800)]
Stay bound to the most current active scorer.
This fixes the following issue:
1) Scorer A is active and bound.
2) A change occurs to Scorer A such that it is no longer the selected
scorer.
3) Scorer B is selected as the scorer and returned whenever
getActiveScorer() is queried.
4) Scorer A is never unbound because it isn't seen as the active
scorer.
5) Scorer B is never bound until its package changes in some way (or
the feature is disabled/enabled).
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest + manual testing.
Change-Id: I40f055df472e2b9e7b07e6979a841dd4c0b794ce
Merged-In: I468a8c02a72f089f1fb778d150d945efe5485b88
Jeremy Joslin [Tue, 20 Dec 2016 22:36:20 +0000 (14:36 -0800)]
Clear and restore the calling ID.
Clear and restore the calling identity in IPC methods after asserting
the caller has the required permissions.
Fixed 2 tests in NetworkScoreServiceTest that were failing due to a
recent refactor.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33781319
Change-Id: I562713df3d9455cdc02bf80a687940fb9daecd8f
Merged-In: Icd79751d12dcfe4af8026980aaa1f7bd463468dc
Jeff Sharkey [Wed, 21 Dec 2016 21:11:19 +0000 (21:11 +0000)]
Merge "Avoid Calendar's unexpect change in snapToCycleDay()"
Amin Shaikh [Wed, 21 Dec 2016 20:02:03 +0000 (20:02 +0000)]
Merge "Expose ScanResult#untrusted as a @SystemApi." am:
a93e57f1ac
am:
a3943850ab
Change-Id: Id763d2f82e10dd5843258ef09d0e65824e2c2de6
Amin Shaikh [Wed, 21 Dec 2016 19:56:19 +0000 (19:56 +0000)]
Merge "Expose ScanResult#untrusted as a @SystemApi."
am:
a93e57f1ac
Change-Id: I9cac16dbceb36d6ff72e92d2ab8de20bd8d70e36
Treehugger Robot [Wed, 21 Dec 2016 19:47:31 +0000 (19:47 +0000)]
Merge "Expose ScanResult#untrusted as a @SystemApi."
Amin Shaikh [Sat, 10 Dec 2016 01:11:50 +0000 (17:11 -0800)]
Expose ScanResult#untrusted as a @SystemApi.
- Expose ScanResult#untrusted to inform NetworkRecommendationProviders
that a ScanResult does not correspond to a saved network.
- Add static construction methods and assertions to RecommendationResult
Test: runtest frameworks-services
Bug:
33490132
Change-Id: If7006040f63843c1c468c9d95c5c017383c5c5dd
Merged-In: If7006040f63843c1c468c9d95c5c017383c5c5dd
Shunta Sato [Tue, 25 Oct 2016 08:42:58 +0000 (17:42 +0900)]
Avoid Calendar's unexpect change in snapToCycleDay()
Symptom:
Calendar object's certain field is unexpectedly changed after
using Calendar.add() method.
Detail and sample:
Following patch causes this issue.
- Switch network cycle calculation to use Calendar.
https://android.googlesource.com/platform/frameworks/base/+/
f2bead5
Call of Calendar.add() method might make a smaller field value
invariant. The smaller field means such a field of
Calendar.HOUR_OF_DAY, Calendar.MINUTE, Calendar.SECOND and so on
if Calendar.MONTH field is focused.
According to above, sometimes correct Calendar value won't be
acquired by original code.
To avoid unexpected change, it requires initialization toward
each smaller field after Calendar.add() call.
Solutions:
Calendar.DAY_OF_MONTH, Calendar.HOUR_OF_DAY, Calendar.MINUTE,
and Calendar.SECOND fields is set to 0 after added value to
Calendar.MONTH field.
Bug:
32724903
Author: Shigeki Yokomichi <shigeki.x.yokomichi@sonymobile.com>
Change-Id: I7af6391653be21786b662b2f8eaad10c413733c1
Steven Moreland [Thu, 15 Dec 2016 23:50:17 +0000 (15:50 -0800)]
HwBinder: fail gracefully for device w/o hwbinder
Test: compiles
Change-Id: I03ffd0d7480c5771634977e30ccf02b39f69f8ba
Jeff Sharkey [Wed, 21 Dec 2016 19:01:55 +0000 (19:01 +0000)]
Merge "Reconnect to installd when it restarts." am:
48d5d6cda8
am:
fe35f0f4f6
Change-Id: I63a78822f4a4c3c4d6e71af721c7a31a5bdba03a
Jeff Sharkey [Wed, 21 Dec 2016 18:56:47 +0000 (18:56 +0000)]
Merge "Reconnect to installd when it restarts."
am:
48d5d6cda8
Change-Id: Ib4c4ced58f5963465f1e2d3eb401a8c71624ac12
Jeff Sharkey [Wed, 21 Dec 2016 18:45:45 +0000 (18:45 +0000)]
Merge "Reconnect to installd when it restarts."
Jeff Sharkey [Wed, 21 Dec 2016 16:18:33 +0000 (09:18 -0700)]
Reconnect to installd when it restarts.
Test: builds, boots, reconnects when installd dies
Bug:
33695164
Change-Id: I29769a111783095f742ad81af779a7403ca52ff3
Calin Juravle [Wed, 21 Dec 2016 10:09:45 +0000 (10:09 +0000)]
Merge "Report non-primary dex files loads to PM" am:
f23ea2ca62
am:
78b3889804
Change-Id: Iaf17def2729170403fa61ce0e09ced4675a47191
Calin Juravle [Wed, 21 Dec 2016 10:04:39 +0000 (10:04 +0000)]
Merge "Report non-primary dex files loads to PM"
am:
f23ea2ca62
Change-Id: I5eb9f8c8bc7e66c074adb95ad5dfec412cec539c
Calin Juravle [Wed, 21 Dec 2016 09:57:40 +0000 (09:57 +0000)]
Merge "Report non-primary dex files loads to PM"
Tim Murray [Wed, 21 Dec 2016 02:05:58 +0000 (02:05 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." am:
d9ce420d9a
am:
a72f5f27d2
Change-Id: I172251111ab333e750bc862725a50b7913f20c90
Tim Murray [Wed, 21 Dec 2016 01:57:51 +0000 (01:57 +0000)]
Merge "Fix incorrect FIFO cgroup assignment."
am:
d9ce420d9a
Change-Id: Ib5c5ee81058ded098d16dba1dfd43096bbd91937
Treehugger Robot [Wed, 21 Dec 2016 01:47:55 +0000 (01:47 +0000)]
Merge "Fix incorrect FIFO cgroup assignment."
Amin Shaikh [Wed, 21 Dec 2016 01:15:18 +0000 (01:15 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am:
c1940ef392
am:
380341f6c8
Change-Id: If863fcce014adf2b2c0d866dc14ba59732f57520
Amin Shaikh [Wed, 21 Dec 2016 01:10:44 +0000 (01:10 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."
am:
c1940ef392
Change-Id: If3d909680cbcda0440807db40761c1a84b2cde97
Treehugger Robot [Wed, 21 Dec 2016 01:00:18 +0000 (01:00 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."
Sundeep Ghuman [Wed, 21 Dec 2016 00:51:49 +0000 (00:51 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am:
31a8f712ab
am:
6d749fb489
Change-Id: I711dd2b9d142a3a92ed641b08dd944be329e503a
Sundeep Ghuman [Wed, 21 Dec 2016 00:43:15 +0000 (00:43 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."
am:
31a8f712ab
Change-Id: Iba52c9ed85a7e35c46b85a9516a81ac5096a6710
Treehugger Robot [Wed, 21 Dec 2016 00:28:47 +0000 (00:28 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."
Amin Shaikh [Tue, 20 Dec 2016 23:28:34 +0000 (15:28 -0800)]
Change fillColor for Wi-Fi badges to #FFFFFF.
Bug:
33778046
Test: make
Change-Id: I0cfc2c6d682a2f13e665563fc1c54fa19324af53
Sundeep Ghuman [Tue, 13 Dec 2016 02:05:10 +0000 (18:05 -0800)]
Create and implement a CacheListener inside WifiNetworkScoreCache.
Bug:
33041117
Test: Unit tests
Change-Id: Ic07522062f79223079b84c49210fcfc0217ecd38
Amin Shaikh [Tue, 20 Dec 2016 22:39:41 +0000 (22:39 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am:
f456ddf3fd
am:
a81a4163f5
Change-Id: I847b3d07024e025040304f47de88211956d20175
Amin Shaikh [Tue, 20 Dec 2016 22:35:06 +0000 (22:35 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi"
am:
f456ddf3fd
Change-Id: Ie1324197329486e9eeec0bb765441a6fc5bb8a32
Treehugger Robot [Tue, 20 Dec 2016 22:24:13 +0000 (22:24 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi"