Commit Graph

506260 Commits

Author SHA1 Message Date
TreeHugger Robot
5bcc9f20b8 Merge "Remove IoUtils from service-permission system-server stubs" into rvc-dev am: 7b3cc67d34 am: 22634f95fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689588

Change-Id: I52f2e94e096ed3df08933fff3106f4911a6b96ec
2020-06-03 09:53:07 +00:00
TreeHugger Robot
f01f564e06 Merge "Remove IoUtils from service-permission system-server stubs" into rvc-dev am: 7b3cc67d34 am: 2bc18a3d4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689588

Change-Id: I785edba837592fd2010a65428b416c98a2280aa6
2020-06-03 09:52:47 +00:00
TreeHugger Robot
22634f95fd Merge "Remove IoUtils from service-permission system-server stubs" into rvc-dev am: 7b3cc67d34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689588

Change-Id: I8d998a48bbdd50182d1a816db7db0db0375ba3d6
2020-06-03 09:39:15 +00:00
TreeHugger Robot
2bc18a3d4d Merge "Remove IoUtils from service-permission system-server stubs" into rvc-dev am: 7b3cc67d34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689588

Change-Id: I42761fd2d120d22e5ce697f054bf38d86dfbe995
2020-06-03 09:39:09 +00:00
TreeHugger Robot
7b3cc67d34 Merge "Remove IoUtils from service-permission system-server stubs" into rvc-dev 2020-06-03 09:26:41 +00:00
TreeHugger Robot
339544e23c Merge "Don't reset permission granted by role." into rvc-dev am: f37bed75ef am: 22bfd75ad9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707946

Change-Id: I7ce58f09e268d5af6c0cac500c6a515e9957a08d
2020-06-03 08:08:58 +00:00
TreeHugger Robot
8805787398 Merge "Fix AppOps estimation call time out." into rvc-dev am: d26ded47a5 am: ac181beb3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11675077

Change-Id: Ideedb515423367102a4d8ff96105f9071b2db474
2020-06-03 08:08:37 +00:00
TreeHugger Robot
2b6615f1c5 Merge "Don't reset permission granted by role." into rvc-dev am: f37bed75ef am: e5124bc990
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707946

Change-Id: I225ae9498e26f785c4be9762f1de22102e5d7d3f
2020-06-03 08:08:30 +00:00
TreeHugger Robot
29b40f3ea1 Merge "Fix AppOps estimation call time out." into rvc-dev am: d26ded47a5 am: 9662b11ff9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11675077

Change-Id: Ic713a0cbc076b1131840a9f41dd12d7291464d2b
2020-06-03 08:08:13 +00:00
TreeHugger Robot
22bfd75ad9 Merge "Don't reset permission granted by role." into rvc-dev am: f37bed75ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707946

Change-Id: I36223769aaea85ea4d11cc10d3d16373becd5856
2020-06-03 08:00:04 +00:00
TreeHugger Robot
e5124bc990 Merge "Don't reset permission granted by role." into rvc-dev am: f37bed75ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707946

Change-Id: Ic133420707d0115ee32309303d4e3d7791155172
2020-06-03 07:59:59 +00:00
TreeHugger Robot
f37bed75ef Merge "Don't reset permission granted by role." into rvc-dev 2020-06-03 07:56:42 +00:00
TreeHugger Robot
ac181beb3a Merge "Fix AppOps estimation call time out." into rvc-dev am: d26ded47a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11675077

Change-Id: If23d088a27c811de0033e8a31199bcacddca8fbc
2020-06-03 07:54:48 +00:00
TreeHugger Robot
9662b11ff9 Merge "Fix AppOps estimation call time out." into rvc-dev am: d26ded47a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11675077

Change-Id: Icf054f1c686aaf28bc1d8c181da645e733b4135e
2020-06-03 07:54:48 +00:00
TreeHugger Robot
d26ded47a5 Merge "Fix AppOps estimation call time out." into rvc-dev 2020-06-03 07:38:25 +00:00
Martijn Coenen
f537d354c4 Drop supplementary groups for child zygotes. am: 7c8779c098 am: 80cfa98127 am: 75f35b0494 am: 89a122dbbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691614

Change-Id: I77a996085b1790b75bd51c28cfadba15ee2caabb
2020-06-03 07:14:44 +00:00
Automerger Merge Worker
f70968d058 Merge "Drop supplementary groups for child zygotes. am: 5a45262741 am: 694a2b95cf am: a36abd2fac" into rvc-d1-dev-plus-aosp 2020-06-03 07:14:35 +00:00
Martijn Coenen
e5289b2c0d Drop supplementary groups for child zygotes. am: 5a45262741 am: 694a2b95cf am: a36abd2fac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689582

