OSDN Git Service
Andreas Huber [Wed, 16 Aug 2017 23:57:46 +0000 (23:57 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." am:
2c4dfa0412
am:
013bea3d42
Change-Id: Ic4bc005e8ebf19a4e0389569e7c6cf66a565636b
Andreas Huber [Wed, 16 Aug 2017 23:40:07 +0000 (23:40 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder."
am:
2c4dfa0412
Change-Id: I20348e98597bf8de57b19ef25aec6fb0912da25f
Hall Liu [Wed, 16 Aug 2017 23:29:08 +0000 (23:29 +0000)]
Merge "Fix lint errors in the streaming API" am:
b0f5d57489
am:
90b923f398
Change-Id: Ic6bd1488a735f2535e4a34fd2df4dc154a777639
Andreas Huber [Wed, 16 Aug 2017 23:17:49 +0000 (23:17 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder."
Hall Liu [Wed, 16 Aug 2017 23:16:30 +0000 (23:16 +0000)]
Merge "Fix lint errors in the streaming API"
am:
b0f5d57489
Change-Id: Ic12810c6a3c795419ff7440218ffa23bad7d8401
Hall Liu [Wed, 16 Aug 2017 22:51:13 +0000 (22:51 +0000)]
Merge "Fix lint errors in the streaming API"
Android Build Merger (Role) [Wed, 16 Aug 2017 21:56:15 +0000 (21:56 +0000)]
Merge "Merge "Improve container capability bounding in containers" am:
586fd52b34 am:
ed05287c55" into oc-dev-plus-aosp
Luis Hector Chavez [Wed, 16 Aug 2017 21:51:27 +0000 (21:51 +0000)]
Merge "Improve container capability bounding in containers" am:
586fd52b34
am:
ed05287c55
Change-Id: I4e35ece840f6094f869bdc9a8d881ec985a1c25b
Luis Hector Chavez [Wed, 16 Aug 2017 21:43:28 +0000 (21:43 +0000)]
Merge "Improve container capability bounding in containers" am:
586fd52b34
am:
ed05287c55
Change-Id: I6068105d31418ec7b1c89f099bf635618147c227
Luis Hector Chavez [Wed, 16 Aug 2017 21:32:13 +0000 (21:32 +0000)]
Merge "Improve container capability bounding in containers"
am:
586fd52b34
Change-Id: I7c67b571164e67b3e4a8ae9c9a2701e338693a4b
Treehugger Robot [Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)]
Merge "Improve container capability bounding in containers"
Charles He [Wed, 16 Aug 2017 20:25:51 +0000 (20:25 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d am:
69ae08b680 am:
35c3b58d46
am:
c29ad5c94c
Change-Id: I0f0a46ac2c5544d4f5d0579767f7f7d81e0c900f
Charles He [Wed, 16 Aug 2017 20:15:23 +0000 (20:15 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d am:
69ae08b680
am:
35c3b58d46
Change-Id: I9ce7456fec5af181ec5e42bfc5f139a1b00137cf
Charles He [Wed, 16 Aug 2017 20:03:15 +0000 (20:03 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662 am:
510f02244d
am:
69ae08b680
Change-Id: Ida122a46fece975924a002e6a5a0f6521ed8756f
Charles He [Wed, 16 Aug 2017 19:51:43 +0000 (19:51 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c am:
a175bae662
am:
510f02244d
Change-Id: I3bfe22ab41813abbeebee58d7cc8789e95a1a2fa
Charles He [Wed, 16 Aug 2017 19:39:50 +0000 (19:39 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1 am:
6adae5108c
am:
a175bae662
Change-Id: Id250bcbcf92bdb95813dc4fcdd772aeef7f29c0a
Charles He [Wed, 16 Aug 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70 am:
733c7607d1
am:
6adae5108c
Change-Id: I104eea9bf02f89b6c2bde0daeff81aaa781e323d
Charles He [Wed, 16 Aug 2017 19:13:17 +0000 (19:13 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92 am:
5d34739d70
am:
733c7607d1
Change-Id: Id1c4c4de5d6e4da05188326287ae86e74bf89623
Kevin Hufnagle [Wed, 16 Aug 2017 19:01:35 +0000 (19:01 +0000)]
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
am:
80376a98a5
Change-Id: I651865861984671961a44a21f72246f8e0ae12b8
Charles He [Wed, 16 Aug 2017 18:58:11 +0000 (18:58 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92
am:
5d34739d70
Change-Id: I51f9bbaa35a853ec3442267cbb9327a2a64ff1d1
Charles He [Wed, 16 Aug 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours
am:
5048fc8e92
Change-Id: Ib55158e1608d7eeba7d41854377ed1e93e283a75
Kevin Hufnagle [Wed, 16 Aug 2017 18:44:34 +0000 (18:44 +0000)]
Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
Charles He [Wed, 16 Aug 2017 18:37:17 +0000 (18:37 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
am:
039b357a46 -s ours
Change-Id: Ia916a0c1a5ec5d63e4e76ed9da9d563fd39d3823
Hall Liu [Fri, 4 Aug 2017 01:26:39 +0000 (18:26 -0700)]
Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.
Bug:
30981736
Test: manual, with testapps
Change-Id: I94e1bcccea4b9f50dae4c93f247ab78058d15bb5
Cindy Kuang [Wed, 16 Aug 2017 17:12:09 +0000 (17:12 +0000)]
Merge "docs: corrected code example mistakes" into oc-dev
am:
5714da6e93
Change-Id: Iafb9e2fd73fa1c5c0132da387d900a701433b78c
Di Lu [Wed, 16 Aug 2017 16:59:47 +0000 (16:59 +0000)]
Merge "Add user quota information into the IpSecService dump" am:
fedd856546
am:
5bef43fb64
Change-Id: Ie9900672ab24be1687bbd605b2f6993dd8acaa49
Cindy Kuang [Wed, 16 Aug 2017 16:59:31 +0000 (16:59 +0000)]
Merge "docs: corrected code example mistakes" into oc-dev
Di Lu [Wed, 16 Aug 2017 16:33:18 +0000 (16:33 +0000)]
Merge "Add user quota information into the IpSecService dump"
am:
fedd856546
Change-Id: I1f64ab03918ece154fe31a07b698825315d39c0f
Andreas Huber [Wed, 16 Aug 2017 16:02:02 +0000 (09:02 -0700)]
Remove unused global references in JNI code supporting HwBinder.
Bug:
63814586
Change-Id: Ia149cc055d6e105df8e109ae1b959a9fbf669b8a
Test: hidl_test_java
Di Lu [Wed, 16 Aug 2017 16:20:18 +0000 (16:20 +0000)]
Merge "Add user quota information into the IpSecService dump"
Luis Hector Chavez [Wed, 12 Jul 2017 17:03:30 +0000 (10:03 -0700)]
Improve container capability bounding in containers
This change stops relying on the ro.boot.container property for dropping
a subset of capabilities and instead relies on the effective capability
mask of the Zygote process, prior to forking.
When Android is running in a pid/mount/net/user namespace, even if a
particular capability is present, some operations that require that
capability check whether it is allowed in the init namespace (instead of
in the current namespace), so they would fail even with the capability
granted within the namespace. So, explicitly dropping the capabilities
from the beginning allows for clearer signalling of which operations can
be expected to work instead of failing silently for mysterious reasons.
Bug:
63579953
Test: aosp_bullhead-eng still boots
Test: Running Zygote without CAP_SYS_MODULE makes it such that
system_server does not request it.
Change-Id: I1d18d13341bcc04e701fd14092e7e94961728620
Hugo Benichi [Wed, 16 Aug 2017 14:56:51 +0000 (14:56 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress" am:
2ad60c88f1
am:
ea2defe62b
Change-Id: Iddfec82a08f845e728adadfa6ec58a60a078d6af
Hugo Benichi [Wed, 16 Aug 2017 14:49:27 +0000 (14:49 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress"
am:
2ad60c88f1
Change-Id: I6d3f3c50eaec44e3a0787e849ab28e89f6f4a72d
Treehugger Robot [Wed, 16 Aug 2017 14:38:29 +0000 (14:38 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress"
Hugo Benichi [Tue, 8 Aug 2017 04:06:04 +0000 (13:06 +0900)]
Add convenience methods to IpPrefix and LinkAddress
Also moving relevant test files into tests/net as part of runtest
framworks-net.
Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.
This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.
For instance this test is now broken because hashing for InetAddress
changed.
Bug:
62988545
Bug:
62918393
Test: runtest frameworks-net, added coverage in tests
Change-Id: I695bc3f0e801bf13bc4fc0706565758f12b775b4
Hugo Benichi [Wed, 16 Aug 2017 12:10:19 +0000 (12:10 +0000)]
Merge "More OWNERS file for core networking team" am:
2827f21740
am:
1da7985327
Change-Id: Ieb04d616adf0969d2f4f468bf93fdc4b0aac75c5
Hugo Benichi [Wed, 16 Aug 2017 12:04:38 +0000 (12:04 +0000)]
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am:
b35719a057
am:
2f9fd9df23
Change-Id: Ied592bf6112574399a1e808da337004e1c35f244
Hugo Benichi [Wed, 16 Aug 2017 11:57:50 +0000 (11:57 +0000)]
Merge "More OWNERS file for core networking team"
am:
2827f21740
Change-Id: Icae3bc4dbb2cd094c728d98aea02d4009aaa0e0b
Hugo Benichi [Wed, 16 Aug 2017 11:50:55 +0000 (11:50 +0000)]
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
am:
b35719a057
Change-Id: I0ab76de59e87c46a6961229399ff7200bce49838
Treehugger Robot [Wed, 16 Aug 2017 11:37:11 +0000 (11:37 +0000)]
Merge "More OWNERS file for core networking team"
Treehugger Robot [Wed, 16 Aug 2017 11:34:24 +0000 (11:34 +0000)]
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
Hugo Benichi [Wed, 16 Aug 2017 06:43:14 +0000 (15:43 +0900)]
More OWNERS file for core networking team
Test: build
Change-Id: I7cef188e29f487025aee04ab0c1a003bb32a7048
Hugo Benichi [Wed, 16 Aug 2017 04:19:04 +0000 (13:19 +0900)]
Allow NetworkAgent "immutable updates" to NetworkCapabilities
This patch loosens the validation checks when a NetworkAgent updates it
NetworkCapabilities: instead of checking that capabilities labeled as
"immutable" stay identical across updates, it is now accepted to change
immutable capabilities in a way that the new NetworkCapabilities
satisfies the old NetworkCapabilities.
This allows a NetworkAgent to update itself in order to match more
requests, but will still catch NetworkAgents that sends degradation
updates causing potentially requests to not match anymore.
Bug:
64125969
Test: runtest frameworks-net
Change-Id: I2a1b3f9c0be6415e40edc989d0c1b03b5631f7b1
Felipe Leme [Tue, 15 Aug 2017 21:32:44 +0000 (21:32 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
am:
36cbdef880
Change-Id: I212780e8c7105aacaa15b292b36294166065219e
Charles He [Tue, 15 Aug 2017 21:15:55 +0000 (21:15 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf
am:
0fa9328b80
Change-Id: Ib96af1de1b8205fd5d62c188bf47bc789ff6930e
TreeHugger Robot [Tue, 15 Aug 2017 21:12:32 +0000 (21:12 +0000)]
Merge "Additional documentation about Autofill / WebView security." into oc-dev
Tony Mak [Tue, 15 Aug 2017 20:59:38 +0000 (20:59 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc
am:
0e1976292d -s ours
Change-Id: I05e3a2b19a2a9974f93a6d24ee3634fa357b3937
Android Build Merger (Role) [Tue, 15 Aug 2017 20:47:03 +0000 (20:47 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4 am:
159cd14334 am:
24587d57cf
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
Charles He [Tue, 15 Aug 2017 20:42:11 +0000 (20:42 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4
am:
159cd14334
Change-Id: Iaed779900e094a5951e24771ed1f1f55b0c1b014
Android Build Merger (Role) [Tue, 15 Aug 2017 20:35:00 +0000 (20:35 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12 am:
f3589fded1 -s ours am:
facc5e40fc
Change-Id: I4531fab8eab2291fcfd790d04a2661307f40dc60
Tony Mak [Tue, 15 Aug 2017 20:29:29 +0000 (20:29 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12
am:
f3589fded1 -s ours
Change-Id: I3b60e5cb94895fc155ba11d27ed81640eb8a2a05
TreeHugger Robot [Tue, 15 Aug 2017 19:30:53 +0000 (19:30 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
Brad Ebinger [Tue, 15 Aug 2017 18:12:12 +0000 (18:12 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason" am:
53e82a9cd0
am:
b943ccef3c
Change-Id: Ief4564d711014cd5c139eea3dd89e18af03bf2bd
Brad Ebinger [Tue, 15 Aug 2017 18:04:18 +0000 (18:04 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
am:
53e82a9cd0
Change-Id: I3bafca03e20ef114588145982985411882d2c8f5
Charles He [Tue, 15 Aug 2017 17:54:35 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4 am:
40317127f4
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
Charles He [Tue, 15 Aug 2017 17:54:05 +0000 (17:54 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49 am:
4acf4fabf4
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
Charles He [Tue, 15 Aug 2017 17:53:35 +0000 (17:53 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d am:
a3c1de7e49
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
Charles He [Tue, 15 Aug 2017 17:52:57 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f am:
6dfc8d8d4d
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
Charles He [Tue, 15 Aug 2017 17:52:27 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
Charles He [Tue, 15 Aug 2017 17:51:58 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
Charles He [Tue, 15 Aug 2017 17:51:28 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
Brad Ebinger [Tue, 15 Aug 2017 17:41:27 +0000 (17:41 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
Lorenzo Colitti [Tue, 15 Aug 2017 02:16:18 +0000 (02:16 +0000)]
Merge changes I82d3bee0,I9c9413d7 am:
deb4eb5d05
am:
51c3d6a8bf
Change-Id: Ie7e8806faecdad96b4033404709fb3aebc4bdd0f
Lorenzo Colitti [Tue, 15 Aug 2017 02:07:36 +0000 (02:07 +0000)]
Merge changes I82d3bee0,I9c9413d7
am:
deb4eb5d05
Change-Id: Iaa6aecf3ec3a91dc04f4533c0ea5b649bdfeb83d
Lorenzo Colitti [Tue, 15 Aug 2017 01:57:28 +0000 (01:57 +0000)]
Merge changes I82d3bee0,I9c9413d7
* changes:
Pass data usage limits to tethering offload code.
Don't time out when fetching tether offload stats.
nharold [Tue, 15 Aug 2017 01:37:21 +0000 (01:37 +0000)]
Merge "Cleanup ServiceState.toString()" am:
ee6e43c033
am:
5b30d7b819
Change-Id: I2edcce0e4e66dbb5840db7f2d3c6c0fa0855f09e
nharold [Tue, 15 Aug 2017 01:29:00 +0000 (01:29 +0000)]
Merge "Cleanup ServiceState.toString()"
am:
ee6e43c033
Change-Id: Ida4fc7c5cce8c763a5b8baf544d8244934e7c193
nharold [Tue, 15 Aug 2017 01:12:28 +0000 (01:12 +0000)]
Merge "Cleanup ServiceState.toString()"
Tyler Gunn [Tue, 15 Aug 2017 00:25:13 +0000 (00:25 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete." am:
58b77aa4aa
am:
c37cdd7c55
Change-Id: I425185aaa78608fd65615609acb90715a15a7c4a
huiwan [Tue, 15 Aug 2017 00:19:14 +0000 (00:19 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0" am:
4a41744919
am:
c970268397
Change-Id: I00e35784a1da7896f37dabe65e204724f8898677
Tyler Gunn [Tue, 15 Aug 2017 00:14:36 +0000 (00:14 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete."
am:
58b77aa4aa
Change-Id: I62e0700b9a94d3b17b2d32d16adb488519f6ff66
Tyler Gunn [Tue, 15 Aug 2017 00:13:21 +0000 (00:13 +0000)]
Merge "Add config option to enable/disable pause workaround." am:
9282d725f0 -s ours
am:
1a6b0a8ad3 -s ours
Change-Id: Ie1cd0988da85a241916cdd710cbcc5a06c647331
huiwan [Mon, 14 Aug 2017 23:59:13 +0000 (23:59 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0"
am:
4a41744919
Change-Id: I3b704d0f3e27bb26e00c60cd22145767d6c08335
Tyler Gunn [Mon, 14 Aug 2017 23:54:12 +0000 (23:54 +0000)]
Merge "Add config option to enable/disable pause workaround."
am:
9282d725f0 -s ours
Change-Id: I6e54ff11618e8a49cb20391f10f8f79adc61463d
ludi [Thu, 10 Aug 2017 22:44:40 +0000 (15:44 -0700)]
Add user quota information into the IpSecService dump
Bug:
64093788
Test: runtest frameworks-net
Change-Id: I6c5fc9e2db4ba57e0db4f6380a1251c4e444951b
Tyler Gunn [Mon, 14 Aug 2017 21:24:18 +0000 (21:24 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete."
Nathan Harold [Wed, 2 Aug 2017 17:51:47 +0000 (10:51 -0700)]
Cleanup ServiceState.toString()
Updating the formatting of the toString() method to
name the fields that it's printing, and to use one of
the more common formats for object dumping.
Bug:
64300932
Test: compilation, dumpsys
Change-Id: I56c4679d2a4a184f659870481e2ce0699fe38613
Treehugger Robot [Mon, 14 Aug 2017 19:57:26 +0000 (19:57 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0"
Tyler Gunn [Fri, 12 May 2017 17:04:49 +0000 (10:04 -0700)]
Add ConnectionService callback invoked when connection creation complete.
Adding a new @hide callback in ConnectionService which a CS implementation
can implement. A callback from Telecom is responsible for invoking this
method.
Test: Manual
Bug:
33272455
Change-Id: Id17cf0fd8fd491b7677f9b7a7b52c76270b1c8c9
Brad Ebinger [Fri, 30 Jun 2017 22:34:32 +0000 (15:34 -0700)]
Adds a new string definition for IMS Access blocked reason
When a call is disconnected with the Telephony DisconnectCause
IMS_ACCESS_BLOCKED, DisconnectCause#getReason will now return
the reason REASON_IMS_ACCESS_BLOCKED.
Bug:
33821263
Test: manual tests
Merged-In: Ic8b76e83aa8eb20074862f0e67734d2c5389ba12
Change-Id: Ic17cefa35a51f739c893923a2db7f3dca8ada202
Treehugger Robot [Mon, 14 Aug 2017 16:29:04 +0000 (16:29 +0000)]
Merge "Add config option to enable/disable pause workaround."
Felipe Leme [Tue, 1 Aug 2017 01:01:15 +0000 (18:01 -0700)]
Additional documentation about Autofill / WebView security.
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Fixes:
64114048
Fixes:
64337380
Fixes:
64125551
Change-Id: I375bb4712af875251fea4f3e572d92165643409a
Lorenzo Colitti [Fri, 11 Aug 2017 04:47:49 +0000 (13:47 +0900)]
Pass data usage limits to tethering offload code.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I82d3bee030bafa8fe85855885b5fc3893e699181
Lorenzo Colitti [Mon, 14 Aug 2017 04:07:42 +0000 (13:07 +0900)]
Don't time out when fetching tether offload stats.
Currently, fetching tethering offload stats has a 1000ms timeout,
after which we return stats of zero. However, returning zero is
invalid and will cause various parts of the network stats
accounting code to complain that statistics are moving backwards,
causing at least a log.wtf, and possibly a crash.
This CL removes the timeout entirely.
An alternative would have been to keep the timeout and return
null if the stats fetch failed. However, this complicates the
code, and if the HAL is persistently slow, could cause no stats
to be counted, ever. Given the impact of such behaviour on users'
data plans it is likely better to block until the stats are
collected.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I9c9413d757f44e87a51ea7ca82b657cc6aa0d4ba
Tyler Gunn [Mon, 15 May 2017 18:43:25 +0000 (11:43 -0700)]
Add config option to enable/disable pause workaround.
Test: Manual/unit
Bug:
35304446
Merged-In: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
Change-Id: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
Joachim Sauer [Mon, 14 Aug 2017 12:39:15 +0000 (12:39 +0000)]
Merge "API updated for ICU4J 59.1" am:
365178394d
am:
b418181e01
Change-Id: I6cf0840b5a8d1e32e0e872e44aa381f2c6ee15f8
Joachim Sauer [Mon, 14 Aug 2017 12:28:51 +0000 (12:28 +0000)]
Merge "API updated for ICU4J 59.1"
am:
365178394d
Change-Id: I74a98d63f9f170f6401a87c559fd0eccf06cb8f2
Joachim Sauer [Mon, 14 Aug 2017 12:19:39 +0000 (12:19 +0000)]
Merge "API updated for ICU4J 59.1"
huiwan [Tue, 1 Aug 2017 05:21:13 +0000 (13:21 +0800)]
PrintSpooler: fix monkey crash if height&width small than 0
During the monkey test, should add check height & width before
create the bitmap, to avoid the monkey test fail.
Change-Id: I5619c30af63afa3d74d0417e37c67c4920e099ba
Test: build & run
Steven Moreland [Fri, 11 Aug 2017 21:59:58 +0000 (21:59 +0000)]
Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master
am:
e59c1b1b50
Change-Id: Ic38b5d25594949241467f4271475e9f4503397b1
Steven Moreland [Fri, 11 Aug 2017 21:51:12 +0000 (21:51 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master
am:
e17aa09136
Change-Id: Ic9b83ef13c9063f70c1d8af6ab95085f17afa4be
Steven Moreland [Fri, 11 Aug 2017 21:41:00 +0000 (21:41 +0000)]
Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master
Steven Moreland [Fri, 11 Aug 2017 21:38:39 +0000 (21:38 +0000)]
Revert "aapt2_jni: use proper nativehelper headers"
This reverts commit
8eebd694e59fb01c13267c509ea98179f149e69b.
Reason for revert: TH skipped PS run
Change-Id: Iab0e71d985819880146476ba3648e8b94201a839
TreeHugger Robot [Fri, 11 Aug 2017 21:35:31 +0000 (21:35 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master
Steven Moreland [Fri, 11 Aug 2017 21:24:02 +0000 (21:24 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594
am:
e04a0bf5c7
Change-Id: I3e4e01a5e328ede527ee49d36ac828205994639d
Tony Mak [Fri, 11 Aug 2017 21:13:21 +0000 (21:13 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc am:
2eb85eca12
Change-Id: I3d7846f3b82dd429c69cff700e3d2794039b73db
Tony Mak [Fri, 11 Aug 2017 21:12:38 +0000 (21:12 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc am:
79ada733cc
Change-Id: Iea1acc1d757871aaaa58fb27f547fd6261b73585
Tony Mak [Fri, 11 Aug 2017 21:11:51 +0000 (21:11 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a am:
30d3df57dc
Change-Id: I4ab24abc5c58022d92eb399750c8c8ef07995c5b
Tony Mak [Fri, 11 Aug 2017 21:10:58 +0000 (21:10 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af am:
569af6584a
Change-Id: Ic65e9bb19e46a8d16406a3d02e5b60f375338334
Tony Mak [Fri, 11 Aug 2017 21:09:58 +0000 (21:09 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af
Change-Id: I877b0cba326b85e894d52f24a694a1ef666cdb1c
OSDN Git Service
