279312 Commits

Author SHA1 Message Date
Treehugger Robot
f66126c828 Merge "Support EGL_KHR_partial_update without EGL_EXT_buffer_age" 2017-01-10 00:26:43 +00:00
Jeff Sharkey
82ca90171f Methods to calculate user and external disk usage.
Add method to calculate user disk usage, which will be faster than
making a Binder call for every single appId under a user.  Add method
to calculate external disk usage, which uses file extensions to track
usage with "audio", "video", and "images" categories.

Start measuring internal and external storage space separately; new
GIDs are coming in a future CL.  Pass down all package names, inodes,
and code paths, since shared UIDs host more than one.

Test: builds, boots, stats are consistent
Bug: 27948817, 32206268
Change-Id: Icbb82a30fe711ef05e9a16bb1dc740dc943a9ddc
2017-01-09 17:00:38 -07: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
Amin Shaikh
a0961255fc Merge "Expose fields in WifiConfiguration." am: 1ea4180c3a
am: ce13838ade

Change-Id: Ia391a1b115646ad0409c5b52fee664d42901dd18
2017-01-09 23:54:30 +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
Amin Shaikh
ce13838ade Merge "Expose fields in WifiConfiguration."
am: 1ea4180c3a

Change-Id: I6a145981692cbaf791b735d55a1a9b7aa24aee62
2017-01-09 23:45:15 +00:00
Treehugger Robot
e34e47d645 Merge "Cherrypick: Create ScoredNetwork Badging API changes." 2017-01-09 23:39:48 +00:00
Treehugger Robot
1ea4180c3a Merge "Expose fields in WifiConfiguration." 2017-01-09 23:33:25 +00:00
Jack Yu
8679758cee Merge "Moved implicit intents into explicit intents" am: ccda81e58f
am: b7db5ac6d8  -s ours

Change-Id: I13a65c3d132c465b43baa64d195ce9f03f96e167
2017-01-09 23:19:55 +00:00
Jack Yu
f22b197e08 Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a
am: 9f60453361  -s ours

Change-Id: I20385bd6216925de59d6ea2ac107b04e374b03b7
2017-01-09 23:11:23 +00:00
Jack Yu
b7db5ac6d8 Merge "Moved implicit intents into explicit intents"
am: ccda81e58f

Change-Id: I90ccdbceba9492f95c658a7fabd113a35dcc8ae2
2017-01-09 23:10:55 +00:00
Michael Kwan
a95e7a2be7 Merge "Check if the activity translucency was converted before converted back." into cw-f-dev
am: 6d7dc11e01

Change-Id: I1ad11517c50cda3b37d3193ace983bb8b1a58c36
2017-01-09 23:06:25 +00:00
Michael Kwan
898385ed59 Check if the activity translucency was converted before converted back.
am: 39dd370d8e

Change-Id: Ib0705da70acd8abceedd5c1deeacae5023032543
2017-01-09 23:06:21 +00:00
TreeHugger Robot
6d7dc11e01 Merge "Check if the activity translucency was converted before converted back." into cw-f-dev 2017-01-09 22:59:53 +00:00
Joe Onorato
1046331f89 Hold a wake lock while DeviceIdleController is going idle.
am: b08db484c2

Change-Id: I7a1d1ea87541de8f0e12d687440efccc8956a5c1
2017-01-09 22:43:24 +00:00
John Reck
1deac99c55 Support EGL_KHR_partial_update without EGL_EXT_buffer_age
Bug: 31334677
Test: manual && hwuimacro --onscreen partialdamage

Change-Id: I9b346b4053ec12c8a78a143a4dc0e708c44888a2
2017-01-09 14:35:37 -08:00
Jack Yu
9f60453361 Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a
Test: manual
Change-Id: I228ed62db45eeb5d384049b5b0fef57b0bcf9ac6
2017-01-09 14:33:59 -08: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
Treehugger Robot
ccda81e58f Merge "Moved implicit intents into explicit intents" 2017-01-09 22:02:37 +00:00
Michael Kwan
39dd370d8e Check if the activity translucency was converted before converted back.
Bug: 34084490
Change-Id: Ib04c76549a31c7e523649f9d284637d44d7477ae
2017-01-09 13:43:52 -08:00
Joe Onorato
b08db484c2 Hold a wake lock while DeviceIdleController is going idle.
The inputs to DeviceIdleController (alarm manager, sensors)
hold wake locks while they call it.  But then the real work
happens in a handler which is outside of the wakelock, so
listeners don't get a chance to run right away, which in
the case of NetworkPolicyManager means the device is in a
higher power state than it should be.

It's not clear that this will 100% fix the bug, because
NetworkPolicyManagerService also has its own internal
Handler, and isn't holding its own wakelock for this,
but this change allows NPMS to be fixed if it really
needed to be.

