Commit Graph

64593 Commits

Author SHA1 Message Date
TreeHugger Robot
f2ec2c1e42 Merge "Apply display override config for secondary displays" 2016-10-25 22:00:57 +00:00
TreeHugger Robot
942fde1415 Merge "Add the ability to postpone transitions." 2016-10-25 21:12:12 +00:00
Andrii Kulian
5406e7ade8 Apply display override config for secondary displays
Now display-specific settings, such as dimensions and orientation,
are stored in display override config. For default display it is
mirroring the global config. Each time when global config is updated,
override of the default display should be updated too and vice versa.

Test: Existing and manual tests still pass.
Change-Id: Ic6c2190092d328820f314a05bed43c875db18170
2016-10-25 13:22:10 -07:00
TreeHugger Robot
d80812b882 Merge "Optimize Fragment operations so that minimal work is done." 2016-10-25 19:33:27 +00:00
Andrew Scull
22851dbcb2 Merge "Refactor password metric computation." 2016-10-25 09:04:58 +00:00
Keisuke Kuroyanagi
c69f693216 Merge "Fix: Undo for drag and drop." 2016-10-25 01:24:18 +00:00
Keisuke Kuroyanagi
46ca471d25 Merge "Fix: Selection created by long tap and drag can be empty." 2016-10-25 01:20:22 +00:00
Rob Carr
92c8ab1b07 Merge "Prevent crash from early Toast surface destruction." 2016-10-24 23:10:59 +00:00
TreeHugger Robot
03db8e4b58 Merge changes I1a544a8d,Ie78d3fb0
* changes:
  IpConnectivityMetrics: rate limit ApfProgramEvents
  IpConnectivityMetrics reads buffer size in settings
2016-10-24 14:45:46 +00:00
Hugo Benichi
e1c173d224 IpConnectivityMetrics: rate limit ApfProgramEvents
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).

Test: new test in IpConnectivityMetricsTest
Bug: 1550402
Change-Id: I1a544a8d62e6b02f0ed0088ab76c4bad338d2f44
2016-10-24 21:54:37 +09:00
Hugo Benichi
05686dbb6b IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637
Change-Id: Ie78d3fb03cea7883585549dac4f2063f0a8d9f4b
2016-10-24 13:52:41 +09:00
Robert Sesek
02bf0b6dbc Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546 am: f80fab010a
am: aa544e975e

Change-Id: I561fff0f56bdbfdeb6c92c11c3fce12cf3fe28be
2016-10-22 03:22:50 +00:00
Robert Sesek
aa544e975e Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546
am: f80fab010a

Change-Id: I37d0d62662ee96a9eefe2dfa71670d8e4b724889
2016-10-22 03:17:15 +00:00
Robert Sesek
f80fab010a Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am: 8be2850546

Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
2016-10-22 03:12:18 +00:00
Treehugger Robot
8be2850546 Merge "Create the WebViewZygote and implement WebViewZygoteInit." 2016-10-22 03:03:10 +00:00
Jeremy Joslin
807102d7ff VPN network stat accounting changes. am: 3f0d75afe8
am: 0d309b7a47

Change-Id: I797ac586581f83ada0e94639dd435122c987f1c1
2016-10-21 23:43:06 +00:00
Jeremy Joslin
0d309b7a47 VPN network stat accounting changes.
am: 3f0d75afe8

Change-Id: I1c65db583cdd1d5b519830e521c633cb8dee449f
2016-10-21 23:37:57 +00:00
Siyamed Sinir
7984eb58be Merge "Update TextView (set|get)(min|max)(width|height) ApiDoc" 2016-10-21 21:51:16 +00:00
Yin-Chia Yeh
3e254b6953 Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41 am: 50f9b6e71f
am: 0eb99d23b4

Change-Id: Ie8dbed22423aa52b418cebfd19e29c6ae2c6e2b5
2016-10-21 21:28:21 +00:00
Vinod Krishnan
909bbd3117 Fwk: Only chime when docked and accessbility is on am: cf11ceab65
am: ccf3baf6c5

Change-Id: I685dc2ef179087600e4d3c5776448ece338901b7
2016-10-21 21:21:18 +00:00
Yin-Chia Yeh
0eb99d23b4 Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41
am: 50f9b6e71f

Change-Id: I1da99a15ab8ff08d3f9ccb0e9408990ad60ff279
2016-10-21 21:18:48 +00:00
Vinod Krishnan
ccf3baf6c5 Fwk: Only chime when docked and accessbility is on
am: cf11ceab65

Change-Id: Ief29ef6f325a8248843faa9fbe9ae6ff893a6918
2016-10-21 21:14:19 +00:00
Yin-Chia Yeh
50f9b6e71f Merge "Camera2 Legacy: catch more surface abandoned error"
am: 03f14bef41

