Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
281,362 Commits 3 Branches 0 Tags
8b36bbf0eacfa9c56043ffdd275dda1531645c32
Commit Graph

62714 Commits

Author SHA1 Message Date
Etan Cohen
3fc5b186fa Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c 
am: b32dfa4ef5

Change-Id: If2a6b632cd03984921572b190745865953a8e808
 2017-01-11 23:22:51 +00:00
Etan Cohen
b32dfa4ef5 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 
am: 2a4e3bef2c

Change-Id: I6f894d92451032657678639c3021eef07289a6a2
 2017-01-11 23:17:19 +00:00
Etan Cohen
2a4e3bef2c Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" 
am: dfe8f5dc13

Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42
 2017-01-11 23:12:16 +00:00
Felipe Leme
c88368c270 Added BUGREPORT_OPTION_TELEPHONY. 
am: a561b1f9c0

Change-Id: I063a0d6c4c66035082789d4361b649439da00bf9
 2017-01-11 23:09:01 +00:00
Etan Cohen
dfe8f5dc13 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" 2017-01-11 22:59:25 +00:00
Jeremy Joslin
ad9ff9c59a Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95 
am: ab9eb11e2f

Change-Id: Iede47bf5a625ac4183919b4253c6d5e3f92520bc
 2017-01-11 20:08:49 +00:00
Jeremy Joslin
ab9eb11e2f Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 
am: 425a0fdc95

Change-Id: Icd1e76d7987cc9937cce5079dedf610fcd21c903
 2017-01-11 19:59:27 +00:00
Jeremy Joslin
425a0fdc95 Merge "Move getActiveScorerPackage() to the score service." 
am: b5488ec3b3

Change-Id: I8819c482a87a8c78ad0a1a39dda74b5ee2e7da4c
 2017-01-11 19:52:37 +00:00
Treehugger Robot
b5488ec3b3 Merge "Move getActiveScorerPackage() to the score service." 2017-01-11 19:40:45 +00:00
Etan Cohen
6a4b323f08 [AWARE] Unhide Wi-Fi Aware API (baseline) 
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).

Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
 2017-01-11 11:13:26 -08:00
Mark Salyzyn
082a1721b5 Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5 
am: ef8ccc8510

Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b
 2017-01-11 15:45:46 +00:00
Mark Salyzyn
ef8ccc8510 Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 
am: 6143cbf1e5

Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75
 2017-01-11 15:40:24 +00:00
Mark Salyzyn
6143cbf1e5 Merge "Replace cutils/log.h and log/logger.h with log/log.h" 
am: e7fcbcb991

Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08
 2017-01-11 15:35:19 +00:00
Mark Salyzyn
e7fcbcb991 Merge "Replace cutils/log.h and log/logger.h with log/log.h" 2017-01-11 15:24:11 +00:00
Neil Fuller
75f84f2261 Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794 
am: 43d53395dc

Change-Id: Ib7055c5ddf2caa52082aee4b67e3ebd213e09e4b
 2017-01-11 13:54:10 +00:00
Neil Fuller
43d53395dc Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 
am: f4e236c794

Change-Id: If23b5efe912c5b0a76487c46723288ff6a903a14
 2017-01-11 13:48:14 +00:00
Neil Fuller
f4e236c794 Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" 
am: 649a89e524

Change-Id: Ib8dc0ec183b870931bf4befea5ff32532009fddd
 2017-01-11 13:37:37 +00:00
Neil Fuller
649a89e524 Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" 2017-01-11 13:27:10 +00:00
Santos Cordon
f85ab8306f Add Brightness setting for VR Mode. 
am: d6a5660a2c

Change-Id: If371f485471eb1ab0a3e07964c197cb9b8ef1c9f
 2017-01-11 03:12:05 +00:00
Jeremy Joslin
99ca0df8d4 Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196 am: 5fbd2791ac 
am: 11b1311e21

Change-Id: I9e00b4593005729cdf2b01e2347f0513a6d52cf0
 2017-01-11 01:50:13 +00:00
Jeremy Joslin
11b1311e21 Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196 
am: 5fbd2791ac

Change-Id: If5649294845f01a390bccd47fe99add3b27b0829
 2017-01-11 01:45:43 +00:00
Jeremy Joslin
5fbd2791ac Merge "Moved isCallerActiveScorer() to the score service." 
am: 663b444196

