Commit Graph

4684 Commits

Author SHA1 Message Date
Paul Scovanner
15edb71c4e [automerger skipped] [DO NOT MERGE] Update Wahoo SVN to 27 Bug:129374896 am: 9424dc7bc5 -s ours am: 065132bc15
am: cc01f863fd -s ours
am skip reason: subject contains skip directive

Change-Id: Ie12762a61c140451e5a6e3c376a5bd24cf7aca90
2019-04-12 17:17:23 -07:00
Benjamin Schwartz
ed89a275e8 Merge "power.stats: Only access debugfs for userdebug builds" into qt-dev am: 55fc5d01e7
am: 3a01ac5686

Change-Id: I5a42b7491dea289ea2c30a1b1c24d9e054df4ff5
2019-04-12 14:45:02 -07:00
Paul Scovanner
cc01f863fd [automerger skipped] [DO NOT MERGE] Update Wahoo SVN to 27 Bug:129374896 am: 9424dc7bc5 -s ours
am: 065132bc15

Change-Id: Ie6a49d3b578c7ef732c1e513cd0746dbaffb59b1
2019-04-12 14:44:30 -07:00
Paul Scovanner
065132bc15 [automerger skipped] [DO NOT MERGE] Update Wahoo SVN to 27 Bug:129374896
am: 9424dc7bc5 -s ours
am skip reason: subject contains skip directive

Change-Id: I1bf0535f3c43a39956fc46dbf79febdc91a0464e
2019-04-12 14:25:17 -07:00
Benjamin Schwartz
3a01ac5686 Merge "power.stats: Only access debugfs for userdebug builds" into qt-dev
am: 55fc5d01e7

Change-Id: If590efcb799fdc7e30508c3e9561d1dada01d648
2019-04-12 13:46:00 -07:00
TreeHugger Robot
55fc5d01e7 Merge "power.stats: Only access debugfs for userdebug builds" into qt-dev 2019-04-12 20:13:06 +00:00
Paul Scovanner
9424dc7bc5 [DO NOT MERGE] Update Wahoo SVN to 27
Bug:129374896
2019-04-12 19:01:08 +00:00
Benjamin Schwartz
2de0d664d1 power.stats: Only access debugfs for userdebug builds
Bug: 130202935
Test: adb shell lshal debug android.hardware.power.stats@1.0::IPowerStats/default
Change-Id: I1c633e450e74bc0b30a3aa50f6f421f1b6a1e7ad
2019-04-12 16:40:19 +00:00
Maciej enczykowski
98901f1036 [automerger skipped] Remove /sys/devices/virtual/net/... /sys/module/tcp_cubic/parameters/... am: 3388f977d5 am: 235d75ecfa -s ours
am: 141422c812 -s ours
am skip reason: change_id If5597cd9f3506d6ec35f13d675adceab76005157 with SHA1 53d7e92772 is in history

Change-Id: I3cf4004ea28b6408da7bec965bd2d2528e818f10
2019-04-12 05:31:22 -07:00
Maciej enczykowski
141422c812 [automerger skipped] Remove /sys/devices/virtual/net/... /sys/module/tcp_cubic/parameters/... am: 3388f977d5
am: 235d75ecfa -s ours
am skip reason: change_id If5597cd9f3506d6ec35f13d675adceab76005157 with SHA1 53d7e92772 is in history

Change-Id: Iadefa44b2641125e745c61a3b5d9219acac55cd2
2019-04-12 05:08:05 -07:00
Maciej enczykowski
235d75ecfa Remove /sys/devices/virtual/net/... /sys/module/tcp_cubic/parameters/...
am: 3388f977d5

Change-Id: I9c964880f91f19c852de7134cd90658f465c7bfa
2019-04-11 22:51:56 -07:00
Maciej Żenczykowski
3388f977d5 Remove /sys/devices/virtual/net/... /sys/module/tcp_cubic/parameters/...
This will now be provided by core policy.

Test: treehugger

Bug: 130318253
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If5597cd9f3506d6ec35f13d675adceab76005157
Merged-In: If5597cd9f3506d6ec35f13d675adceab76005157
(cherry picked from commit 53d7e92772)
2019-04-11 21:32:38 -07:00
Maciej enczykowski
f2a4bf2cb5 Remove /sys/devices/virtual/net/... /sys/module/tcp_cubic/parameters/... am: 53d7e92772
am: 94159322d5

Change-Id: I04f5973b394b8cc015909f8495895dfe08ad5483
2019-04-11 20:22:02 -07:00
Maciej enczykowski
94159322d5 Remove /sys/devices/virtual/net/... /sys/module/tcp_cubic/parameters/...
am: 53d7e92772

Change-Id: Ifd7a1f69d51699c5a25f992714e79947df18f206
2019-04-11 19:02:38 -07:00
Maciej Żenczykowski
53d7e92772 Remove /sys/devices/virtual/net/... /sys/module/tcp_cubic/parameters/...
This will now be provided by core policy.

