OSDN Git Service
Amith Yamasani [Tue, 14 Feb 2017 01:09:39 +0000 (01:09 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5 am:
c510e19d18
am:
ee37330dff
Change-Id: I9f75a9309a91de3a6145861189534c8ab10ca6f3
Amith Yamasani [Tue, 14 Feb 2017 01:02:53 +0000 (01:02 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am:
7556690cf5
am:
c510e19d18
Change-Id: I367d15ea4ab849ee16e58d08793dc7971304740f
Android Build Merger (Role) [Tue, 14 Feb 2017 01:01:10 +0000 (01:01 +0000)]
Merge "Merge "Only modify window layout params when necessary." into cw-f-dev am:
9fbd981f23 am:
d56887f8fa" into nyc-mr2-dev-plus-aosp
Michael Kwan [Tue, 14 Feb 2017 01:00:27 +0000 (01:00 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev am:
9fbd981f23
am:
d56887f8fa
Change-Id: I6e3695c245ed6afb208c0bd422b0ed2ac840281f
Michael Kwan [Tue, 14 Feb 2017 01:00:23 +0000 (01:00 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev am:
9fbd981f23
am:
a26e371c9b
Change-Id: I72bf9b5fa5dfaaa7573115ed5b6cca23a0be05f4
Amith Yamasani [Tue, 14 Feb 2017 00:57:56 +0000 (00:57 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
am:
7556690cf5
Change-Id: Ib0446301e56751f6a72403155c576516cd7e559c
Michael Kwan [Tue, 14 Feb 2017 00:55:32 +0000 (00:55 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
am:
9fbd981f23
Change-Id: I36aa427a3023dcba2a29eccfc0b7aac43748e534
Michael Kwan [Tue, 14 Feb 2017 00:55:29 +0000 (00:55 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
am:
9fbd981f23
Change-Id: I14316841b80bdb25755e174528ef4bb271d3e005
TreeHugger Robot [Tue, 14 Feb 2017 00:49:41 +0000 (00:49 +0000)]
Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 14 Feb 2017 00:48:16 +0000 (00:48 +0000)]
Merge "DO NOT MERGE - Check exported status in chooser am:
7bae18232e am:
45fa749c5a" into nyc-mr2-dev-plus-aosp
Michael Kwan [Tue, 14 Feb 2017 00:48:10 +0000 (00:48 +0000)]
Merge "Only modify window layout params when necessary." into cw-f-dev
Hakan Seyalioglu [Tue, 14 Feb 2017 00:47:27 +0000 (00:47 +0000)]
DO NOT MERGE - Check exported status in chooser am:
7bae18232e
am:
45fa749c5a
Change-Id: Ie308e49d410863c643c13256076a3ed83c934adc
Hakan Seyalioglu [Tue, 14 Feb 2017 00:47:25 +0000 (00:47 +0000)]
DO NOT MERGE - Check exported status in chooser am:
7bae18232e
am:
aeb1f1241e
Change-Id: Ibdc23df2da0b8ea387f54169224e467a37466cff
Hakan Seyalioglu [Tue, 14 Feb 2017 00:41:55 +0000 (00:41 +0000)]
DO NOT MERGE - Check exported status in chooser
am:
7bae18232e
Change-Id: Id29e65bd455c704738618f1dacfcad53b8d0b773
Hakan Seyalioglu [Tue, 14 Feb 2017 00:41:51 +0000 (00:41 +0000)]
DO NOT MERGE - Check exported status in chooser
am:
7bae18232e
Change-Id: Ieda18baab005a6a85b5107dfab37d20dec990110
Hakan Seyalioglu [Mon, 30 Jan 2017 19:14:48 +0000 (11:14 -0800)]
DO NOT MERGE - Check exported status in chooser
Relevant change in master is ag/
1844170
bug:
34147053
Change-Id: Ic9d9d65c66325904c95ab3966bdcc16e7668278b
(cherry picked from commit
e3286c3145d54564e783333ac2a2bb89b9ffdc49)
Amith Yamasani [Mon, 13 Feb 2017 21:59:14 +0000 (21:59 +0000)]
DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."
Reason: Breaking setting the user avatar in Settings.
Bug:
35158271
This reverts commit
b61338ecb307a2f595a8f78e290b5287a6503aaa.
Change-Id: Ia08c12be3da06b0d02e71635b46350c8ff50ec19
Michael Kwan [Sat, 11 Feb 2017 02:38:34 +0000 (18:38 -0800)]
Only modify window layout params when necessary.
Cancelling swipe-to-dismiss will trigger a check to ensure the window
is reset to its original state. Ensure that the reset is actually
required before setting the new layout attributes.
Bug:
34816397
Change-Id: Idf26ce7c8b63dc44a76effefcb32eb8d8665f605
Bryan Mawhinney [Mon, 13 Feb 2017 20:54:11 +0000 (20:54 +0000)]
Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev
am:
5de3e5ab36
Change-Id: Icb15885a9ffb763dac1acf4db4685b3c8dcb5ac5
TreeHugger Robot [Mon, 13 Feb 2017 20:49:50 +0000 (20:49 +0000)]
Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev
Peter Qiu [Mon, 13 Feb 2017 20:12:20 +0000 (20:12 +0000)]
Merge "hotspot2: fix typo in the getter functions" am:
d3146f3c3c am:
5644c190a0
am:
1b510ecff7
Change-Id: I56f99259149adb6a5e2fda7e2bbf8093a528a675
Bryan Mawhinney [Mon, 13 Feb 2017 20:09:34 +0000 (20:09 +0000)]
Merge "Workaround wallpaper restore race" into nyc-mr2-dev
am:
29e3920c4e
Change-Id: Ida5a953e75c326a1b5f555c820d807e7cb91b797
Peter Qiu [Mon, 13 Feb 2017 20:07:16 +0000 (20:07 +0000)]
Merge "hotspot2: fix typo in the getter functions" am:
d3146f3c3c
am:
5644c190a0
Change-Id: Idac3a70dc9c8a10e82076014078d7b5af3acac72
TreeHugger Robot [Mon, 13 Feb 2017 20:04:08 +0000 (20:04 +0000)]
Merge "Workaround wallpaper restore race" into nyc-mr2-dev
Peter Qiu [Mon, 13 Feb 2017 20:02:06 +0000 (20:02 +0000)]
Merge "hotspot2: fix typo in the getter functions"
am:
d3146f3c3c
Change-Id: I8fc4042c26f896d899c090dd7afbe16a44d431eb
Treehugger Robot [Mon, 13 Feb 2017 19:49:50 +0000 (19:49 +0000)]
Merge "hotspot2: fix typo in the getter functions"
Android Build Merger (Role) [Mon, 13 Feb 2017 19:39:27 +0000 (19:39 +0000)]
Merge "Add tweaks to smooth out swipe to dismiss. am:
5758a9a94c am:
ddc6e0b7ae" into nyc-mr2-dev-plus-aosp
Michael Kwan [Mon, 13 Feb 2017 19:38:34 +0000 (19:38 +0000)]
Add tweaks to smooth out swipe to dismiss. am:
5758a9a94c
am:
ddc6e0b7ae
Change-Id: I5423d0aae6666e0b6d3b51e986e969cf108c332c
Michael Kwan [Mon, 13 Feb 2017 19:38:32 +0000 (19:38 +0000)]
Add tweaks to smooth out swipe to dismiss. am:
5758a9a94c
am:
2155f773db
Change-Id: Iab07b13f24b7ca32b6bbb6faf788a71fccb969ec
Michael Kwan [Mon, 13 Feb 2017 19:32:35 +0000 (19:32 +0000)]
Add tweaks to smooth out swipe to dismiss.
am:
5758a9a94c
Change-Id: I64b9e88a7efb164b0e0160f8b25f770fb986efd6
Michael Kwan [Mon, 13 Feb 2017 19:32:29 +0000 (19:32 +0000)]
Add tweaks to smooth out swipe to dismiss.
am:
5758a9a94c
Change-Id: Id10a31504aa5a579e8670e7a23d2d99a990ed6e5
Bryan Mawhinney [Tue, 7 Feb 2017 15:18:07 +0000 (15:18 +0000)]
Workaround wallpaper restore race
If WallpaperManager is asked to read a wallpaper between when we
call mWm.clear and mWm.setStream, it is possible for us to end
up losing restored state such as cropHint and allowBackup
By not calling mWm.clear, we make this much less likely to happen.
It isn't necessary to call clear, as will explicitly overwrite
all the interesting state anyway.
Test: by repeated adb restore
Bug:
34760753
Change-Id: I2750695d5dd16077b47b5b8fca3a667b98cc4f6c
(cherry picked from commit
5c14853296172fe9885eee26d86351bd935e8430)
Bryan Mawhinney [Tue, 7 Feb 2017 15:27:19 +0000 (15:27 +0000)]
Fix live wallpaper not showing on lock screen after restore
A recent change in nyc-mr2 means that setWallpaperComponent will
promote any static system wallpaper to the lock screen. If we don't
actually have a static lock wallpaper to restore, we need to explicitly
clear the lock wallpaper to have the live one show through
Test: manually using adb backup / restore
Bug:
35090402
Change-Id: I8a2c5ffbaefe172c9d78a9f746ab87d9bc6b7448
(cherry picked from commit
96eb5b724bab31125e15eef2c926f6648567c3a1)
Bill Yi [Mon, 13 Feb 2017 17:56:48 +0000 (17:56 +0000)]
Import translations. DO NOT MERGE
am:
c342666ac8 -s ours
Change-Id: I039290ce49b857b35f9c83177a32e0195c267d36
Bill Yi [Mon, 13 Feb 2017 14:10:54 +0000 (06:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3355bb35c1500306ddaf5102f82beb010b67c208
Auto-generated-cl: translation import
Erik Kline [Mon, 13 Feb 2017 12:08:11 +0000 (12:08 +0000)]
Merge "Add test coverage for cleanup bug to be fixed." am:
89e6bf0532 am:
0cca15ff88
am:
3de5971b40
Change-Id: I470c481a0eebc9cadf134c73ece08803927f4ca2
Erik Kline [Mon, 13 Feb 2017 12:02:48 +0000 (12:02 +0000)]
Merge "Add test coverage for cleanup bug to be fixed." am:
89e6bf0532
am:
0cca15ff88
Change-Id: Ib5d1a6d6616b99a9e4f7cf0286ebc0a11d62bff8
Erik Kline [Mon, 13 Feb 2017 11:57:37 +0000 (11:57 +0000)]
Merge "Add test coverage for cleanup bug to be fixed."
am:
89e6bf0532
Change-Id: I33347c8fc2bec5660b8e9c14a316f6d14a6cf8b1
Treehugger Robot [Mon, 13 Feb 2017 11:51:20 +0000 (11:51 +0000)]
Merge "Add test coverage for cleanup bug to be fixed."
Erik Kline [Mon, 13 Feb 2017 08:12:02 +0000 (17:12 +0900)]
Add test coverage for cleanup bug to be fixed.
The test calls that need to pass but do not currently are commented out.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug:
32031803
Bug:
32163131
Change-Id: I68ed476920bef882f353d8e8a54c72120bc27002
Michael Kwan [Sun, 12 Feb 2017 21:43:45 +0000 (13:43 -0800)]
Add tweaks to smooth out swipe to dismiss.
Bug:
34673753
Change-Id: I5a9d420c70d124fc764803d505291e66818b1aa2
(cherry picked from commit
2e11adaac3ec959044e8154c67b6ab9cde82fdab)
Android Build Merger (Role) [Sun, 12 Feb 2017 10:31:41 +0000 (10:31 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763 am:
62314d7dd3 am:
41c9029be0" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Sun, 12 Feb 2017 10:30:58 +0000 (10:30 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763 am:
62314d7dd3
am:
41c9029be0
Change-Id: I491c4ae2b64e2a15a626bc20a8e2083e0bb6a91d
Jeff Sharkey [Sun, 12 Feb 2017 10:30:50 +0000 (10:30 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763 am:
62314d7dd3
am:
8100f549bf
Change-Id: Icb69b7af8a1e7c9c2fb8c2ea47e41932006128d8
Jeff Sharkey [Sun, 12 Feb 2017 10:26:57 +0000 (10:26 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763
am:
62314d7dd3
Change-Id: Iba461adcfafc41128bc4cd33f934830c7a92ae65
Jeff Sharkey [Sun, 12 Feb 2017 10:26:51 +0000 (10:26 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc am:
55ef8ba763
am:
62314d7dd3
Change-Id: I1eca65886210f095a29125506422a846ae6567f9
Jeff Sharkey [Sun, 12 Feb 2017 10:22:43 +0000 (10:22 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a am:
ab296986fc
am:
55ef8ba763
Change-Id: Ie2f9e943501b62177b23b701a9eea219a1dc696f
Android Build Merger (Role) [Sun, 12 Feb 2017 10:21:33 +0000 (10:21 +0000)]
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b am:
86f242b071 am:
d491410316" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Sun, 12 Feb 2017 10:20:52 +0000 (10:20 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b am:
86f242b071
am:
d491410316
Change-Id: If549125c9057964da34ab178af08e926962dd1d5
Jeff Sharkey [Sun, 12 Feb 2017 10:20:41 +0000 (10:20 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b am:
86f242b071
am:
5b49be4488
Change-Id: I576f71a635e1d1da44506b4e10ea7d915f5e7ba5
Jeff Sharkey [Sun, 12 Feb 2017 10:18:15 +0000 (10:18 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours am:
9aca89293a
am:
ab296986fc
Change-Id: Idd20eb270f3824840900b60a0b507b3c135ddc9e
Jeff Sharkey [Sun, 12 Feb 2017 10:16:12 +0000 (10:16 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b
am:
86f242b071
Change-Id: Iec17b7e2b1dcc972951e71d3c0d9e12d03440e88
Jeff Sharkey [Sun, 12 Feb 2017 10:16:12 +0000 (10:16 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4 am:
c7b754f62b
am:
86f242b071
Change-Id: Iaf37416af9d8d3e31b1825719f2f0cc8e860a603
Jeff Sharkey [Sun, 12 Feb 2017 10:14:09 +0000 (10:14 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4 am:
208dcadb4f -s ours
am:
9aca89293a
Change-Id: Ifc71c14cbdfe8e93cb6bca789daa17117b8f214f
Jeff Sharkey [Sun, 12 Feb 2017 10:12:11 +0000 (10:12 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359 am:
853e178de4
am:
c7b754f62b
Change-Id: Icc3179df0206649ca412eb3cb4a8b5a4691718fb
Jeff Sharkey [Sun, 12 Feb 2017 10:10:13 +0000 (10:10 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4
am:
208dcadb4f -s ours
Change-Id: If13e06378379077bbf25e6accc35951c26703a9c
Jeff Sharkey [Sun, 12 Feb 2017 10:08:11 +0000 (10:08 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours am:
deea677359
am:
853e178de4
Change-Id: I7adf093b7b09d6cc69e13f17865f754ccf327200
Jeff Sharkey [Sun, 12 Feb 2017 10:06:34 +0000 (10:06 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0
am:
9335807fc4
Change-Id: I66766f7b8feccdf1855b3819ca30cec5b480ef07
Jeff Sharkey [Sun, 12 Feb 2017 10:04:10 +0000 (10:04 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1 am:
502ee22a9d -s ours
am:
deea677359
Change-Id: I579175736bf9c3839492e67d08b8ce765c85c121
Jeff Sharkey [Sun, 12 Feb 2017 10:02:08 +0000 (10:02 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a
am:
00f5232dd0
Change-Id: I535ba4091bcb29fc25fc640f938a483b829e15c2
Jeff Sharkey [Sun, 12 Feb 2017 10:00:37 +0000 (10:00 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1
am:
502ee22a9d -s ours
Change-Id: Ibb1a72ca35121ba586f18852445941b0a0c15724
Jeff Sharkey [Sun, 12 Feb 2017 09:58:13 +0000 (09:58 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours
am:
48f1ddc94a
Change-Id: I1785a0a301e2847946276be682f62ee263b39a3f
Jeff Sharkey [Sun, 12 Feb 2017 09:56:10 +0000 (09:56 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c
am:
75f767afa1
Change-Id: I1393b6bcfa074bef42b7491204df55e39471e689
Jeff Sharkey [Sun, 12 Feb 2017 09:53:38 +0000 (09:53 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9
am:
a0b1198e70 -s ours
Change-Id: Ieefebd7669b892cba9afade572e3f43d56095902
Jeff Sharkey [Sun, 12 Feb 2017 09:51:37 +0000 (09:51 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9
am:
32c71b078c
Change-Id: I1af83dbf9869bd93ecc5c07e1ce6155206f73290
Jeff Sharkey [Sun, 12 Feb 2017 09:48:46 +0000 (09:48 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
6f754e48e9
Change-Id: I2f6dd5ba1e266b3d451533e518ec7f2fe24b262c
Jeff Sharkey [Sun, 12 Feb 2017 09:47:33 +0000 (09:47 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
3f3da42ef9
Change-Id: I222c32931827d906db5fc1e3258f2095e6013481
Paul Stewart [Sat, 11 Feb 2017 02:52:44 +0000 (02:52 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP" am:
e690e0178c am:
549c3fc0da
am:
bdfb1b86d3
Change-Id: I083778d8867e79b1a2c04166811508a6642a9c68
Paul Stewart [Sat, 11 Feb 2017 02:48:31 +0000 (02:48 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP" am:
e690e0178c
am:
549c3fc0da
Change-Id: I35592cd0e25bf459505c0a2008b7fe1f3be6298c
Paul Stewart [Sat, 11 Feb 2017 02:43:38 +0000 (02:43 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP"
am:
e690e0178c
Change-Id: I3f61bdd86c97210acd14b6d2d30e44e26c8b1085
Treehugger Robot [Sat, 11 Feb 2017 02:34:50 +0000 (02:34 +0000)]
Merge "Allow EAP-SIM authentication methods under PEAP"
Mark Goldstein [Sat, 11 Feb 2017 01:41:37 +0000 (01:41 +0000)]
Update the exception description for start(). am:
ac06177a13 am:
8b137cc06b
am:
539e1bab4d
Change-Id: I1274412a79c59da1a76f0b54f8633d9a2ec02d34
Mark Goldstein [Sat, 11 Feb 2017 01:38:34 +0000 (01:38 +0000)]
Update the exception description for start(). am:
ac06177a13 am:
8b137cc06b
am:
fd88989486
Change-Id: I9fef1f2ba9ca5db9b46ea67e2507a682b249c595
Mark Goldstein [Sat, 11 Feb 2017 01:34:35 +0000 (01:34 +0000)]
Update the exception description for start(). am:
ac06177a13
am:
8b137cc06b
Change-Id: Id448ab164e1fd0d3f5977c30c5395bcb6e87f90f
Mark Goldstein [Sat, 11 Feb 2017 01:34:30 +0000 (01:34 +0000)]
Update the exception description for start(). am:
ac06177a13
am:
8b137cc06b
Change-Id: I4fcbc9b93ce8e908810d6c8eb4f0dd06c471ed3a
Mark Goldstein [Sat, 11 Feb 2017 01:29:27 +0000 (01:29 +0000)]
Update the exception description for start().
am:
ac06177a13
Change-Id: I124d99971918daa7768d79daa01ecbbb86f60199
Jesse Hall [Fri, 10 Feb 2017 23:53:27 +0000 (15:53 -0800)]
resolve merge conflicts of
b3a1417663d6 to nyc-mr2-dev-plus-aosp
Test: mmma frameworks/base
Change-Id: I2e1e04f55d05fd8aa33da304bdb951713b37793c
Paul Stewart [Wed, 25 Jan 2017 22:12:14 +0000 (14:12 -0800)]
Allow EAP-SIM authentication methods under PEAP
Extend the PEAP outer method to contain EAP-SIM innner methods
so these transactions can be encrypted.
Cherry-pick of
68c63024c2ace87921c1e84a99d18dae6001c74c
Bug:
34835771
Test: Unit tests
Change-Id: I4931ed43e396c93bad0bfce1750291982f8cd146
Paul Lawrence [Fri, 10 Feb 2017 21:28:56 +0000 (21:28 +0000)]
Merge "Expand seccomp whitelist" am:
c6c11723cb am:
3b9c0fadda
am:
507c3fb099
Change-Id: Idcdec4c87b2ad5f91cbe05874ea532139fe38d42
Paul Lawrence [Fri, 10 Feb 2017 21:22:25 +0000 (21:22 +0000)]
Merge "Expand seccomp whitelist" am:
c6c11723cb
am:
3b9c0fadda
Change-Id: I50851e4d3c92d53562e593be0b82c09709262d4a
Mark Goldstein [Fri, 10 Feb 2017 17:54:08 +0000 (09:54 -0800)]
Update the exception description for start().
Bug:
31592353
Change-Id: Ic325a8004a87b71c0b43d02db58d4717b4b3831d
Paul Lawrence [Fri, 10 Feb 2017 21:17:14 +0000 (21:17 +0000)]
Merge "Expand seccomp whitelist"
am:
c6c11723cb
Change-Id: I73a7ede13a35354a08e1bc3301f624295373cd52
Treehugger Robot [Fri, 10 Feb 2017 21:08:05 +0000 (21:08 +0000)]
Merge "Expand seccomp whitelist"
Jesse Hall [Thu, 9 Feb 2017 22:43:14 +0000 (14:43 -0800)]
Zygote: Restore GL preload
Preloading GLES drivers in Zygote was removed previously since it is
incompatible with updatable drivers. That caused some app startup
latency and system memory use regressions. This change re-adds GLES
driver preloading, but only on devices that don't support driver
updates.
Bug:
34611670
Bug:
35052548
Test: boot angler, systrace of Calculator app startup
Change-Id: Ibdc6b3c0ba4473574722641d4bfad4b375f908a3
(cherry picked from commit
ba0370eef3d17baa70d43723e96eb135c8e4ed58)
Yifan Hong [Fri, 10 Feb 2017 18:53:07 +0000 (18:53 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF." am:
01f374c635 am:
71e77c865b
am:
2e943c5379
Change-Id: Ibbf18bc51e146abef1ab211614a98ec59031b1b9
Yifan Hong [Fri, 10 Feb 2017 18:48:14 +0000 (18:48 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF." am:
01f374c635
am:
71e77c865b
Change-Id: I37c99d5135046c6b0d2589f321cd8e4b235392e7
Alan Viverette [Fri, 10 Feb 2017 18:43:47 +0000 (18:43 +0000)]
Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev
am:
41023417e7
Change-Id: I4e42386e1f227e2cb48bf37eb05bcf7f81b6d709
Yifan Hong [Fri, 10 Feb 2017 18:43:37 +0000 (18:43 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF."
am:
01f374c635
Change-Id: I1db3c946211861e6edd7c03d9eaeae7a0cb412c4
Paul Lawrence [Fri, 10 Feb 2017 18:07:48 +0000 (10:07 -0800)]
Expand seccomp whitelist
Bug:
34763393
Test: cts test android.os.cts.SeccompTest now passes
Change-Id: I8907074485395015a03119700543ff33fdd8e214
TreeHugger Robot [Fri, 10 Feb 2017 18:35:32 +0000 (18:35 +0000)]
Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev
Yifan Hong [Fri, 10 Feb 2017 18:33:41 +0000 (18:33 +0000)]
Merge "android.os.HwBinder.getService() in Java respects VINTF."
Android Build Merger (Role) [Fri, 10 Feb 2017 12:33:37 +0000 (12:33 +0000)]
Merge "Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9 am:
f85a20702a am:
0f2c853889" into nyc-mr2-dev-plus-aosp
Rubin Xu [Fri, 10 Feb 2017 12:32:57 +0000 (12:32 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9 am:
f85a20702a
am:
0f2c853889
Change-Id: Icfdd2a6027c75e43c78f85109341ae088102548b
Rubin Xu [Fri, 10 Feb 2017 12:32:48 +0000 (12:32 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9 am:
f85a20702a
am:
060cde9802
Change-Id: Ic591b48e298823b46f8d1fc25b0e01a82cc263b5
Rubin Xu [Fri, 10 Feb 2017 12:28:56 +0000 (12:28 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9
am:
f85a20702a
Change-Id: I3861a5229fdb55f7dc7fd57e1706b34f9847d492
Rubin Xu [Fri, 10 Feb 2017 12:28:47 +0000 (12:28 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce am:
72074e3ab9
am:
f85a20702a
Change-Id: If9e569ba66dc9e5876fab5ffd2a6c9b0a9fb923b
Rubin Xu [Fri, 10 Feb 2017 12:24:43 +0000 (12:24 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293 am:
824c8284ce
am:
72074e3ab9
Change-Id: I1cd4db65e0fe8c92628f22f94fe937cf64f2da04
Rubin Xu [Fri, 10 Feb 2017 12:20:18 +0000 (12:20 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am:
42f2e80293
am:
824c8284ce
Change-Id: If4dfa2d7af980c91ec3d3f8faa7e7f4a39350c82
Rubin Xu [Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
am:
42f2e80293
Change-Id: Ic167e10a205b5c8f9df81cd20a6f08359d3807f4
TreeHugger Robot [Fri, 10 Feb 2017 12:10:58 +0000 (12:10 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
OSDN Git Service
