OSDN Git Service
Sergei Vasilinetc [Fri, 21 Oct 2016 21:11:46 +0000 (21:11 +0000)]
Merge changes I1d8a9a6e,I5adcd59d
* changes:
Use Bitmap in DisplayList & RecordedOps instead of SkBitmap Test: refactoring cl. bug:
32216791
Pass Bitmap instead of SkBitmap in drawNinePatch & drawBitmapMesh Test: refactoring cl. bug:
32216791
TreeHugger Robot [Fri, 21 Oct 2016 19:22:47 +0000 (19:22 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
sergeyv [Fri, 21 Oct 2016 01:39:04 +0000 (18:39 -0700)]
Use Bitmap in DisplayList & RecordedOps instead of SkBitmap
Test: refactoring cl.
bug:
32216791
Change-Id: I1d8a9a6e772e2176b6c2409409a910478b45f8db
Wale Ogunwale [Fri, 21 Oct 2016 18:55:21 +0000 (18:55 +0000)]
Merge changes I26de316b,Iced72322,Iaa7f421d
* changes:
Removed WMS.getDefaultWindowListLocked()
Moved display related getting of orientation into DisplayContent
Have DisplayContent be the call point for adjusting wallpaper windows
TreeHugger Robot [Fri, 21 Oct 2016 18:53:47 +0000 (18:53 +0000)]
Merge "Removed WindowManagerService.getWindowListLocked()"
TreeHugger Robot [Fri, 21 Oct 2016 18:37:39 +0000 (18:37 +0000)]
Merge "Fix broken KeyguardMessageArea"
Joe Onorato [Fri, 21 Oct 2016 17:55:42 +0000 (17:55 +0000)]
Merge changes from topic 'am_instrument'
* changes:
Add a new build, install, test development (bit) tool
am instrument gets protobuf
Fix bad type codes in streaming proto compiler
Erik Wolsheimer [Fri, 21 Oct 2016 17:46:06 +0000 (17:46 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev am:
653b982d18 -s ours
am:
7d81fa03fa -s ours
Change-Id: Ia014c890c267b4b3bf364ecfeea72892d8c11fba
Erik Wolsheimer [Fri, 21 Oct 2016 17:45:04 +0000 (17:45 +0000)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time am:
b608d28f84 -s ours
am:
b2e09827bd -s ours
Change-Id: Ibb370e2c7ce9f920760b6e56b5a0802466872f44
Erik Wolsheimer [Fri, 21 Oct 2016 17:37:05 +0000 (17:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
am:
653b982d18 -s ours
Change-Id: Icceb19699edb6db18091844d22516eff8ac7bc4d
Mathieu Chartier [Fri, 21 Oct 2016 17:36:59 +0000 (17:36 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo" am:
4a5789b9b1 am:
bb08c03048
am:
f822d0bc33
Change-Id: I28189f4d70c6b76e25db5e318855f3512755969e
Erik Wolsheimer [Fri, 21 Oct 2016 17:36:58 +0000 (17:36 +0000)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time
am:
b608d28f84 -s ours
Change-Id: Ic3d70afc2f07ee8ae3e09fbb0e010daebb199f21
Mathieu Chartier [Fri, 21 Oct 2016 17:28:55 +0000 (17:28 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo" am:
4a5789b9b1
am:
bb08c03048
Change-Id: I24dc9ea087f76ebb2130a4d4957f0600e189aed3
TreeHugger Robot [Fri, 21 Oct 2016 17:23:42 +0000 (17:23 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev
Mathieu Chartier [Fri, 21 Oct 2016 17:20:27 +0000 (17:20 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
am:
4a5789b9b1
Change-Id: I3e50c0e6a80bc221228dd8293ec8209ecf323123
Mathieu Chartier [Thu, 20 Oct 2016 22:38:55 +0000 (15:38 -0700)]
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
(cherry picked from commit
946ebbcc510acee5c166f2945075da65d8ae6ed3)
Change-Id: I49a202deda3fc34a94247825dc059b8a854ba61a
Mathieu Chartier [Fri, 21 Oct 2016 17:07:37 +0000 (17:07 +0000)]
Merge "Fix accounting for .vdex in dumpsys meminfo"
Andrii Kulian [Fri, 21 Oct 2016 16:56:32 +0000 (16:56 +0000)]
Merge "Fix NPEs when display is added or removed"
Adrian Roos [Thu, 20 Oct 2016 22:34:23 +0000 (15:34 -0700)]
Fix broken KeyguardMessageArea
Fixes a bug where the keyguard message area would reorder clears
after a new message was set, leading to the bouncer prompt reason
not showing.
Change-Id: I33001300d9175c521809cd4fdae5158269245c00
Fixes:
32306174
Test: runtest -x $T/frameworks/base/packages/SystemUI/tests/src/com/android/keyguard/KeyguardMessageAreaTest.java
Erik Wolsheimer [Fri, 21 Oct 2016 04:09:44 +0000 (21:09 -0700)]
DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time
BUG:
32172459
BUG:
32069897
Change-Id: I6f030b6288433b9cefce0f2fb1a69de61bfa7617
Wale Ogunwale [Fri, 21 Oct 2016 16:01:38 +0000 (09:01 -0700)]
Removed WMS.getDefaultWindowListLocked()
6th 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: I26de316b8c20dd891a214fb40ef3991a0e895442
Wale Ogunwale [Thu, 20 Oct 2016 22:29:42 +0000 (15:29 -0700)]
Moved display related getting of orientation into DisplayContent
5th step in trying to make WindowList private to DisplayContent.
Exact code to get orientation in WMS that is display specific
because it iterates over the window list into the DisplayContent
object.
Test: Manual testing and exiting test pass.
Change-Id: Iced72322cdebdde83882802af4a9decf323f20e1
Wale Ogunwale [Thu, 20 Oct 2016 17:16:29 +0000 (10:16 -0700)]
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
Wale Ogunwale [Thu, 20 Oct 2016 16:31:56 +0000 (09:31 -0700)]
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
Jakub Adamek [Fri, 21 Oct 2016 09:35:45 +0000 (09:35 +0000)]
Add new color: accent with 60% opacity. am:
4f8b640bb7
am:
917d7d1a2d
Change-Id: I2a40035efbd15b8497a64d306e09d8e37301ea44
Jakub Adamek [Fri, 21 Oct 2016 09:27:35 +0000 (09:27 +0000)]
Add new color: accent with 60% opacity.
am:
4f8b640bb7
Change-Id: I59d23f030b6413f5cf3899d4a6b0daea7ff271c7
Jakub Adamek [Thu, 20 Oct 2016 08:45:38 +0000 (09:45 +0100)]
Add new color: accent with 60% opacity.
Bug:
32201256
Change-Id: Id09420b78941b59df2f248dd75994fb7275ec2ea
Jakub Adámek [Fri, 21 Oct 2016 08:09:42 +0000 (08:09 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev am:
42f40b159f
am:
6ba7dabc91
Change-Id: Ibf266357d7e96683f801660ad4cf538d002ec821
Jakub Adamek [Fri, 21 Oct 2016 08:08:39 +0000 (08:08 +0000)]
Fix idmap calls when a subdir is present. am:
56b9987ed7
am:
47c7e1e9f9
Change-Id: I30a8a7531080bd52145219f62133e78198eb1006
Jakub Adámek [Fri, 21 Oct 2016 07:58:34 +0000 (07:58 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev
am:
42f40b159f
Change-Id: I8370a4d376a02c8a16bdb1ebe5ff58a20ca0989b
Jakub Adamek [Fri, 21 Oct 2016 07:58:26 +0000 (07:58 +0000)]
Fix idmap calls when a subdir is present.
am:
56b9987ed7
Change-Id: Ia58f447ec6bf3b63e2922b02a794f487ec9679d0
Jakub Adámek [Fri, 21 Oct 2016 07:51:17 +0000 (07:51 +0000)]
Merge "Fix idmap calls when a subdir is present." into cw-f-dev
Jakub Adamek [Thu, 20 Oct 2016 14:07:57 +0000 (15:07 +0100)]
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
Flavio Lerda [Fri, 21 Oct 2016 07:19:47 +0000 (07:19 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev am:
327dbfb94f
am:
1a10780c6b
Change-Id: Id7db030eb7b76e84ee6c0236e55e796f5fb00cf4
Jakub Adamek [Fri, 21 Oct 2016 07:16:07 +0000 (07:16 +0000)]
Change name of overlay subdir 'sku'->'theme' am:
54dcaaba4f
am:
6bbb63ad91
Change-Id: I71dfaafbebaa7bd61d182405c734eef1ea7ff1eb
Flavio Lerda [Fri, 21 Oct 2016 07:09:27 +0000 (07:09 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
am:
327dbfb94f
Change-Id: I33e92132b4422726928531da8be7a444cbd2fd64
Jakub Adamek [Fri, 21 Oct 2016 07:05:17 +0000 (07:05 +0000)]
Change name of overlay subdir 'sku'->'theme'
am:
54dcaaba4f
Change-Id: I4536de644c20171e175cddaff0cd041fb05b3038
Flavio Lerda [Fri, 21 Oct 2016 06:32:18 +0000 (06:32 +0000)]
Merge "Change name of overlay subdir 'sku'->'theme'" into cw-f-dev
liulvping [Fri, 21 Oct 2016 04:58:43 +0000 (04:58 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig" am:
e6fe836938 am:
0046acc2db
am:
78b29d52e0
Change-Id: Ic780ee41444f3b335339d5bfe418ce2738785ea7
Brad Ebinger [Fri, 21 Oct 2016 04:55:19 +0000 (04:55 +0000)]
Merge "Switch on android.telecom.Log in Telecom" am:
37521b9ba5 -s ours am:
ce21e3ffa8
am:
0fcc717ed9
Change-Id: I0d03c1dccfee9ffe7b8c6f44f6bdbfb876c11d21
Brad Ebinger [Fri, 21 Oct 2016 04:53:57 +0000 (04:53 +0000)]
Switch on android.telecom.Log in Telecom am:
ce97bfbdb2
am:
7ed42a72c0
Change-Id: I8adb58d243f2e674ec031584356496a754b21cf8
liulvping [Fri, 21 Oct 2016 04:46:50 +0000 (04:46 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig" am:
e6fe836938
am:
0046acc2db
Change-Id: Iff046d5f35c34a425e4765a69700d09d6834b16f
Brad Ebinger [Fri, 21 Oct 2016 04:45:47 +0000 (04:45 +0000)]
Merge "Switch on android.telecom.Log in Telecom" am:
37521b9ba5 -s ours
am:
ce21e3ffa8
Change-Id: I64e18346d869594db31f3e7fa3154bb9198a3790
liulvping [Fri, 21 Oct 2016 04:38:38 +0000 (04:38 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
am:
e6fe836938
Change-Id: I4eda1d6aed52fa4d8cbcd1ade29e96f14e58bab7
Brad Ebinger [Fri, 21 Oct 2016 04:37:28 +0000 (04:37 +0000)]
Merge "Switch on android.telecom.Log in Telecom"
am:
37521b9ba5 -s ours
Change-Id: I1a624721f577be6b1cf684208cdeb4e0471e51f2
Brad Ebinger [Fri, 21 Oct 2016 04:37:22 +0000 (04:37 +0000)]
Switch on android.telecom.Log in Telecom
am:
ce97bfbdb2
Change-Id: Ic7827f1627eca43937609e21d15186f483381182
Hugo Benichi [Fri, 21 Oct 2016 04:35:48 +0000 (04:35 +0000)]
Merge "IpConnectivity metrics: add version number"
Treehugger Robot [Fri, 21 Oct 2016 03:50:15 +0000 (03:50 +0000)]
Merge "fix mistaken check of mScreenBrightnessDarkConfig"
TreeHugger Robot [Fri, 21 Oct 2016 03:04:10 +0000 (03:04 +0000)]
Merge "AAPT2: Fail compile on bad output file/dir"
TreeHugger Robot [Fri, 21 Oct 2016 02:48:55 +0000 (02:48 +0000)]
Merge "Check USB and Print Framework code."
Andrii Kulian [Wed, 19 Oct 2016 20:30:58 +0000 (13:30 -0700)]
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.
liulvping [Thu, 20 Oct 2016 11:51:38 +0000 (19:51 +0800)]
fix mistaken check of mScreenBrightnessDarkConfig
Change-Id: Ibd1234a5a69422f3124e72cd561d4f3624a82faf
Signed-off-by: liulvping <liulvping@xiaomi.com>
TreeHugger Robot [Fri, 21 Oct 2016 01:49:44 +0000 (01:49 +0000)]
Merge "ConnectivityManager: use ConnectivityThread looper"
Joe Onorato [Thu, 20 Oct 2016 00:03:06 +0000 (17:03 -0700)]
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
Philip P. Moltmann [Fri, 21 Oct 2016 00:09:39 +0000 (17:09 -0700)]
Check USB and Print Framework code.
Test: Uploaded
Change-Id: Ib103a4fdc1dea0efc3a1a1be8c864541d283343a
Adam Lesinski [Fri, 21 Oct 2016 00:08:51 +0000 (17:08 -0700)]
AAPT2: Fail compile on bad output file/dir
Test: manual
Change-Id: I2578e32c52430a62df942822ddf6bd3f06357bce
TreeHugger Robot [Thu, 20 Oct 2016 23:58:13 +0000 (23:58 +0000)]
Merge "AAPT2: Error on uncompiled XML or PNG files in link phase"
Hugo Benichi [Thu, 7 Jul 2016 01:15:56 +0000 (10:15 +0900)]
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
Hugo Benichi [Thu, 20 Oct 2016 23:49:01 +0000 (23:49 +0000)]
Merge "ConnectivityThread: use lazy holder idiom"
Hugo Benichi [Thu, 20 Oct 2016 23:46:28 +0000 (23:46 +0000)]
Merge "ConnectivityManager: a simpler CallbackHandler"
Jacky Cheung [Thu, 20 Oct 2016 23:20:57 +0000 (23:20 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." am:
6071abdb92 am:
046a5c3a00
am:
bd12e5c9db
Change-Id: Ic38340c15d1f2723c31d84acff12739acf8da3ff
Brad Ebinger [Wed, 5 Oct 2016 22:47:28 +0000 (15:47 -0700)]
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)
Jacky Cheung [Thu, 20 Oct 2016 23:11:51 +0000 (23:11 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." am:
6071abdb92
am:
046a5c3a00
Change-Id: I749b2e4d4a13f099cfdc164f7fec8556d09f8433
Sergei Vasilinetc [Thu, 20 Oct 2016 23:05:02 +0000 (23:05 +0000)]
Merge "Pass Bitmap instead of SkBitmap for bitmap rect operation Test: refactoring cl. bug:
32216791"
Jacky Cheung [Thu, 20 Oct 2016 23:03:57 +0000 (23:03 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations."
am:
6071abdb92
Change-Id: If06babf4a23879acdfc358838cdc094d753c362b
Brad Ebinger [Thu, 20 Oct 2016 22:53:38 +0000 (22:53 +0000)]
Merge "Switch on android.telecom.Log in Telecom"
Treehugger Robot [Thu, 20 Oct 2016 22:50:07 +0000 (22:50 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations."
Mathieu Chartier [Thu, 20 Oct 2016 22:38:55 +0000 (15:38 -0700)]
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
Winson [Thu, 20 Oct 2016 00:30:26 +0000 (17:30 -0700)]
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
Winson Chung [Thu, 20 Oct 2016 22:34:27 +0000 (22:34 +0000)]
Merge "Changing initial PIP bounds specifications."
Brad Ebinger [Thu, 20 Oct 2016 22:23:31 +0000 (22:23 +0000)]
Merge "Adds registerSessionListener API to Log" am:
e3daed81eb am:
b4ef12bba7
am:
4f28458250
Change-Id: Ic6118d1bc07fc7adeb9914d30c2107e604d669ef
Brad Ebinger [Thu, 20 Oct 2016 22:15:57 +0000 (22:15 +0000)]
Merge "Adds registerSessionListener API to Log" am:
e3daed81eb
am:
b4ef12bba7
Change-Id: I255d21923f45efcfc9d75057d42992dc58088e73
Brad Ebinger [Thu, 20 Oct 2016 22:09:30 +0000 (22:09 +0000)]
Merge "Adds registerSessionListener API to Log"
am:
e3daed81eb
Change-Id: Ia42cba6a735170ce1aea653bd42b6f1182853819
Agnieszka Madurska [Thu, 20 Oct 2016 22:05:28 +0000 (22:05 +0000)]
Merge "Add custom scrollbars to the default device theme" into cw-f-dev am:
faf09eaa40
am:
4768313c02
Change-Id: I3e37fab0d61244db77404f12f1da5e127f1ab0a0
sergeyv [Thu, 20 Oct 2016 22:04:28 +0000 (15:04 -0700)]
Pass Bitmap instead of SkBitmap in drawNinePatch & drawBitmapMesh
Test: refactoring cl.
bug:
32216791
Change-Id: I5adcd59daf752d36012456b0a9960c59d07e2e3d
Aga Madurska [Thu, 20 Oct 2016 22:04:28 +0000 (22:04 +0000)]
Add custom scrollbars to the default device theme am:
78a340f2b6
am:
9f47d20e57
Change-Id: Ia7531c574806cd241040bd9fdacae94c0c5d5b3b
Matthew Fritze [Thu, 20 Oct 2016 22:02:49 +0000 (22:02 +0000)]
Merge "Default for sending package name to support should be false" into nyc-mr1-dev am:
71ae440ac2 am:
46af871c00
am:
30678ec096
Change-Id: Ia02f949534ba1b194665e26a18eab79f7589eeba
Matthew Fritze [Thu, 20 Oct 2016 22:01:51 +0000 (22:01 +0000)]
Default for sending package name to support should be false am:
b68a83a8eb am:
4d9085f1d2
am:
6adcb1b33a
Change-Id: I79355e651feb9492a8bd21b1ed865e9d725df14d
Agnieszka Madurska [Thu, 20 Oct 2016 21:54:18 +0000 (21:54 +0000)]
Merge "Add custom scrollbars to the default device theme" into cw-f-dev
am:
faf09eaa40
Change-Id: Iaf21cc52a4c678be6bb31cfdeb64d79b8b8b32f5
Aga Madurska [Thu, 20 Oct 2016 21:54:11 +0000 (21:54 +0000)]
Add custom scrollbars to the default device theme
am:
78a340f2b6
Change-Id: I67f5e74259b5fa16bd647e7b7796d34a798ee175
Brad Ebinger [Thu, 20 Oct 2016 21:51:53 +0000 (21:51 +0000)]
Merge "Adds registerSessionListener API to Log"
Selim Gurun [Thu, 20 Oct 2016 21:47:36 +0000 (21:47 +0000)]
Merge "Update the documentation for onCreateInputConnection"
Adam Lesinski [Thu, 20 Oct 2016 21:38:23 +0000 (14:38 -0700)]
AAPT2: Error on uncompiled XML or PNG files in link phase
Incorrectly passing text XML and unprocessed PNG files to
the AAPT2 link phase should raise an error.
Test: manual incorrect invocation of aapt2
Change-Id: Iab47f99bc378b5d1c4f4d87098f08243b9a4dc6a
Jacky Cheung [Thu, 20 Oct 2016 21:40:20 +0000 (21:40 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev am:
8167362bab
am:
132263d8f9
Change-Id: Id48f048974d99570cb4d7df73c3cc2f110530f10
Agnieszka Madurska [Thu, 20 Oct 2016 21:39:48 +0000 (21:39 +0000)]
Merge "Add custom scrollbars to the default device theme" into cw-f-dev
Jacky Cheung [Thu, 20 Oct 2016 21:39:13 +0000 (21:39 +0000)]
Gradually increase the level of authentication on failed GATT operations. am:
84c6d339ee -s ours
am:
aeda8be7b2
Change-Id: Ifa2468c91a9d54f18be8cf51c91240ab1bf6ac5f
Matthew Fritze [Thu, 20 Oct 2016 21:36:26 +0000 (21:36 +0000)]
Merge "Default for sending package name to support should be false" into nyc-mr1-dev am:
71ae440ac2
am:
46af871c00
Change-Id: I92aa1053b8fefc36c617b3ad69af0af039fc6493
Shuzhen Wang [Thu, 20 Oct 2016 21:36:13 +0000 (21:36 +0000)]
Merge "Camera2: Add onCaptureQueueEmpty callback"
Matthew Fritze [Thu, 20 Oct 2016 21:35:14 +0000 (21:35 +0000)]
Default for sending package name to support should be false am:
b68a83a8eb
am:
4d9085f1d2
Change-Id: I10fb181b9aebc66bbbcaa646618f26ca84dfe552
Jacky Cheung [Thu, 20 Oct 2016 21:29:45 +0000 (21:29 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev
am:
8167362bab
Change-Id: I437b4df98f960426836536e96cdc33458162f649
Jacky Cheung [Thu, 20 Oct 2016 21:29:32 +0000 (21:29 +0000)]
Gradually increase the level of authentication on failed GATT operations.
am:
84c6d339ee -s ours
Change-Id: Icf50ddb340569c398d2820989083668a2c35c7f4
Matthew Fritze [Thu, 20 Oct 2016 21:16:24 +0000 (21:16 +0000)]
Merge "Default for sending package name to support should be false" into nyc-mr1-dev
am:
71ae440ac2
Change-Id: Idc18efe910dda8339e5fa7030e61b6172092f64a
Jason Monk [Thu, 20 Oct 2016 21:16:17 +0000 (21:16 +0000)]
Merge "Add nav gesture plugin interface"
Matthew Fritze [Thu, 20 Oct 2016 21:16:20 +0000 (21:16 +0000)]
Default for sending package name to support should be false
am:
b68a83a8eb
Change-Id: Ic30a1508a9f7a8b1592778fc7eaa44692e99e579
Matthew Fritze [Thu, 20 Oct 2016 21:05:06 +0000 (21:05 +0000)]
Merge "Default for sending package name to support should be false" into nyc-mr1-dev
sergeyv [Mon, 17 Oct 2016 20:07:38 +0000 (13:07 -0700)]
Pass Bitmap instead of SkBitmap for bitmap rect operation
Test: refactoring cl.
bug:
32216791
Change-Id: I66d19194c57b3aa2c400aa87acffc774a533776a
Jacky Cheung [Thu, 20 Oct 2016 20:55:21 +0000 (13:55 -0700)]
Gradually increase the level of authentication on failed GATT operations.
When lower layer returns insufficient authentication or insufficient
encryption on various GATT operations, gradually retry with increased
authentication level first to AUTHENTICATION_NO_MITM, then
AUTHENTICATION_MITM.
Test: ported from internal branch.
Change-Id: I6bcc4198ca493b7900ddd166a81d30cde896fa86
Selim Gurun [Thu, 20 Oct 2016 18:53:14 +0000 (11:53 -0700)]
Update the documentation for onCreateInputConnection
Update the documentation to clarify that WebView calls methods of the
InputConnection on a separate thread than the UI thread. This is,
in some sense, similar to shouldInterceptRequest. The methods
that override InputConnection methods should be careful about thread
restrictions and concurrency when calling other methods or accessing
shared members.
Test: Document update. Verified manually.
Change-Id: Ida76cd5dcc683092c05947c3044d848d0a249547
Jacky Cheung [Thu, 20 Oct 2016 20:42:05 +0000 (20:42 +0000)]
Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev
Calvin On [Thu, 20 Oct 2016 20:26:52 +0000 (20:26 +0000)]
Add option to skip and avoid captive portals. am:
4bc78eba6f
am:
4a048f9964
Change-Id: I530ccb95aa97100b27d71186173645031082acc1