Test: treehugger

Bug: 130318253
Change-Id: If5597cd9f3506d6ec35f13d675adceab76005157
Signed-off-by: Maciej Żenczykowski <maze@google.com>
2019-04-11 22:23:44 +00:00
Jack Yu
f82380c977 [automerger skipped] Fixed the incorrect system properties am: 844ec525b8 am: d8a3432884 -s ours
am: ac41591057 -s ours
am skip reason: change_id I9c844e76ef1e554dda9b2821f9ebf6e71ccaf39e with SHA1 0535120338 is in history

Change-Id: I8850398959875670fb8ba99845508247ad9f7359
2019-04-10 21:55:58 -07:00
Jack Yu
ac41591057 [automerger skipped] Fixed the incorrect system properties am: 844ec525b8
am: d8a3432884 -s ours
am skip reason: change_id I9c844e76ef1e554dda9b2821f9ebf6e71ccaf39e with SHA1 0535120338 is in history

Change-Id: I03a737df4843a53264bc74e182d063f8b71182a2
2019-04-10 20:44:39 -07:00
Jack Yu
d8a3432884 Fixed the incorrect system properties
am: 844ec525b8

Change-Id: I8e8648d196b376c6a87ad64eeeaff6834355c97a
2019-04-10 18:24:43 -07:00
Jack Yu
844ec525b8 Fixed the incorrect system properties
IWLAN operation mode is not an integer anymore. Removed
the system properties and only use the default mode (tied
to the IRadio version).

Test: Manual
Bug: 126218288

Merged-In: I9c844e76ef1e554dda9b2821f9ebf6e71ccaf39e
Change-Id: I9c844e76ef1e554dda9b2821f9ebf6e71ccaf39e
(cherry picked from commit 0535120338)
2019-04-10 14:18:43 -07:00
Xin Li
7b9de794ea [automerger skipped] DO NOT MERGE -- Merge PPRL.190405.003 into master am: 0eea8c456d -s ours am: 60aaef7d9f -s ours
am: d21f720c63 -s ours
am skip reason: subject contains skip directive

Change-Id: Ica142ba1bb921771f31c3b78e5ec3463f5314d55
2019-04-09 01:08:17 -07:00
Xin Li
75049c2a76 [automerger skipped] DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master am: aec4b0c0f7 -s ours
am: 43ec5024f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I1224a715c9d42b5d6f065638741def1c131fe2fa
2019-04-09 00:01:12 -07:00
Xin Li
d21f720c63 [automerger skipped] DO NOT MERGE -- Merge PPRL.190405.003 into master am: 0eea8c456d -s ours
am: 60aaef7d9f -s ours
am skip reason: subject contains skip directive

Change-Id: I2e5018eefd2d8f488e27b317d23ac31a730d08ad
2019-04-08 22:34:25 -07:00
Xin Li
43ec5024f0 [automerger skipped] DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master
am: aec4b0c0f7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie8ac3d9c6b702d91f64cbaa825981d9d96c3850e
2019-04-08 22:18:12 -07:00
Xin Li
60aaef7d9f [automerger skipped] DO NOT MERGE -- Merge PPRL.190405.003 into master
am: 0eea8c456d -s ours
am skip reason: subject contains skip directive

Change-Id: I316313f6f5933fd4cc901b1a3abcd59ff392fa5e
2019-04-08 22:13:26 -07:00
Jack Yu
4805d93865 Merge "Fixed the incorrect system properties" into qt-dev am: 47351c6338
am: 5f64948ea6

Change-Id: Ie52dff211076b4d5e3ad31696004c9e8fb1ec863
2019-04-08 21:57:27 -07:00
Bowgo Tsai
19cf0a9d49 Merge "Adding GSI keys" into qt-dev am: 24edb911ad
am: c6df319bb1

Change-Id: I7718549a34f9cc45db45ac843b62b213d22b7ba9
2019-04-08 21:13:32 -07:00
Jack Yu
5f64948ea6 Merge "Fixed the incorrect system properties" into qt-dev
am: 47351c6338

Change-Id: I5587ab53791e2a927121349bdecbb8cd73128d96
2019-04-08 21:07:10 -07:00
Bowgo Tsai
c6df319bb1 Merge "Adding GSI keys" into qt-dev
am: 24edb911ad

Change-Id: I662be9e9e2b90c1032eb2c33cf6023d858474efe
2019-04-08 20:53:20 -07:00
Jack Yu
47351c6338 Merge "Fixed the incorrect system properties" into qt-dev 2019-04-09 02:24:21 +00:00
Xin Li
0eea8c456d DO NOT MERGE -- Merge PPRL.190405.003 into master
Bug: 130175407
Change-Id: I3eb23986887d0b54d2209b1c13b8606e76fde957
2019-04-08 18:56:05 -07:00
TreeHugger Robot
24edb911ad Merge "Adding GSI keys" into qt-dev 2019-04-09 01:24:56 +00:00
Xin Li
aec4b0c0f7 DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master
Bug: 130175407
Change-Id: I283661bc1c9e4b6720bea0b2aeff81f6e3edbfd0
2019-04-08 15:04:32 -07:00
Jack Yu
0535120338 Fixed the incorrect system properties
IWLAN operation mode is not an integer anymore. Removed
the system properties and only use the default mode (tied
to the IRadio version).

