293938 Commits

Author SHA1 Message Date
Wale Ogunwale
0303c5723e Have DisplayContent be the call point for adjusting wallpaper windows
4th step in trying to make the WindowList private to DisplayContent
Have the rest of the system call DisplayContent when they need to
adjust the position of the wallpaper windows in the window list
instead of calling WallpaperController directly. That way the display
content can control the window list that the wallpaper controller sees.

Test: Existing tests pass and manual testing.
Change-Id: Iaa7f421d7cd24d36e5a83e091f77b4a08d0ae123
2016-10-21 08:03:11 -07:00
Wale Ogunwale
824ab5c4be Removed WindowManagerService.getWindowListLocked()
3rd step in trying to make the WindowList private to DisplayContent.
The method was another an indirect way to the the window list
from the display content.

Test: Manual testing and existing tests pass.
Change-Id: Ifb0548a91b5bc64461e14f63256b61b8fa5e2e0c
2016-10-21 07:53:56 -07:00
Lorenzo Colitti
625166377b CaptivePortalLogin: set mixed content policy to compatibility.
This makes the policy for mixed HTTP/HTTPS content match Chrome.
This allows us to display login pages where unimportant
subresources are HTTP.

Bug: 32171569
Change-Id: Ic8bc1440f1f26898ddbc0984fd1ddd2155c9588b
2016-10-21 18:47:57 +09:00
Jeremy Joslin
3f0d75afe8 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-10-21 18:47:57 +09:00
Jakub Adamek
2a3b2cf206 Add new color: accent with 60% opacity. am: 4f8b640bb7
am: 917d7d1a2d

Change-Id: I2a40035efbd15b8497a64d306e09d8e37301ea44
2016-10-21 09:35:45 +00:00
Jakub Adamek
917d7d1a2d Add new color: accent with 60% opacity.
am: 4f8b640bb7

Change-Id: I59d23f030b6413f5cf3899d4a6b0daea7ff271c7
2016-10-21 09:27:35 +00:00
Jakub Adamek
4f8b640bb7 Add new color: accent with 60% opacity.
Bug: 32201256
Change-Id: Id09420b78941b59df2f248dd75994fb7275ec2ea
2016-10-21 09:12:23 +01:00
Jakub Adámek
fce5f923e9 Merge "Fix idmap calls when a subdir is present." into cw-f-dev am: 42f40b159f
am: 6ba7dabc91

Change-Id: Ibf266357d7e96683f801660ad4cf538d002ec821
2016-10-21 08:09:42 +00:00
Jakub Adamek
404eb9ce51 Fix idmap calls when a subdir is present. am: 56b9987ed7
am: 47c7e1e9f9

Change-Id: I30a8a7531080bd52145219f62133e78198eb1006
2016-10-21 08:08:39 +00:00
Jakub Adámek
6ba7dabc91 Merge "Fix idmap calls when a subdir is present." into cw-f-dev
am: 42f40b159f

Change-Id: I8370a4d376a02c8a16bdb1ebe5ff58a20ca0989b
2016-10-21 07:58:34 +00:00
Jakub Adamek
47c7e1e9f9 Fix idmap calls when a subdir is present.
am: 56b9987ed7

Change-Id: Ia58f447ec6bf3b63e2922b02a794f487ec9679d0
2016-10-21 07:58:26 +00:00
Jakub Adámek
42f40b159f Merge "Fix idmap calls when a subdir is present." into cw-f-dev 2016-10-21 07:51:19 +00:00
Jakub Adamek
56b9987ed7 Fix idmap calls when a subdir is present.
We need to increase the size of argv so that the last one remains
a NULL.

Bug: 32202741
Change-Id: I6636b5401fa7a61686a48c9a99b3e54e596033f9
2016-10-21 08:50:00 +01:00
Flavio Lerda
0182513d50 Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev am: 327dbfb94f
am: 1a10780c6b

Change-Id: Id7db030eb7b76e84ee6c0236e55e796f5fb00cf4
2016-10-21 07:19:47 +00:00
Jakub Adamek
93bbe47d65 Change name of overlay subdir 'sku'->'theme' am: 54dcaaba4f
am: 6bbb63ad91

