Commit Graph

62530 Commits

Author SHA1 Message Date
Martijn Coenen
c052e6c67f Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 am: 010d0be575
am: 1f8c96ca7f

Change-Id: Ic195a1f3ab2a9d318fe667ac3be0ce166119dc66
2016-12-29 09:19:55 +00:00
Martijn Coenen
1f8c96ca7f Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166
am: 010d0be575

Change-Id: Ibabccaf8555bd0229add18a798bff685c6a1c433
2016-12-29 09:12:22 +00:00
Martijn Coenen
010d0be575 Merge "Add (un)linkToDeath support to HwBinder."
am: 7705363166

Change-Id: I007b2fc2982d164176607cd8f2d0ccc9ebde982c
2016-12-29 09:04:49 +00:00
Martijn Coenen
727f7bf84f 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
2016-12-29 04:22:30 +00:00
ashutoshj
3659363d06 Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738
am: cf33fd7910

Change-Id: Ic9daa912077d6162092a0adcb5d8debf10be9c55
2016-12-29 01:52:34 +00:00
ashutoshj
cf33fd7910 Merge "Change the name of the contexthub service." am: fba752e64c
am: 8a3f7c0738

Change-Id: I02265e27f7245a13cdfc705dba4cd4de33ed0253
2016-12-29 01:45:34 +00:00
ashutoshj
8a3f7c0738 Merge "Change the name of the contexthub service."
am: fba752e64c

Change-Id: Ie354f06495f0c3fb73aa053956ecc371716bab3f
2016-12-29 01:38:30 +00:00
Ashutosh Joshi
835da289fa 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
2016-12-28 13:57:27 -08:00
Selim Cinek
7e5cff0167 DO NOT MERGE Revert "Add Brightness setting for VR Mode."
am: 966045d070

Change-Id: Ib1be78a47f5947f4fcc6eabc2f6af76523690ed9
2016-12-27 19:22:04 +00:00
Selim Cinek
966045d070 DO NOT MERGE Revert "Add Brightness setting for VR Mode."
This reverts commit 84980c7a93.

Bug: 33895226
Bug: 30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
2016-12-27 18:28:40 +00:00
Santos Cordon
84334e25cd Add Brightness setting for VR Mode.
am: 84980c7a93

Change-Id: I4a9c3db7bdf73e673cf8b2409404339df94086c2
2016-12-22 23:58:05 +00:00
Santos Cordon
84980c7a93 Add Brightness setting for VR Mode.
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.

Bug: 30984614
Merged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
2016-12-22 23:26:49 +00:00
pkanwar
21f8870abc DO NOT MERGE: Add UI toggle to control connections to carrier networks.
am: 57f383709b

Change-Id: Ieb3aa3a0755bcd16759d91852980bcdf5373eaa8
2016-12-22 20:53:58 +00:00
Sundeep Ghuman
4ac2f9f53e Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02 am: 41577a0029
am: bfc0bfe645

Change-Id: Ia3d455791e3f219a3e0cff3b6946184757487d71
2016-12-22 19:26:05 +00:00
Sundeep Ghuman
bfc0bfe645 Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02
am: 41577a0029

Change-Id: I7807d92a705a8ec9d9c7b04159e1cd2290846e38
2016-12-22 19:14:48 +00:00
pkanwar
57f383709b DO NOT MERGE: Add UI toggle to control connections to carrier networks.
Bug: 31003437
Change-Id: I6cf32ae4d376eb65f80492da0922dbecb762c9da
2016-12-22 11:12:02 -08:00
Alex Klyubin
a9888fc0c4 resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893
am: b824658494

Change-Id: Ic1dd2aef96889f0f68a55093cfb04b4d90f34818
2016-12-22 19:06:09 +00:00
Sundeep Ghuman
41577a0029 Merge "Cherrypick: Define the calculateRankingScore method and Key."
am: 425af45d02

Change-Id: Ib61f91087967f1b026cd2ba77175ccf47943bc53
2016-12-22 19:04:22 +00:00
Alex Klyubin
b824658494 resolve merge conflicts of febd982 to stage-aosp-master
am: 5c53fdb893

Change-Id: Ib0878f0f17c3799ff9ffb92d7e85904fc91fdab7
2016-12-22 19:01:13 +00:00
Alex Klyubin
5c53fdb893 resolve merge conflicts of febd982 to stage-aosp-master
Change-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937
2016-12-22 10:20:23 -08:00
Treehugger Robot
425af45d02 Merge "Cherrypick: Define the calculateRankingScore method and Key." 2016-12-22 00:03:57 +00:00
Sundeep Ghuman
0d79bdef27 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
2016-12-21 13:57:24 -08:00
Jeff Sharkey
febd982cdd Merge "Avoid Calendar's unexpect change in snapToCycleDay()" 2016-12-21 21:11:20 +00:00
Amin Shaikh
9926363b09 Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac am: a3943850ab
am: 471093b58e

Change-Id: I129d3abd329d9e00de1177ca39cf3ce0ff06946b
2016-12-21 20:10:30 +00:00
Amin Shaikh
471093b58e Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac
am: a3943850ab

Change-Id: Id763d2f82e10dd5843258ef09d0e65824e2c2de6
2016-12-21 20:02:03 +00:00
Amin Shaikh
a3943850ab Merge "Expose ScanResult#untrusted as a @SystemApi."
am: a93e57f1ac