Test: Manual
Bug: 126218288
Change-Id: I9c844e76ef1e554dda9b2821f9ebf6e71ccaf39e
2019-04-08 14:31:51 -07:00
android-build-team Robot
96e1d146f9 Snap for 5310204 from 7c447d9c4b to pi-platform-release
Change-Id: Ib141ecfcdbac30455403a4f00f3da05e33c96c17
2019-04-08 18:10:08 +00:00
Pawin Vongmasa
4469062b80 Merge "Remove media.c2 from framework_manifest.xml" into qt-dev am: 5b34674c72
am: 6797debb3e

Change-Id: I309e3d3a87e9fcbd0eec2e29cbe04aecb3c51167
2019-04-08 08:16:08 -07:00
Pawin Vongmasa
6797debb3e Merge "Remove media.c2 from framework_manifest.xml" into qt-dev
am: 5b34674c72

Change-Id: I9325ae801a38df6870424cab93cd7af8f035f725
2019-04-08 08:05:17 -07:00
TreeHugger Robot
5b34674c72 Merge "Remove media.c2 from framework_manifest.xml" into qt-dev 2019-04-08 14:48:17 +00:00
Bowgo Tsai
421986004d Adding GSI keys
Bug:112293933
Test: tree hugger
Change-Id: I112ece91566e6cea066cd637bfed5cae6761ae66
2019-04-08 18:28:48 +08:00
Wei Wang
629fd3c2aa Make EXPENSIVE RENDERING hint a nop am: acfed5f177
am: af080ed55f

Change-Id: Ib31eff2b749470726680eaca944b795e8859b0fe
2019-04-05 16:55:47 -07:00
Wei Wang
af080ed55f Make EXPENSIVE RENDERING hint a nop
am: acfed5f177

Change-Id: Ib9bfaae06c8e73edeb5e2b57a1007a4864df42ab
2019-04-05 13:07:54 -07:00
Wei Wang
acfed5f177 Make EXPENSIVE RENDERING hint a nop
Bug: 129495482
Test: Build
Change-Id: I9b0ded7271874be8363dfb7d4b5d89baee2c7790
2019-04-05 09:17:41 -07:00
Pawin Vongmasa
f20d636979 Remove media.c2 from framework_manifest.xml
The entry for media.c2 in framework_manifest.xml is no longer needed as
it is included as vintf_fragments in mediaswcodec.

Test: adb shell stagefright -i | grep -E "c2.*android"

Bug: 129999541
Change-Id: I79c62bf510af4302485644d44e0f4a80221eaccd
2019-04-05 02:05:46 -07:00
Bill Rassieur
4e148f3717 Merge master@5433138 into git_qt-dev-plus-aosp.
am: 340fe66ee2

Change-Id: I6e57aba40e0f7a5954fb40918fb19c56688c4cd4
2019-04-03 19:43:53 -07:00
Bill Rassieur
0560411ae2 Merge master@5428150 into git_qt-dev. am: acf81291d0
am: 9599e5f163

Change-Id: Ib6c8c41c676265993446bd7886f014ee84c3e64a
2019-04-03 17:16:20 -07:00
Bill Rassieur
7a3292ac1c Merge master@5428150 into git_qt-dev-plus-aosp.
am: cbed2d59fd

Change-Id: I45342df52015130682659f49a0a5586ba1c44bfa
2019-04-03 16:06:30 -07:00
Bill Rassieur
340fe66ee2 Merge master@5433138 into git_qt-dev-plus-aosp.
Change-Id: I998c6ae929741671c62e91431ef475ebfac4d8dd
BUG: 129345239
2019-04-03 21:56:36 +00:00
Wei Wang
4dd9895619 Move PowerHAL into Pixel common
Bug: 129495482
Test: Build
Change-Id: I5eb2e75092cba8a3dd6e108e26bb3baae0a907d3
2019-04-04 01:31:02 +08:00
Bill Rassieur
9599e5f163 Merge master@5428150 into git_qt-dev.
am: acf81291d0

Change-Id: I23ca33755b43b24090aba47e4ba5924397152b09
2019-04-03 08:27:33 -07:00
Bill Rassieur
cbed2d59fd Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: I842076366100736174442712f58d072f2111ca84
BUG: 129345239
2019-04-02 18:25:52 +00:00
Bill Rassieur
acf81291d0 Merge master@5428150 into git_qt-dev.
Change-Id: Ib9bf394fe7bb5f324401487387e04b043dfd9d4a
BUG: 129345239
2019-04-02 16:48:29 +00:00