Change-Id: I71dfaafbebaa7bd61d182405c734eef1ea7ff1eb
2016-10-21 07:16:07 +00:00
Flavio Lerda
1a10780c6b Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
am: 327dbfb94f

Change-Id: I33e92132b4422726928531da8be7a444cbd2fd64
2016-10-21 07:09:27 +00:00
Jakub Adamek
6bbb63ad91 Change name of overlay subdir 'sku'->'theme'
am: 54dcaaba4f

Change-Id: I4536de644c20171e175cddaff0cd041fb05b3038
2016-10-21 07:05:17 +00:00
Flavio Lerda
327dbfb94f Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev 2016-10-21 06:32:21 +00:00
liulvping
9610c3a2a9 Merge "fix mistaken check of mScreenBrightnessDarkConfig" am: e6fe836938 am: 0046acc2db
am: 78b29d52e0

Change-Id: Ic780ee41444f3b335339d5bfe418ce2738785ea7
2016-10-21 04:58:43 +00:00
Brad Ebinger
0c90d778ca Merge "Switch on android.telecom.Log in Telecom" am: 37521b9ba5 -s ours am: ce21e3ffa8
am: 0fcc717ed9

Change-Id: I0d03c1dccfee9ffe7b8c6f44f6bdbfb876c11d21
2016-10-21 04:55:19 +00:00
Brad Ebinger
094e9a3b40 Switch on android.telecom.Log in Telecom am: ce97bfbdb2
am: 7ed42a72c0

Change-Id: I8adb58d243f2e674ec031584356496a754b21cf8
2016-10-21 04:53:57 +00:00
liulvping
78b29d52e0 Merge "fix mistaken check of mScreenBrightnessDarkConfig" am: e6fe836938
am: 0046acc2db

Change-Id: Iff046d5f35c34a425e4765a69700d09d6834b16f
2016-10-21 04:46:50 +00:00
Brad Ebinger
0fcc717ed9 Merge "Switch on android.telecom.Log in Telecom" am: 37521b9ba5 -s ours
am: ce21e3ffa8

Change-Id: I64e18346d869594db31f3e7fa3154bb9198a3790
2016-10-21 04:45:47 +00:00
liulvping
0046acc2db Merge "fix mistaken check of mScreenBrightnessDarkConfig"
am: e6fe836938

Change-Id: I4eda1d6aed52fa4d8cbcd1ade29e96f14e58bab7
2016-10-21 04:38:38 +00:00
Brad Ebinger
ce21e3ffa8 Merge "Switch on android.telecom.Log in Telecom"
am: 37521b9ba5  -s ours

Change-Id: I1a624721f577be6b1cf684208cdeb4e0471e51f2
2016-10-21 04:37:28 +00:00
Brad Ebinger
7ed42a72c0 Switch on android.telecom.Log in Telecom
am: ce97bfbdb2

Change-Id: Ic7827f1627eca43937609e21d15186f483381182
2016-10-21 04:37:22 +00:00
Hugo Benichi
1ca2ee7837 Merge "IpConnectivity metrics: add version number" 2016-10-21 04:35:52 +00:00
Treehugger Robot
e6fe836938 Merge "fix mistaken check of mScreenBrightnessDarkConfig" 2016-10-21 03:50:16 +00:00
TreeHugger Robot
577e66cc43 Merge "AAPT2: Fail compile on bad output file/dir" 2016-10-21 03:04:12 +00:00
TreeHugger Robot
09731444e7 Merge "Check USB and Print Framework code." 2016-10-21 02:48:58 +00:00
Andrii Kulian
b94292e5fe Fix NPEs when display is added or removed
- In WindowContainer set parent of the child after it is actually
  added. This way if the child class depends on this in overridden
  methods it will be in correct state.
- Reconfigure display only if it is attached. Otherwise there is no
  corresponding DisplayContent record with configuration.

