Commit Graph

63158 Commits

Author SHA1 Message Date
Felipe Leme
46b451fa7d Refactored whitelist restrict background uids.
On Android N, the list of UIDs whitelisted was kept in a separate array
and XML tag, while in reality it should be a new UID
policy (POLICY_ALLOW_METERED_BACKGROUND).

This change refactors NetworkPolicyManagerService to use the new UID
policy, although without removing any of its existing methods (but
marking them as deprecated).

Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.NetworkPolicyManagerServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: cts-tradefed run commandAndExit cts --skip-device-info --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker --skip-preconditions -m CtsHostsideNetworkTests --abi armeabi-v7a -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests

BUG: 28791717

Change-Id: I39869efda554ca0b736dd2380e439474f91dfbe6
2016-08-23 12:34:37 -07:00
Felipe Leme
8546a44480 Removed the POLICY_ALLOW_BACKGROUND_BATTERY_SAVE constant.
That constant was created back in 2014 in the intial Battery Saver
implementation, but it's not used anymore (since the power saving
whitelist is fetched from DeviceIdleController).

Test: m -j32 FrameworksCoreTests &&  adb install -r -g
${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
&& adb shell am instrument -e class
"android.net.NetworkPolicyManagerTest" -w
"com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"

BUG: 28791717

Change-Id: Ic2c0bcb9736ce8b40e04fd644953e68241d06a69
2016-08-23 12:28:06 -07:00
Bo Liu
ad94857d90 Merge "WebView: Use static factory method to create provider" 2016-08-22 16:25:10 +00:00
Chris Banes
b62db80a04 Fix NPE in ForwardingListener - fw edition
Caused by a postDelayed() and lack of
null check

BUG: 29992695
Change-Id: If2f43736505e0f738e9d0cf941a1f2d828cd8d5d
2016-08-22 10:16:21 +00:00
Bo Liu
4827385ae7 WebView: Use static factory method to create provider
This gives the implementation the flexibility to choose different
provider instances. Fallback to constructor if static initializer
factory method doesn't exist.

Change-Id: I72fa0c51c64d0dbdeb6234a0ab4fdd0a389b09fc
2016-08-20 16:13:25 -07:00
TreeHugger Robot
27a395c06d Merge "Clean up style issues in ArraySet." 2016-08-20 04:15:21 +00:00
TreeHugger Robot
3a5b710684 Merge "Added a uidPoliciesToString() method." 2016-08-20 02:29:41 +00:00
Aurimas Liutikas
f2a45b269d Clean up style issues in ArraySet.
Clean up style issues in preparation to copying ArraySet
implementation to support library.

Fixed:
- Missing spaces around operators, casting
- Added curly braces around if statements that span multiple lines
- Renamed static variables to follow sFoo instead of mFoo
- Moved = to the previous line

Bug: 19109652
Change-Id: Id9a985723b158f51811b3cd796613d0e26fd7e61
2016-08-19 16:36:19 -07:00
Etan Cohen
5782aae1be [NAN] Udpate NAN API documentation, clean-up visibility
am: 2e37b06dde

Change-Id: Iba3682d9ce1a3d2d1bd07636ef7c633d8e7ed847
2016-08-19 23:21:52 +00:00
Etan Cohen
c6a6a0e7ba Merge "resolve merge conflicts of 6ffbcb3 to master" 2016-08-19 22:07:26 +00:00
Todd Kennedy
84cc3282db Merge "remove mention of file: URIs for package installs" 2016-08-19 21:36:29 +00:00
Etan Cohen
2e37b06dde [NAN] Udpate NAN API documentation, clean-up visibility
Change-Id: I951340eebab35c10efe98dab86b58fe8efada169
2016-08-19 12:31:31 -07:00
Etan Cohen
ccb0b65be6 resolve merge conflicts of 6ffbcb3 to master
Change-Id: I23af5223f0e9810aa90fda4594ff6ccfc69b4053
2016-08-19 11:22:06 -07:00
Etan Cohen
6ffbcb3f73 Merge "[NAN] Provide calling package name to service" into mm-wireless-dev 2016-08-19 17:23:15 +00:00
André Lago
13a5df3b31 Merge changes from topic 'Different sound settings for work profile'
* changes:
  [media] Separate ringtones for managed profiles
  [Settings] Added setting SYNC_PARENT_SOUNDS
2016-08-19 17:02:05 +00:00
Felipe Leme
b146f7678f Added a uidPoliciesToString() method.
BUG: 28791717
Change-Id: Ib26e08332d011ca5414406810cec4b4936841068
2016-08-19 09:52:16 -07:00
Andreas Huber
8dcbf8ba43 Merge "Support one-way methods in java support for hardware binder." 2016-08-19 15:53:13 +00:00
Todd Kennedy
9cc589a3a0 remove mention of file: URIs for package installs
they're not supported

Change-Id: Id274ee6065ba531c01ad720ac0a53fb97e0fc687
Fixes: 6517618
2016-08-18 16:23:17 -07:00
Andreas Huber
8aa4d8cd29 Support one-way methods in java support for hardware binder.
Bug: 30922538
Change-Id: I5ff93126a29f6bff42dee3f9868fa794ca7c077f
2016-08-18 14:29:40 -07:00
Ned Burns
be92fca27c Merge "Add ViewConfiguration.getScaledScrollFactor()" 2016-08-18 21:16:49 +00:00
Ned Burns
69af432039 Add ViewConfiguration.getScaledScrollFactor()
This value is used to convert ACTION_SCROLL axis values into raw
pixel distances.

Change-Id: I537af010610bb374ab29a41aff4fae5b07bece6e
2016-08-18 15:07:05 -04:00
TreeHugger Robot
b67b8a6d6c Merge "Fix NPE during Activity transition using wrong Activity." 2016-08-18 17:13:53 +00:00
Narayan Kamath
34c1b813ae Process: Fix communication with zygote.
Don't write partial requests, and don't return (or throw) early after
partially reading a response.

bug: 30143607

(cherry picked from commit 448be0a622)

Change-Id: Ib283b1620947151338f5f9473891a048a17d8f4a
2016-08-18 16:17:48 +01:00
Andre Lago
3fa139c7b2 [media] Separate ringtones for managed profiles
Separate the default system ringtone settings for managed profiles,
which previously used the same default ringtones as the personal profile
they belong to

Bug: 30658854
Change-Id: I22c69c7b8d31c7c424f5e00a3d9febac98b93d74
2016-08-18 09:58:26 +01:00
TreeHugger Robot
df6183299b Merge "Remove permission review build property - framework" 2016-08-18 00:56:38 +00:00
Yohei Yukawa
64ea28e4f0 Make View#isTemporarilyDetached() less confusing am: ed841cbdd7 am: 6bc17c7320
am: 8c8477d036

Change-Id: I5a4a16d4a1922a71def989b3bdf44810d6334100
2016-08-18 00:23:39 +00:00
Svet Ganov
77df6f315d Remove permission review build property - framework
Change-Id: Ifcfd436f2d57a6006ef804292d2875434e4669da
2016-08-17 14:52:26 -07:00
Chong Zhang
921f8e35d8 resolve merge conflicts of 9391bc5 to master
Change-Id: I6de231781233826b399688dc8ead70ba515b1ccb
2016-08-17 14:38:12 -07:00
Yohei Yukawa
8c8477d036 Make View#isTemporarilyDetached() less confusing am: ed841cbdd7
am: 6bc17c7320

Change-Id: Iec61193cd1d1902aa9aad1ad9ac1d6f4944c748b
2016-08-17 19:55:47 +00:00
Yohei Yukawa
6bc17c7320 Make View#isTemporarilyDetached() less confusing
am: ed841cbdd7

Change-Id: I2df97c1babb9fc515295c527a18d9f88546dfad7
2016-08-17 19:49:01 +00:00
John Reck
5ab0541052 Fix maps resume being blank am: 03df0834e6 am: 08669fff33
am: 28f4ee5f7b

Change-Id: I5d6ea69cb13a43401a6cdc7039eafc1186a2fa85
2016-08-17 18:28:51 +00:00
Chong Zhang
9391bc557c Add new window type TYPE_DRAWN_APPLICATION am: fea963edee
am: 5e09ceb641

Change-Id: I955b985c47ca10a17dec6921af0277d1d6a7431d
2016-08-17 18:22:10 +00:00
John Reck
28f4ee5f7b Fix maps resume being blank am: 03df0834e6
am: 08669fff33

Change-Id: If87b076b6c03b7018485ddd4438aeaac7abd1562
2016-08-17 18:04:21 +00:00
Chong Zhang
5e09ceb641 Add new window type TYPE_DRAWN_APPLICATION
am: fea963edee

Change-Id: If7acf1349b87d4be88a9b4f9fbd984bbd4aca8ad
2016-08-17 17:16:18 +00:00
Etan Cohen
fb5b680514 Merge "Support timeouts for requestNetwork() invocations." 2016-08-17 17:15:46 +00:00
John Reck
08669fff33 Fix maps resume being blank
am: 03df0834e6

Change-Id: Iad93e1b11e74acf2356d59c271892d6741b53fef
2016-08-17 17:14:23 +00:00
TreeHugger Robot
70528f5b6c Merge "VPN network stat accounting changes." 2016-08-17 00:19:10 +00:00
Jeremy Joslin
8b436d865c VPN network stat accounting changes.
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.

This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.

BUG: 30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
2016-08-16 15:53:57 -07:00
TreeHugger Robot
7d3d7ae556 Merge "Updating the javadoc of DevicePolicyManager#wipeData" 2016-08-16 21:47:37 +00:00
George Mount
3289bfa289 Fix NPE during Activity transition using wrong Activity.
Bug 30786309

If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.

Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
2016-08-16 13:10:19 -07:00
John Reck
03df0834e6 Fix maps resume being blank
Bug: 30889568

Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.

Change-Id: Ib75065d3d75e6141d6cd8f306584f6a569b9907c
2016-08-16 09:44:23 -07:00
Robert Carr
9d9ee4e5a3 Introduce new constant for double tap gesture rotation hint. am: 57d9fbd17f am: 5f684d92b6
am: bdbc23bebe

Change-Id: I6a9b2a55148a1c2428e871337bb300a84887adc7
2016-08-16 01:54:11 +00:00
Robert Carr
bdbc23bebe Introduce new constant for double tap gesture rotation hint. am: 57d9fbd17f
am: 5f684d92b6

Change-Id: Idf2bb8511e24732018ff59ffbf30f440cb7f9779
2016-08-16 01:44:07 +00:00
Robert Carr
5f684d92b6 Introduce new constant for double tap gesture rotation hint.
am: 57d9fbd17f

Change-Id: I994c15c692ec52160deb3d29b46396802562588a
2016-08-16 01:35:59 +00:00
TreeHugger Robot
b14543d9d8 Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev 2016-08-16 01:21:57 +00:00
Chong Zhang
fea963edee Add new window type TYPE_DRAWN_APPLICATION
This type behaves like a normal TYPE_APPLICATION, except that WM
will always wait for it to be drawn before starting a transition.

WM always waits for TYPE_BASE_APPLICATION (main window), but for
TYPE_APPLICATION, it only waits if the window relayouts to visible
and gets a surface before the main window is drawn. If main window
itself is ready very fast, transition could start without the other
window.

bug: 30830849
Change-Id: Ife71a9812db7c8eba6ee4ead10ce4f31d9e93b40
2016-08-15 17:36:40 -07:00
Dianne Hackborn
c7dc4add63 Docs only: N is no longer a shrug. am: c1b607df71 am: 6fe27966e2
am: dbe43ee9ba

Change-Id: I8ba0795a2d4e25ede3654b9ab4dd95c5bed74ee1
2016-08-15 22:37:29 +00:00
Andreas Huber
2d28047166 Merge "Initial commit of Java support for hardware binder." 2016-08-15 21:36:43 +00:00
Dianne Hackborn
dbe43ee9ba Docs only: N is no longer a shrug. am: c1b607df71
am: 6fe27966e2

Change-Id: I0d441487fae3e95741f83ab92042bca7547006ae
2016-08-15 21:35:48 +00:00
Dianne Hackborn
6fe27966e2 Docs only: N is no longer a shrug.
am: c1b607df71

Change-Id: Iaf3a4c23ec9c94dccfa6db15e6caf90a74a5f3c0
2016-08-15 21:25:41 +00:00