Change-Id: I9cac16dbceb36d6ff72e92d2ab8de20bd8d70e36
2016-12-21 19:56:19 +00:00
Amin Shaikh
3d18c621cb 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
2016-12-21 11:46:22 -08:00
Shunta Sato
d18ffd8223 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
2016-12-21 12:44:30 -07:00
Calin Juravle
5be781d874 Merge "Report non-primary dex files loads to PM" am: f23ea2ca62 am: 78b3889804
am: 9947e79b26

Change-Id: I8ddb7756c0690584343cb026a298bc5f0b8d4e27
2016-12-21 10:14:42 +00:00
Calin Juravle
9947e79b26 Merge "Report non-primary dex files loads to PM" am: f23ea2ca62
am: 78b3889804

Change-Id: Iaf17def2729170403fa61ce0e09ced4675a47191
2016-12-21 10:09:45 +00:00
Calin Juravle
78b3889804 Merge "Report non-primary dex files loads to PM"
am: f23ea2ca62

Change-Id: I5eb9f8c8bc7e66c074adb95ad5dfec412cec539c
2016-12-21 10:04:39 +00:00
Calin Juravle
f23ea2ca62 Merge "Report non-primary dex files loads to PM" 2016-12-21 09:57:41 +00:00
Alex Klyubin
9c280d1566 Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26 am: be81b50b6e
am: e1bc33228e

Change-Id: I80c703f7784436414263fb86f56b7c85a6da40e7
2016-12-20 21:05:15 +00:00
Alex Klyubin
e1bc33228e Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26
am: be81b50b6e

Change-Id: I1275903e7fda6bdd9c1012bc7cfb6c42f6b43304
2016-12-20 20:45:59 +00:00
phweiss
dee7669fd2 DO NOT MERGE Show notification when network logging is enabled
am: 923d2cc9d9

Change-Id: Ia5839248361a7d7fbb0c73cdb569ada62a96c286
2016-12-20 20:01:33 +00:00
Alex Klyubin
be81b50b6e Merge "Permit 65535 byte ZIP comments and empty Central Directory"
am: f420b91e26

Change-Id: Ic178cdd9043c171f2f51643212e34b642657abe9
2016-12-20 18:45:57 +00:00
Alex Klyubin
f420b91e26 Merge "Permit 65535 byte ZIP comments and empty Central Directory" 2016-12-20 18:33:29 +00:00
phweiss
923d2cc9d9 DO NOT MERGE Show notification when network logging is enabled
A notification is shown after network logging is enabled
and after the next three reboots that are at least one day apart.

Clicking it sends an intent to quick settings to shown its device monitoring
dialog.

Cherry-picked from master.

Bug: 29748723
Bug: 33126577

(cherry-picked from commit a0cb251ca6)

Test: Manual, CTS-Verifier tests will be added later
Change-Id: I2bf517bd27ab23ad3f66270602dbf062efab8cbb
2016-12-20 19:23:58 +01:00
Jeremy Joslin
71909ea39a Merge "Implement the request and recommend calls." am: 1e814b3928 am: b50fdc7faa
am: 949893f5b2

Change-Id: Ibd03bace49bc277a2777c8483da6b4ebfc56d217
2016-12-20 06:37:11 +00:00
Jeremy Joslin
949893f5b2 Merge "Implement the request and recommend calls." am: 1e814b3928
am: b50fdc7faa

Change-Id: I81f998b6934715f43797247f411919a4ceee5631
2016-12-20 06:32:42 +00:00
Jeremy Joslin
b50fdc7faa Merge "Implement the request and recommend calls."
am: 1e814b3928

Change-Id: I91c905ab2fc7e061462fb96c2c81a783aa93a391
2016-12-20 06:25:08 +00:00
Jeremy Joslin
d0d32e238e Merge "Implement the discovery of a network recommendation provider." am: 470d256519 am: 8fbeb1d74a
am: af811c2650

Change-Id: I18d4c618f78796cbbe6d895c5b2f888c4a9a55ff
2016-12-20 03:37:58 +00:00
Jeremy Joslin
af811c2650 Merge "Implement the discovery of a network recommendation provider." am: 470d256519
am: 8fbeb1d74a

Change-Id: I322592326e0a409131a4dd33ab1f907b9262dbf2
2016-12-20 03:34:02 +00:00
Jeremy Joslin
8fbeb1d74a Merge "Implement the discovery of a network recommendation provider."
am: 470d256519

Change-Id: I804df594669be3b42704dead7007790666bef0f6
2016-12-20 03:26:04 +00:00
Jeremy Joslin
36d4c48496 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
2016-12-19 17:53:47 -08:00
Jeremy Joslin
b8418ac89a 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
2016-12-19 17:53:47 -08:00
Jeremy Joslin
72624e0720 Merge "Fix ScanResult array parceling." am: 5fdc86fb27 am: 68764eabb7
am: 5b1a460b94

Change-Id: I52289854a38a36929cd9b8d20e85b00346b3317c
2016-12-19 22:18:37 +00:00
Jeremy Joslin
5b1a460b94 Merge "Fix ScanResult array parceling." am: 5fdc86fb27
am: 68764eabb7

Change-Id: I6b44179d634722828f40524c26ccf6ea51521f11
2016-12-19 22:14:37 +00:00
Jeremy Joslin
68764eabb7 Merge "Fix ScanResult array parceling."
am: 5fdc86fb27

Change-Id: I25e509ea057370c4380764c47808c0dbde85a6fc
2016-12-19 22:07:20 +00:00
Treehugger Robot
5fdc86fb27 Merge "Fix ScanResult array parceling." 2016-12-19 21:57:05 +00:00