Change-Id: I3ac7dbb9d3abf1e12c052de88e57d87db050314b
2020-06-03 07:14:24 +00:00
Martijn Coenen
a0f8e3b7fc Drop supplementary groups for child zygotes. am: 7c8779c098 am: 80cfa98127 am: 75f35b0494 am: 69db3557c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691614

Change-Id: I1b500f5594402797c6c34040832c747382066f88
2020-06-03 07:14:16 +00:00
Martijn Coenen
2f003e1bbf Drop supplementary groups for child zygotes. am: 5a45262741 am: 694a2b95cf am: abe8b3d911
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689582

Change-Id: I5bd4a5b66acd29bef49e3ec1bb2efbea8ab7fafb
2020-06-03 07:13:59 +00:00
Martijn Coenen
89a122dbbb Drop supplementary groups for child zygotes. am: 7c8779c098 am: 80cfa98127 am: 75f35b0494
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691614

Change-Id: I9f0085a74c53d6969ca3a47b5c53b1add547fb3b
2020-06-03 07:02:02 +00:00
Martijn Coenen
69db3557c0 Drop supplementary groups for child zygotes. am: 7c8779c098 am: 80cfa98127 am: 75f35b0494
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691614

Change-Id: I4ae67de65b8becf993a2670ebcf75cbe95d175f1
2020-06-03 07:01:51 +00:00
Martijn Coenen
a36abd2fac Drop supplementary groups for child zygotes. am: 5a45262741 am: 694a2b95cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689582

Change-Id: I6a77c8d1c0cd9649163429b965c366b6e7f0d7ce
2020-06-03 07:01:46 +00:00
Martijn Coenen
abe8b3d911 Drop supplementary groups for child zygotes. am: 5a45262741 am: 694a2b95cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689582

Change-Id: Id59f5bec2d65e2bcf888cd6c14bfb4bd9fbbaa23
2020-06-03 07:01:36 +00:00
Martijn Coenen
25a4aa7ffe Merge "Drop supplementary groups for child zygotes." into rvc-dev am: 1a0813171f am: 0a5d18b04b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691823