Change-Id: I20c51522d82f9d0ca98f098070585e6472a23e98
Test: Updated WindowContainerTests.
2016-10-20 19:02:12 -07:00
liulvping
d01db540a7 fix mistaken check of mScreenBrightnessDarkConfig
Change-Id: Ibd1234a5a69422f3124e72cd561d4f3624a82faf
Signed-off-by: liulvping <liulvping@xiaomi.com>
2016-10-21 01:59:02 +00:00
TreeHugger Robot
8d48570f45 Merge "ConnectivityManager: use ConnectivityThread looper" 2016-10-21 01:49:46 +00:00
Michael Kwan
9c86e68bfa Fix improperly laid out alert dialog title to match UX specs.
Test: visual inspect using ApiDemos

Bug: 32315229
Change-Id: I486edc94c077af49e1235519e158e55833796231
2016-10-20 18:39:31 -07:00
Joe Onorato
0578cbc6c5 Add a new build, install, test development (bit) tool
This is a cleaned up version of a utility that I've had sitting around
for a while.

The bit tool can run an android platform build, then sync or install
the outputs of that, and then run instrumentation tests.  It's better
than what we usually do:

  make && adb shell stop && adb sync system && adb shell start

Here's the help text:

usage: bit OPTIONS PATTERN

  Build, sync and test android code.

  The -b -i and -t options allow you to specify which phases
  you want to run. If none of those options are given, then
  all phases are run. If any of these options are provided
  then only the listed phases are run.

  OPTIONS
  -b     Run a build
  -i     Install the targets
  -t     Run the tests

  PATTERN
  One or more targets to build, install and test. The target
  names are the names that appear in the LOCAL_MODULE or
  LOCAL_PACKAGE_NAME variables in Android.mk or Android.bp files.

  Building and installing
  -----------------------
  The modules specified will be built and then installed. If the
  files are on the system partition, they will be synced and the
  attached device rebooted. If they are APKs that aren't on the
  system partition they are installed with adb install.

  For example:
    bit framework
      Builds framework.jar, syncs the system partition and reboots.

    bit SystemUI
      Builds SystemUI.apk, syncs the system partition and reboots.

    bit CtsProtoTestCases
      Builds this CTS apk, adb installs it, but does not run any
      tests.

  Running Unit Tests
  ------------------
  To run a unit test, list the test class names and optionally the
  test method after the module.

  For example:
    bit CtsProtoTestCases:*
      Builds this CTS apk, adb installs it, and runs all the tests
      contained in that apk.

    bit framework CtsProtoTestCases:*
      Builds the framework and the apk, syncs and reboots, then
      adb installs CtsProtoTestCases.apk, and runs all tests
      contained in that apk.

    bit CtsProtoTestCases:.ProtoOutputStreamBoolTest
    bit CtsProtoTestCases:android.util.proto.cts.ProtoOutputStreamBoolTest
      Builds and installs CtsProtoTestCases.apk, and runs all the
      tests in the ProtoOutputStreamBoolTest class.

    bit CtsProtoTestCases:.ProtoOutputStreamBoolTest\#testWrite
      Builds and installs CtsProtoTestCases.apk, and runs the testWrite
      test method on that class.

    bit CtsProtoTestCases:.ProtoOutputStreamBoolTest\#testWrite,.ProtoOutputStreamBoolTest\#testRepeated
      Builds and installs CtsProtoTestCases.apk, and runs the testWrite
      and testRepeated test methods on that class.

  Launching an Activity
  ---------------------
  To launch an activity, specify the activity class name after
  the module name.

  For example:
    bit StatusBarTest:NotificationBuilderTest
    bit StatusBarTest:.NotificationBuilderTest
    bit StatusBarTest:com.android.statusbartest.NotificationBuilderTest
      Builds and installs StatusBarTest.apk, launches the
      com.android.statusbartest/.NotificationBuilderTest activity.

Change-Id: I9cff7a23852fa1a67369e7807f7ae9f6e45d6131
Test: none
2016-10-20 18:20:40 -07:00
Philip P. Moltmann
d7cee3cf5a Check USB and Print Framework code.
Test: Uploaded
Change-Id: Ib103a4fdc1dea0efc3a1a1be8c864541d283343a
2016-10-20 17:27:48 -07:00
Adam Lesinski
dfaecafbe9 AAPT2: Fail compile on bad output file/dir
Test: manual
Change-Id: I2578e32c52430a62df942822ddf6bd3f06357bce
2016-10-20 17:08:51 -07:00
TreeHugger Robot
12bfe65410 Merge "AAPT2: Error on uncompiled XML or PNG files in link phase" 2016-10-20 23:58:15 +00:00
Hugo Benichi
7724cdd8b9 ConnectivityManager: use ConnectivityThread looper
This patch removes the static singleton looper used by
ConnectivityManager and instead uses the common ConnectivityThread.