Change-Id: I44134284edc88567703435ce663b3d0efd9cff26
 2017-01-11 01:41:14 +00:00
Treehugger Robot
663b444196 Merge "Moved isCallerActiveScorer() to the score service." 2017-01-11 01:30:03 +00:00
Treehugger Robot
60d10ea0f4 Merge changes I559eb049,I52425b84 
* changes:
  DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
  DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
 2017-01-11 01:06:57 +00:00
Jeremy Joslin
d7670f6d7c Move getActiveScorerPackage() to the score service. 
Implemented getActiveScorerPackage() in the NetworkScoreService to
make it more efficient (no need to query PM).

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 33781558
Change-Id: Iee7610e4982b44aefa1ef8b6c208292b8f9adcf8
Merged-In: I2144351c2c09cad30f80399069364f3572e38445
 2017-01-10 16:41:42 -08:00
Jeremy Joslin
9b442faa91 Moved isCallerActiveScorer() to the score service. 
Implemented isCallerActiveScorer() in the NetworkScoreService to make
it more efficient (no need to query PM). Exposed the call as a new
internal API on NetworkScoreManager and deprecated the call on
NetworkScorerAppManager.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 33781558
Change-Id: I8ad232f8ef34b6e2f155ebb232e64300303300f0
Merged-In: I0e2142af95b068d322343f7c9362ac53d46b545e
 2017-01-10 16:11:33 -08:00
Felipe Leme
a561b1f9c0 Added BUGREPORT_OPTION_TELEPHONY. 
This option takes a lightweight version of bugreport that only includes a few,
urgent sections used to report telephony bugs.

BUG: 32589463
BUG: 26849505
Test: manual
Merged-In: I6f90c02779a1e8aead690428626e3b9f06aa04df
Change-Id: I6f90c02779a1e8aead690428626e3b9f06aa04df
 2017-01-10 15:43:27 -08:00
Tao Wu
a3c801bac4 Merge "Remove unused variable." am: f3b1881bb2 am: f338ed34f9 
am: cab27fbbf4

Change-Id: I454d6359029bdbffa5e124e31759f30d6aec5f76
 2017-01-10 21:39:19 +00:00
Tao Wu
cab27fbbf4 Merge "Remove unused variable." am: f3b1881bb2 
am: f338ed34f9

Change-Id: Ia2ab8632bfe5e5b4751bb89aad30c3c739112469
 2017-01-10 21:34:20 +00:00
Tao Wu
f338ed34f9 Merge "Remove unused variable." 
am: f3b1881bb2

Change-Id: I563647e4f5abc635ff3f67d7f0b658bdd1d92716
 2017-01-10 21:29:16 +00:00
Treehugger Robot
f3b1881bb2 Merge "Remove unused variable." 2017-01-10 21:15:02 +00:00
Tao Wu
e68b7ca20c Remove unused variable. 
Code search show nobody referenced it and aosp image still compiles after
remove it.

Test: make -j18 systemimage userdataimage ramdisk

Change-Id: I3e37ea590610091b938296c999dceb3caf919906
Merged-In: I3e37ea590610091b938296c999dceb3caf919906
Signed-off-by: Tao Wu <lepton@google.com>
 2017-01-10 19:20:18 +00:00
Santos Cordon
d6a5660a2c 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
Change-Id: If3c3e81b592e0c6fd037e5783559683e5cb58379
 2017-01-09 17:33:14 -08:00
Sundeep Ghuman
4892f7d98f Merge "Cherrypick: Create ScoredNetwork Badging API changes." am: e34e47d645 am: 3098d3839f 
am: 4962a3829f

Change-Id: Ia3928c4113e8f07969a3d551e31d6307f61e848e
 2017-01-10 00:05:21 +00:00
Sundeep Ghuman
4962a3829f Merge "Cherrypick: Create ScoredNetwork Badging API changes." am: e34e47d645 
am: 3098d3839f

Change-Id: I5f7d741dbd7f91518495f02de995bca6d191aa4e
 2017-01-09 23:55:47 +00:00
Sundeep Ghuman
3098d3839f Merge "Cherrypick: Create ScoredNetwork Badging API changes." 
am: e34e47d645

Change-Id: Ibeb6c60c30c302e12c45c7f35a7e4af904a4a6d5
 2017-01-09 23:51:07 +00:00