Change-Id: Ia944de99494e1db9980ae4f67a9ea19fefa39b1e
2020-06-03 06:50:18 +00:00
Automerger Merge Worker
5c4047db10 Merge "Merge "Drop supplementary groups for child zygotes." into rvc-dev am: 1a0813171f am: 81a1af6475" into rvc-d1-dev-plus-aosp 2020-06-03 06:49:46 +00:00
Junyu Lai
3e8b5e8f5c [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours am: 2acfeae2dd -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 f7a79879c7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700105

Change-Id: I232a78e6639af90c9eae0b75e88c64e2edc58915
2020-06-03 06:49:41 +00:00
Martijn Coenen
3cd32cb175 Merge "Drop supplementary groups for child zygotes." into rvc-dev am: 1a0813171f am: 81a1af6475
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691823

Change-Id: I5de6124d804f87f6778bab95f2973f38ab95ac3d
2020-06-03 06:49:39 +00:00
Junyu Lai
f129bd4719 [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 am: 1fea9a8c9a -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 f7a79879c7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700105

Change-Id: Idc5c9af45bccd7a87eb5c55f4d94345a48cda36d
2020-06-03 06:49:25 +00:00
Martijn Coenen
75f35b0494 Drop supplementary groups for child zygotes. am: 7c8779c098 am: 80cfa98127
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691614

Change-Id: Ic01f851d9364de782b22eba0389b3cddcde93f47
2020-06-03 06:48:49 +00:00
Martijn Coenen
80cfa98127 Drop supplementary groups for child zygotes. am: 7c8779c098
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691614

Change-Id: Ie89fe6cce029794db647a5c23aa6ec2eba252383
2020-06-03 06:48:36 +00:00
Martijn Coenen
694a2b95cf Drop supplementary groups for child zygotes. am: 5a45262741
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689582

Change-Id: I14fc06f8bd77e7cd50bf46f2c46165c91ba5261b
2020-06-03 06:48:31 +00:00
Martijn Coenen
0a5d18b04b Merge "Drop supplementary groups for child zygotes." into rvc-dev am: 1a0813171f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691823

Change-Id: I9e779bbf8bcf842d07665748355a1e3ea8022081
2020-06-03 06:37:31 +00:00
Martijn Coenen
81a1af6475 Merge "Drop supplementary groups for child zygotes." into rvc-dev am: 1a0813171f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11691823

Change-Id: Ica61807306c038ed0ba177ddcb67cd7b7d8ae404
2020-06-03 06:37:23 +00:00
Junyu Lai
1fea9a8c9a Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700105

Change-Id: Iaafbe392cbbfa220d6c02b3fa1eced2ac683b8fe
2020-06-03 06:37:03 +00:00
Junyu Lai
2acfeae2dd [automerger skipped] Merge "Disable log for per uid blocked status changed event" into rvc-dev am: cba8b949b3 -s ours
am skip reason: Change-Id I04d2b7402f892546722fe6868c521afd9534f183 with SHA-1 f7a79879c7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700105

Change-Id: Icfce11d306a9d47ecad5d17d3bfab3dbdf9e4693
2020-06-03 06:36:40 +00:00
Martijn Coenen
1a0813171f Merge "Drop supplementary groups for child zygotes." into rvc-dev 2020-06-03 06:32:36 +00:00
Junyu Lai
cba8b949b3 Merge "Disable log for per uid blocked status changed event" into rvc-dev 2020-06-03 06:18:01 +00:00
Maciej Żenczykowski
f06e6f2396 [automerger skipped] Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: 01dab1a0f5 am: afbf77813b -s ours am: 17a80f621c -s ours
am skip reason: Change-Id I76a75a16fa27b47d78816b2f9379ef4bb68beb00 with SHA-1 7ed764dcd2 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322377

Change-Id: I71201909585461cff1cfaa0ab0dc5e174b2230c8
2020-06-03 06:00:28 +00:00
Maciej Żenczykowski
17a80f621c [automerger skipped] Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: 01dab1a0f5 am: afbf77813b -s ours
am skip reason: Change-Id I76a75a16fa27b47d78816b2f9379ef4bb68beb00 with SHA-1 7ed764dcd2 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322377

Change-Id: Ieb50a0aa01cf69e0d393d901e040ff0cd6ca4bbd
2020-06-03 05:48:31 +00:00
Maciej Żenczykowski
afbf77813b Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." am: 01dab1a0f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322377

Change-Id: I5e28537689d1a53e99f91eafd494eb3a0c890f46
2020-06-03 05:32:55 +00:00
Maciej Żenczykowski
01dab1a0f5 Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." 2020-06-03 05:21:45 +00:00
Maciej Żenczykowski
1d81bdbd93 Stop reducing RA advertised ipv6 mtu by 16 - not needed.
This effectively reverts:

  commit 34d4361604
  Author: Maciej Żenczykowski <maze@google.com>
  Date:   Wed Feb 19 01:24:39 2020 -0800

      Reduce advertised ipv6 mtu by 16 to fit ethernet header

      This is a temporary hack to workaround the inability of current
      kernel's ebpf bpf_skb_change_mode() function to prefix a 14-byte
      ethernet header on to a packet without going over the upstream
      (source, rawip) interface's mtu *before* we bpf_redirect() to
      the downstream (destination, ethernet) interface.

      Test: build, atest, atest TetheringTests
      Bug: 149816401

Test: flashed a flame with new kernel and it works at 1500 mtu
Bug: 149816401
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I76a75a16fa27b47d78816b2f9379ef4bb68beb00
Merged-In: I76a75a16fa27b47d78816b2f9379ef4bb68beb00
2020-06-02 22:20:39 -07:00
Automerger Merge Worker
cdc45cc7ee Merge "Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 14756a8c99 am: 27f4966ffe" into rvc-d1-dev-plus-aosp 2020-06-03 04:37:26 +00:00
TreeHugger Robot
14fe80bda9 Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 14756a8c99 am: 27f4966ffe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914

Change-Id: Icaf4d01d69b6c06fc52e08c2164f49102ea042f1
2020-06-03 04:37:11 +00:00
TreeHugger Robot
b8db1e05ec Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 14756a8c99 am: 3810d84f97
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914

Change-Id: I260a3aaf2d2511a1943125083414c5a3ef1e689e
2020-06-03 04:37:09 +00:00
Automerger Merge Worker
8f90050180 Merge "Merge "Add occlusion logic to OverlayViewGlobalStateController and CarKeyguardViewController" into rvc-dev am: 8920f765c9 am: 36c1a6f6f5" into rvc-d1-dev-plus-aosp 2020-06-03 04:36:24 +00:00
TreeHugger Robot
aa35f232ff Merge "Add occlusion logic to OverlayViewGlobalStateController and CarKeyguardViewController" into rvc-dev am: 8920f765c9 am: 06186ca732
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635056

Change-Id: I7e0305c3bda3bac845e92bd6f536cc62f8e9ed97
2020-06-03 04:36:15 +00:00
TreeHugger Robot
ca0d70697a Merge "Add occlusion logic to OverlayViewGlobalStateController and CarKeyguardViewController" into rvc-dev am: 8920f765c9 am: 36c1a6f6f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11635056

Change-Id: Ibf2aabe60fb9b3a797f53ffb5bbb398d96101031
2020-06-03 04:36:03 +00:00
TreeHugger Robot
3810d84f97 Merge "Stop reducing RA advertised ipv6 mtu by 16 - not needed." into rvc-dev am: 14756a8c99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914

Change-Id: I36ff80bcb8e6d9f576c87084fc6feb79001bf594
2020-06-03 04:23:34 +00:00