This allows to removes the static atomic counter used to track
the number of registered NetworkCallback in ConnectivityManager, because
the looper is not turned off anymore when no callbacks are registered.

Also an overloaded version of sendRequestForNetwork is added taking as a
new parameter a Handler. This will allow to overload various callback
and request related API calls with user provided Handlers.

Test: ConnectivityServiceTest passes
Bug: 26749700
Bug: 28537383
Bug: 32130437
Change-Id: I431afcee7c7155bd7bac23a2e1e97fd5d6520c74
2016-10-21 08:54:34 +09:00
Hugo Benichi
c9eb24ceab Merge "ConnectivityThread: use lazy holder idiom" 2016-10-20 23:49:03 +00:00
Hugo Benichi
5cc311774d Merge "ConnectivityManager: a simpler CallbackHandler" 2016-10-20 23:46:30 +00:00
Jacky Cheung
c74c449bc9 Merge "Gradually increase the level of authentication on failed GATT operations." am: 6071abdb92 am: 046a5c3a00
am: bd12e5c9db

Change-Id: Ic38340c15d1f2723c31d84acff12739acf8da3ff
2016-10-20 23:20:57 +00:00
Brad Ebinger
ce97bfbdb2 Switch on android.telecom.Log in Telecom
Move over the Runnable Class into android.telecom and turn on the
framework's usage in Telecom.
CP from: https://android-review.googlesource.com/#/c/287291/

Test: All Telecom unit tests pass. Manual Log testing has also been
confirmed to be working as it did before.
Bug: 26571395
Change-Id: If7e2036c746c5a953f3a77e2d625a423ce5bf8f3
(cherry picked from commit 9fbbd4052dee1dfa74b87502cec91cc51170d69d)
2016-10-20 23:18:26 +00:00
Jacky Cheung
bd12e5c9db Merge "Gradually increase the level of authentication on failed GATT operations." am: 6071abdb92
am: 046a5c3a00

Change-Id: I749b2e4d4a13f099cfdc164f7fec8556d09f8433
2016-10-20 23:11:51 +00:00
Sergei Vasilinetc
cc97d86da8 Merge "Pass Bitmap instead of SkBitmap for bitmap rect operation Test: refactoring cl. bug:32216791" 2016-10-20 23:05:05 +00:00
Jacky Cheung
046a5c3a00 Merge "Gradually increase the level of authentication on failed GATT operations."
am: 6071abdb92

Change-Id: If06babf4a23879acdfc358838cdc094d753c362b
2016-10-20 23:03:57 +00:00
Brad Ebinger
37521b9ba5 Merge "Switch on android.telecom.Log in Telecom" 2016-10-20 22:53:39 +00:00
Treehugger Robot
6071abdb92 Merge "Gradually increase the level of authentication on failed GATT operations." 2016-10-20 22:50:07 +00:00
Mathieu Chartier
946ebbcc51 Fix accounting for .vdex in dumpsys meminfo
Before it was showing up in "Other mmap" instead. Now it is correctly
showing up in ".dex mmap".

Bug: 30937355
Test: N6P booting, dumpsys meminfo -d

Change-Id: I335dbb77414b395b14259aa7c68068f845a5eca1
2016-10-20 15:46:08 -07:00
Winson
bf1ed3dfa7 Fixing issue with the pinned stack being cropped incorrectly.
- Pinned stacks were being treated as full screen tasks, and bounded 
  (incorrectly) to the display rect leading to negative insets.  In 
  turn, this caused the view root to have negative insets, which caused
  layout to be extended (width - (-inset)) when measured.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackOutOfBoundsInsetsNonNegative

Change-Id: I3339d982667c981a3c8ca56fb3542188de1d6714
2016-10-20 22:34:45 +00:00