OSDN Git Service
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: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
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: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: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: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: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: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 18:20:23 +0000 (10:20 -0800)]
resolve merge conflicts of
febd982 to stage-aosp-master
Change-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937
Alex Klyubin [Thu, 22 Dec 2016 17:06:06 +0000 (17:06 +0000)]
Merge "Make users of MtpServer fill in DeviceInfo field values"
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 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 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: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 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: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: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: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"
Tim Murray [Tue, 20 Dec 2016 19:47:24 +0000 (11:47 -0800)]
Fix incorrect FIFO cgroup assignment.
bug
33745094
Test: builds
Change-Id: I46eefc8ea6f17ca3795f4743692ddfea36d5db0f
Hall Liu [Tue, 20 Dec 2016 21:19:43 +0000 (21:19 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed"
am:
26e5096364
Change-Id: I2ce0958075ec3bd2c337993516ad06ffd264d594
Andre Eisenbach [Tue, 20 Dec 2016 21:18:35 +0000 (21:18 +0000)]
Merge "Bluetooth: persist state when turning on from BLE"
am:
8e9551bacf
Change-Id: Iad69e2f184df54ffbb2d7169e45345c80547b010
Hall Liu [Tue, 20 Dec 2016 21:13:31 +0000 (21:13 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed"
Andre Eisenbach [Tue, 20 Dec 2016 21:11:58 +0000 (21:11 +0000)]
Merge "Bluetooth: persist state when turning on from BLE"
Marie Janssen [Tue, 20 Dec 2016 19:21:12 +0000 (11:21 -0800)]
Bluetooth: persist state when turning on from BLE
Test: in BLE_ON state, turn to full on, reboot phone
Bug:
33777496
Change-Id: I246d6ff0dcb81d66aa915ef443040d6fc3c98310
Amin Shaikh [Tue, 20 Dec 2016 19:00:34 +0000 (11:00 -0800)]
Make WifiConfiguration#meteredHint a @SystemApi
This allows NetworkRecommendationProviders to set this field on
returned WifiConfigurations.
Test: make
Bug:
33760009
Change-Id: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
Merged-In: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
Amin Shaikh [Tue, 20 Dec 2016 20:24:31 +0000 (20:24 +0000)]
Merge "Add Wi-Fi quality badge icons."
am:
edb8982c31
Change-Id: I43d4f52e26eb7514b177d10769d6a5e3fc78f386
Treehugger Robot [Tue, 20 Dec 2016 20:13:59 +0000 (20:13 +0000)]
Merge "Add Wi-Fi quality badge icons."
Alex Klyubin [Tue, 20 Dec 2016 18:45:57 +0000 (18:45 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory"
am:
f420b91e26
Change-Id: Ic178cdd9043c171f2f51643212e34b642657abe9
Amin Shaikh [Sat, 17 Dec 2016 04:37:48 +0000 (20:37 -0800)]
Add Wi-Fi quality badge icons.
Test: make
Bug:
33705924
Change-Id: I6ae9fab369151e6c2d3769d7ba4a20103368f0a0
Alex Klyubin [Tue, 20 Dec 2016 18:33:28 +0000 (18:33 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory"
Jeremy Joslin [Tue, 20 Dec 2016 06:25:08 +0000 (06:25 +0000)]
Merge "Implement the request and recommend calls."
am:
1e814b3928
Change-Id: I91c905ab2fc7e061462fb96c2c81a783aa93a391
Treehugger Robot [Tue, 20 Dec 2016 06:16:03 +0000 (06:16 +0000)]
Merge "Implement the request and recommend calls."
Jeremy Joslin [Tue, 20 Dec 2016 03:26:04 +0000 (03:26 +0000)]
Merge "Implement the discovery of a network recommendation provider."
am:
470d256519
Change-Id: I804df594669be3b42704dead7007790666bef0f6
Treehugger Robot [Tue, 20 Dec 2016 03:16:31 +0000 (03:16 +0000)]
Merge "Implement the discovery of a network recommendation provider."
Jeremy Joslin [Fri, 9 Dec 2016 21:11:51 +0000 (13:11 -0800)]
Implement the request and recommend calls.
Implemented requestRecommendation() and requestScores() to call
through to the bound network recommendation provider if available.
BUG:
33593157
BUG:
33668692
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Change-Id: I055251fa94d93d4ea4e5001c4ec6c1dfb626d1b2
Merged-In: I8e2ed73dc6876deb1a8bd47bcaeaca8db68f3a44
Jeremy Joslin [Tue, 6 Dec 2016 15:42:38 +0000 (07:42 -0800)]
Implement the discovery of a network recommendation provider.
Updated the NetworkScorerAppManager to examine the list of configured
network recommendation providers and to select the first valid
provider.
As part of this update the old logic of looking for a valid network
scorer has been removed. Scorers/recommendation providers are only
selected from the configured list now. The setActiveScorer() method
has been deprecated as a result.
The NetworkScoreService has been updated to monitor the list of
potential recommendation providers and to reevaluate the binding
whenever they change. It also monitors the new setting for
NETWORK_RECOMMENDATIONS_ENABLED to connect or disconnect from the
provider as needed.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33158362
Change-Id: I450981261aa5355c1c91ec2e3a0a3b58cc65316b
Merged-In: I42aeb5223da794f71f7e58cb1bdf18817200cbf2
Jeff Sharkey [Tue, 20 Dec 2016 01:14:35 +0000 (01:14 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."
am:
5bc305b97c
Change-Id: Ia6af8d920971118f108320d08b15cbe3da59b28a
Treehugger Robot [Tue, 20 Dec 2016 01:06:22 +0000 (01:06 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."
Jeff Sharkey [Mon, 19 Dec 2016 23:39:02 +0000 (16:39 -0700)]
Remove ~1/3 of the installd calls at boot.
When preparing CE storage for an app, we always perform a second call
to extract any newly created CE directory inode. Let's simplify this
and just return the inode number from the createAppData() call.
Test: builds, boots, reads CE inodes after wipe
Bug:
33463450
Change-Id: I9b73da576800b56d7d0961dd4deb0b6a546acbe7
Jeremy Joslin [Mon, 19 Dec 2016 22:07:20 +0000 (22:07 +0000)]
Merge "Fix ScanResult array parceling."
am:
5fdc86fb27
Change-Id: I25e509ea057370c4380764c47808c0dbde85a6fc
Treehugger Robot [Mon, 19 Dec 2016 21:57:05 +0000 (21:57 +0000)]
Merge "Fix ScanResult array parceling."
Joe LaPenna [Mon, 19 Dec 2016 21:01:26 +0000 (21:01 +0000)]
Merge "Remove "final" from ResultCallback."
am:
b60d7b334c
Change-Id: I3b6679368418af3992007f58d47c544cf7a1b1ed
Treehugger Robot [Mon, 19 Dec 2016 20:54:13 +0000 (20:54 +0000)]
Merge "Remove "final" from ResultCallback."
Alex Klyubin [Mon, 19 Dec 2016 18:52:52 +0000 (10:52 -0800)]
Permit 65535 byte ZIP comments and empty Central Directory
This fixes two cosmetic issues in APK Signature Scheme v2 signature
verifier in Android Package Manager:
* Accept APKs with ZIP End of Central Directory comment of length
65535. Previously, only comments of length 65534 were accepted due
to a off by one bug.
* Accept APKs with empty ZIP Central Directory.
These issues should not affect actual APKs because they cannot have an
empty ZIP Central Directory (they must contain at least the
AndroidManifest.xml entry) and shouldn't contain any comments in ZIP
End of Central Directory.
Test: cts-tradefed run singleCommand cts --skip-device-info --skip-preconditions --skip-connectivity-check --abi arm64-v8a --module CtsAppSecurityHostTestCases -t android.appsecurity.cts.PkgInstallSignatureVerificationTest
Change-Id: I461c43472fa97c04e7579d129a6053e44233adb7
Joe LaPenna [Thu, 15 Dec 2016 22:46:52 +0000 (14:46 -0800)]
Remove "final" from ResultCallback.
Removing final makes providers easier to test using mocks.
Test: Build system image.
Change-Id: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
Merged-In: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
Jeremy Joslin [Sat, 17 Dec 2016 01:48:13 +0000 (17:48 -0800)]
Fix ScanResult array parceling.
readParcelableArray() wasn't working as expected so I just parceled
the array myself.
Test: adb shell am instrument -e class android.net.RecommendationRequestTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I83939d17769930b707b8bc579542c74a05e31d19
Merged-In: I47bc31adbedea817feaa5953cb6ee48506f9c6d6
Calin Juravle [Wed, 23 Nov 2016 19:50:58 +0000 (19:50 +0000)]
Report non-primary dex files loads to PM
Scaffold for the reporting of non-primary dex files loads to the package
manager.
This will enable:
1) monitoring and compilation of secondary dex file
2) better way to track foreign dex file usage (used to determined the
compilation filter of apks).
Test: device boots
Bug:
32871170
(cherry picked from commit
8d2a51f1b8fc35a1d4fda6b6cdfdf2754f1e1211)
Change-Id: I61e65aee471798fbc7a18938647051274c3a058a
Michael Rosenfeld [Sat, 17 Dec 2016 02:10:53 +0000 (02:10 +0000)]
Merge "Clean up local hprofs"
am:
9ab94e15c7
Change-Id: Ie99cc29ef321ec7276535b28ae4b7eaf828410da
Treehugger Robot [Sat, 17 Dec 2016 01:54:34 +0000 (01:54 +0000)]
Merge "Clean up local hprofs"
Michael Rosenfeld [Fri, 16 Dec 2016 20:42:01 +0000 (12:42 -0800)]
Clean up local hprofs
* After use
* Upon failure
Test: manual tool use
Change-Id: I2669e190c3792522c121158ea2aec84fe577c9e3
Marie Janssen [Fri, 16 Dec 2016 23:07:42 +0000 (23:07 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash"
am:
e2c22e38d5
Change-Id: I6722c1b8d839918e2ce7918f5f7b8583a14c1ded
Marie Janssen [Fri, 16 Dec 2016 22:56:58 +0000 (22:56 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash"
Philip P. Moltmann [Fri, 16 Dec 2016 22:51:11 +0000 (22:51 +0000)]
Merge "Increment vers of PrintRecommendationService"
am:
08bff42ef4
Change-Id: Ie98d6f58dbb4d29e27200aa1b9829372930a0fa3
Marie Janssen [Thu, 15 Dec 2016 21:51:30 +0000 (13:51 -0800)]
Bluetooth: fix issues re-enabling after crash
When Bluetooth crashes, sometimes an LE app restarts it before
ActivityManager gets a chance. In this case, the Bluetooth manager
would assume the state should be LE only and did not continue to fully
enabled.
Luckily in this case the persisted system state is also ON. Use the
persisted state as information about whether we should be fully enabled.
Test: basic sanity check, forced crash of BT
Bug:
33632976
Change-Id: I546d7abccb82a26fcca2eb70d6d7c76e9510404e
Philip P. Moltmann [Fri, 16 Dec 2016 22:36:10 +0000 (22:36 +0000)]
Merge "Increment vers of PrintRecommendationService"
Vitalii Tomkiv [Fri, 16 Dec 2016 22:35:54 +0000 (22:35 +0000)]
Merge changes Ic85892b4,I627e47c6
am:
d995c94426
Change-Id: If036b0f5b8497667a9c2a916ec74d482def2aed5
Vitalii Tomkiv [Fri, 16 Dec 2016 22:35:49 +0000 (22:35 +0000)]
Make sure Zygote is running at process priority 0 after VM has started.
am:
1e52ce48a6
Change-Id: Ia1f511d294a9c718534a4a0b8ad747ef58a98b52
Todd Kjos [Fri, 16 Dec 2016 22:35:08 +0000 (22:35 +0000)]
Revert "Add boost to increase the load on newly-forked zygote processes."
am:
8175f0955a
Change-Id: I6f61c45f690647c860e0ceb140857e53bc253f00
Treehugger Robot [Fri, 16 Dec 2016 22:20:24 +0000 (22:20 +0000)]
Merge changes Ic85892b4,I627e47c6
* changes:
Make sure Zygote is running at process priority 0 after VM has started.
Revert "Add boost to increase the load on newly-forked zygote processes."
Torne (Richard Coles) [Fri, 16 Dec 2016 21:38:17 +0000 (21:38 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist."
am:
f8882ae834
Change-Id: I02d08d8f91567b8bd6709137f98f87550c13f145
Treehugger Robot [Fri, 16 Dec 2016 21:25:34 +0000 (21:25 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist."
Philip P. Moltmann [Fri, 16 Dec 2016 20:51:49 +0000 (12:51 -0800)]
Increment vers of PrintRecommendationService
as the Samsung PlugIn was updated.
Test: Let the service generate some recommendations
Change-Id: Ief7ea4f1dddfee92aa9fa83ff53b296ced0e3b55