Bug: 31900521
Test: adb shell dumpsys deviceidle step ... adb shell dumpsys power has no wakelocks held
Change-Id: I799f45221a6b327e7f63745cadc95ca644c064c6
(cherry picked from commit 8f0e9cede145bbc1668e25cfd6f850fe3fde3ae3)
2017-01-09 21:37:53 +00:00
Jeremy Joslin
542f906448 Merge "Make REQUEST_NETWORK_SCORES signature only." am: 1f89f3d1da
am: 99b73c61f2

Change-Id: I5959ba9a45dd3c895421b131fd34db6b37c6e405
2017-01-09 21:09:09 +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
99b73c61f2 Merge "Make REQUEST_NETWORK_SCORES signature only."
am: 1f89f3d1da

Change-Id: I4fff314194584e78c86e3b0ae1de40fd7f2501f4
2017-01-09 21:00:13 +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
Treehugger Robot
1f89f3d1da Merge "Make REQUEST_NETWORK_SCORES signature only." 2017-01-09 20:51:34 +00:00
Treehugger Robot
4c456d7ddf Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." 2017-01-09 20:45:52 +00:00
TreeHugger Robot
ad873323fc Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp 2017-01-09 20:44:36 +00:00
Jeremy Joslin
85fcf96e99 Make REQUEST_NETWORK_SCORES signature only.
There are no use cases where it's needed by a privileged app today.

Test: Built and ran
BUG: 33752149
Change-Id: Ia63a86eca1f60644d25f037d395a08c541a06a08
Merged-In: Iae689e878fdb60b506536c918079a4fcff527a71
2017-01-09 11:31:21 -08:00
Jack Yu
6356b6e3c7 Moved implicit intents into explicit intents
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
Merged-In: I64db3b05400513bacf278ff9f93236495860803e
2017-01-09 11:16:10 -08:00
Mark Renouf
a7fdfa81b7 Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev
am: 5df216f209

Change-Id: I9ad8c851d9c634d26b470456dc07b26e15f61900
2017-01-09 19:14:02 +00:00
Mark Renouf
7ef0b07465 Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN
am: 9b32a35aa7

Change-Id: I99d041ae3a1771e17c94a168cf672f8b73ce572d
2017-01-09 19:13:55 +00: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
Mark Renouf
5df216f209 Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev 2017-01-09 19:00:05 +00:00
Amin Shaikh
bdc89f99ea Expose fields in WifiConfiguration.
hasNoInternetAccess and isNoInternetAccessExpected are key signals needed
to determine whether Wi-Fi should be woken up for a given saved network.

Test: make
Bug: 33224312
Change-Id: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
Merged-In: I3f48735ebae72e15fbdb0a3057cf7c71fb0cc307
2017-01-09 18:47:46 +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
Treehugger Robot
cf3a4a68bd Merge "StorageManager: Improve exception handling" 2017-01-09 16:48:36 +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
Przemyslaw Szczepaniak
b9f1b72cb3 Merge "Track libcore/jsr-166 update" am: f6f36d7d9a
am: 44cc1f23bf

Change-Id: Ic9537f84f8210960c98d64891f1267f017186763
2017-01-09 11:21:46 +00:00
Przemyslaw Szczepaniak
44cc1f23bf Merge "Track libcore/jsr-166 update"
am: f6f36d7d9a

Change-Id: I6ba30b86fa45403631233ede5994eac0748d9b37
2017-01-09 11:17:06 +00:00
Przemyslaw Szczepaniak
f6f36d7d9a Merge "Track libcore/jsr-166 update" 2017-01-09 11:08:35 +00:00
Przemyslaw Szczepaniak
9e63cc2a08 Track libcore/jsr-166 update
No functional changes.

Update after the switch from custom to openJdk-based implementation of
java.util.concurrent.CopyOnWriteArrayList class.
Tracks libcore commit 29957558cf0db700bfaae360a80c42dc3871d0e5.

Test: make -j 32
Bug: 30860904
Change-Id: I4435bc1fb5ef9fc4ee5f882370073ba8ce2bcfba
2017-01-09 10:49:49 +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
Nick Kralevich
55dc66dde4 Merge "Dumps total size of primary storage." 2017-01-08 14:53:09 +00:00
Peter Qiu
5549acb0e6 Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5
am: fdbc827a52

Change-Id: Ifaf73023a932b2866ed3da1d81abeed920e8427b
2017-01-08 07:06:20 +00:00
Peter Qiu
fdbc827a52 Merge "wifi: hotspot2: Passpoint configuration APIs update"
am: b1c9bc5ea5

Change-Id: I47d8e12fbb7bc3faefabbed02b7235396eb6dbe5
2017-01-08 07:00:57 +00:00
Treehugger Robot
b1c9bc5ea5 Merge "wifi: hotspot2: Passpoint configuration APIs update" 2017-01-08 06:51:52 +00:00