Treehugger Robot
e34e47d645 Merge "Cherrypick: Create ScoredNetwork Badging API changes." 2017-01-09 23:39:48 +00:00
Mark Salyzyn
52eb4e01a4 Replace cutils/log.h and log/logger.h with log/log.h 
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I578b15b48f0fc2807a92abbc69a377c3d2191496
 2017-01-09 14:31:34 -08:00
Jeremy Joslin
6cf53d0ab8 Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: 4c456d7ddf am: 542aad4c75 
am: f91d9debef

Change-Id: I7436278fa3eab064fe2b416c672bedaa300eb501
 2017-01-09 21:17:17 +00:00
Jeremy Joslin
f91d9debef Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: 4c456d7ddf 
am: 542aad4c75

Change-Id: I3b35ec04e65f6b14f75f266dfcf15c10a12a4d74
 2017-01-09 21:07:48 +00:00
Jeremy Joslin
542aad4c75 Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." 
am: 4c456d7ddf

Change-Id: I441cae5096b922419763832d5b38faa95818e337
 2017-01-09 20:58:50 +00:00
Sundeep Ghuman
8bc096c09d Cherrypick: Create ScoredNetwork Badging API changes. 
Defines an attribute bundles key to hold the badging curve, the
enums for badge values, and an API to retrieve a badge for a
specific RSSI.

OCL: ag/1727147
Bug: 33457699
Test: Unit tests
Change-Id: If9e8a60c4670b51c395fb501f55ddece8a72981e
Merged-In: If9e8a60c4670b51c395fb501f55ddece8a72981e
 2017-01-09 12:57:02 -08:00
Jeremy Joslin
186f3339ab Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED. 
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33752149
Change-Id: I3dd352c98bbc34b128ab9c2a28f81e1261ae2669
Merged-In: I7d91fa9a4f6ef4f9170c6af98567ce443c805e74
 2017-01-09 11:03:21 -08:00
Alex Naidis
32dfe8c611 Merge "StorageManager: Improve exception handling" am: cf3a4a68bd am: 545cf37844 
am: edca8aa3a8

Change-Id: Idbd8b16f0825bdcf48d2013448c767d0966434fe
 2017-01-09 17:09:31 +00:00
Alex Naidis
edca8aa3a8 Merge "StorageManager: Improve exception handling" am: cf3a4a68bd 
am: 545cf37844

Change-Id: I452e3fcbda9cfa24db5b2bfdd077b7e5a7b241b4
 2017-01-09 17:04:32 +00:00
Alex Naidis
545cf37844 Merge "StorageManager: Improve exception handling" 
am: cf3a4a68bd

Change-Id: Id421cb483655dab6d379251d983da2bdcafe598d
 2017-01-09 16:59:56 +00:00
Alex Naidis
19d9c2d03c StorageManager: Improve exception handling 
When "getPrimaryStorageSize" provides a path
to "readLong", the option that the path
doesn't exist is expected, since it tries
all paths from "INTERNAL_STORAGE_SIZE_PATHS"
until there is success.

This patch makes us catch the "FileNotFoundException"
and "NumberFormatException" seperately.

For the above reason a "FileNotFoundException"
is now treated as an information only.
The "NumberFormatException" and other exceptions
are now treated as error since those are not
expected to happen.

Change-Id: I5316f9c3108e36c31b27dc5df8bf8ac4d4257629
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
 2017-01-09 16:27:52 +00:00
Nick Kralevich
4429993d78 Merge "Dumps total size of primary storage." am: 55dc66dde4 am: 12b387dd87 
am: a63462c794

Change-Id: I2a62442a581d89054421dd6c44c610fb7ee9a0c4
 2017-01-08 15:09:21 +00:00
Nick Kralevich
a63462c794 Merge "Dumps total size of primary storage." am: 55dc66dde4 
am: 12b387dd87

Change-Id: I08e98467d212a7f9ec01b16a46540bc3d059ee51
 2017-01-08 15:04:54 +00:00
Nick Kralevich
12b387dd87 Merge "Dumps total size of primary storage." 
am: 55dc66dde4

Change-Id: Ifc3537d3aeda5e6eb3b1c003a4eaf392d07bcf86
 2017-01-08 15:00:18 +00:00