Change-Id: If2e05eeb8c7fe24f97fc0c5e20bfe03a6c8c9e23
2016-10-21 21:07:44 +00:00
TreeHugger Robot
088f73a9e9 Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev 2016-10-21 20:41:10 +00:00
Yin-Chia Yeh
091661334b Camera2 Legacy: catch more surface abandoned error
Bug: 30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db
2016-10-21 11:40:46 -07:00
Vinod Krishnan
cf11ceab65 Fwk: Only chime when docked and accessbility is on
Bug: 32036947

Change-Id: I5786abe827735cc3a4bc1d52baacaa19bccaae77
2016-10-21 10:28:37 -07: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
TreeHugger Robot
8d48570f45 Merge "ConnectivityManager: use ConnectivityThread looper" 2016-10-21 01:49:46 +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
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
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
Winson Chung
b72fd03d5a Merge "Changing initial PIP bounds specifications." 2016-10-20 22:34:31 +00:00
Selim Gurun
6359e320aa Merge "Update the documentation for onCreateInputConnection" 2016-10-20 21:47:40 +00:00
Shuzhen Wang
461f767606 Merge "Camera2: Add onCaptureQueueEmpty callback" 2016-10-20 21:36:16 +00:00
Jacky Cheung
3854e22674 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
2016-10-20 13:59:04 -07:00
Selim Gurun
c92080bd78 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
2016-10-20 13:48:08 -07:00
Jacky Cheung
8167362bab Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev 2016-10-20 20:42:09 +00:00
Calvin On
4a048f9964 Add option to skip and avoid captive portals.
am: 4bc78eba6f

Change-Id: Id38d5c03d06822f9b20abd65db9dd04c90110b63
2016-10-20 20:18:10 +00:00
Calvin On
4bc78eba6f Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
(cherry picked from commit be96da11cc)
2016-10-20 18:50:46 +00:00
Jacky Cheung
84c6d339ee 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.

Change-Id: I68335cf7451aeaf49c227d604f69cb329d117d08
2016-10-20 18:17:12 +00:00
Andrew Scull
5f9e6f37b2 Refactor password metric computation.
This unifies previously duplicated code.

Bug: 30558331
Test: runtest -x frameworks/base/core/tests/coretests/src/android/app/admin/PasswordMetricsTest.java
Change-Id: I37678b83a03d4f05b9894d4b00e9a741d1a8df27
2016-10-20 19:04:41 +01:00
Sudheer Shanka
c2c956b3c4 Merge "Move ApplicationThread to aidl." 2016-10-20 17:55:06 +00:00
Winson
06868c37df Changing initial PIP bounds specifications.
- Change from a absolute bounds to a size, gravity and inset to
  allow easier tweaking of initial pinned stack bounds.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPinnedStackDefaultBounds
Test: #testPinnedStackMovementBounds

Change-Id: I82a102bbd2d83259c6c84915071d1a16728e3aa7
2016-10-20 09:57:27 -07:00
Julia Reynolds
e2b77a55b3 Merge "Move autogrouping into framework." 2016-10-20 15:23:27 +00:00
TreeHugger Robot
b9df32d1ff Merge "Add option to skip and avoid captive portals." 2016-10-20 09:50:07 +00:00
Calvin On
be96da11cc Add option to skip and avoid captive portals.
Test: ConnectivityServiceTest updated with test cases.
Test: Manually tested against att-wifi in B42.
Bug: 30222699
Change-Id: Ibe63942da04748ab0406e24e0f44be31d47710a0
2016-10-20 00:51:39 -07:00
Hugo Benichi
c4fe5d373c ConnectivityThread: use lazy holder idiom
This patch changes the way that the ConnectivityThread is lazily
instantiated by using the "lazy initialization holder class idiom".

The first code point that tries to obtain a reference to the unique
ConnectivityThread instance will trigger the creation of the Singleton
class, which will guarantee a thread-safe initialization of the static
INSTANCE field inside Singleton according to the language specs.

This is the Item #71 of Effective Java.

The unique static instance of ConnectivityThread is not stored directly
inside ConnectivityThread class but is stored in a static nested class.
This is to avoid triggering the creation of that unique instance when
Zygote does class preloading at phone startup. Otherwise this would lead
to Zygote creating a new OS thread during preloading, which is a fatal
error.

Test: frameworks-wifi tests pass
Bug: 26749700
Bug: 28537383
Bug: 32130437

Change-Id: I4d5672a3195d3af9a0a2c85f871695257abe782b
2016-10-20 09:30:13 +09:00