Paul Hu
aebabf1f10
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742 am: b6958b47d9 am: 2ad5f4e82f am: 08a2695981
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: Ib65efbacaeae1c99c0d00c2bcf9f222bf9a32628
2020-06-29 12:55:53 +00:00
Paul Hu
08a2695981
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742 am: b6958b47d9 am: 2ad5f4e82f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: Ic957a19c9e6e82acf06072382c2c0e65629ff537
2020-06-29 12:41:49 +00:00
Paul Hu
2ad5f4e82f
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742 am: b6958b47d9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: Ia843da82bc8fa03aca33a51fc309b65e73dfdc8f
2020-06-29 12:31:12 +00:00
Paul Hu
b6958b47d9
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: I67e2d4facd77f978255a10423a9baff231ac0695
2020-06-29 12:17:07 +00:00
Paul Hu
7a87bc4742
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: I2d1886c4bc2892d3673e87544e3e9c2bb0bb8633
2020-06-29 12:04:06 +00:00
Paul Hu
6b2b4e6514
Merge "Correct PendingIntent#getActivity() flags"
2020-06-29 11:53:18 +00:00
Treehugger Robot
13b311feb9
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours am: a2d6b35eeb -s ours am: 175605dd27 -s ours am: 060d67dbf1 -s ours
...
am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea27274 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444
Change-Id: Ibf8a32647cda56751960107bca8ef55df2f9cefc
2020-06-29 05:05:28 +00:00
Treehugger Robot
060d67dbf1
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours am: a2d6b35eeb -s ours am: 175605dd27 -s ours
...
am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea27274 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444
Change-Id: I24a63f122e3d09a1162ca2ee81d872f0f70c52ee
2020-06-29 04:52:35 +00:00
Treehugger Robot
175605dd27
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours am: a2d6b35eeb -s ours
...
am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea27274 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444
Change-Id: I1e88786727ec4a32665bf4b36e66f39bd58c672b
2020-06-29 04:41:02 +00:00
Treehugger Robot
a2d6b35eeb
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours
...
am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea27274 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444
Change-Id: I86e4fca7fbec72a1cdbded8782afa22b211f2967
2020-06-29 04:29:37 +00:00
Treehugger Robot
9fba78c098
Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444
Change-Id: Ib2a16bd545b98a8d95338f6acce23e265ec5130a
2020-06-29 04:16:40 +00:00
Treehugger Robot
cdf6b4202c
Merge "Use unstable networkstack AIDLs in development branches"
2020-06-29 04:02:49 +00:00
paulhu
67aeab2eee
Correct PendingIntent#getActivity() flags
...
TetheringNotificationUpdater create a PendingIntent with
Intent#FLAG_ACTIVITY_NEW_TASK flag. But this flag is used for
Intent only. Thus, move this flag into Intent.
Bug: 158639789
Test: atest TetheringTests
Change-Id: I4c3af75c87b797bcde9356a94c835c7422dac1c6
2020-06-29 00:32:19 +08:00
Orion Hodson
e621259bc8
[automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours am: 6c0e9f46cd -s ours am: e5fdcd86a2 -s ours am: a2f94547f6 -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: If5b05d69ae6e2cf344e4dcdb74a97b3d3601044e
2020-06-25 09:05:48 +00:00
Orion Hodson
b808fdca2d
[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours am: 77156e6721 -s ours am: 6b0056827f -s ours am: 082e791855 -s ours
...
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: I55d166d8eec7aeb7dcb448708f538a861a1696c9
2020-06-25 09:05:40 +00:00
Orion Hodson
a2f94547f6
[automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours am: 6c0e9f46cd -s ours am: e5fdcd86a2 -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I3f024bdb06de2b019e136e9542c11b0067c604be
2020-06-25 08:50:30 +00:00
Orion Hodson
082e791855
[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours am: 77156e6721 -s ours am: 6b0056827f -s ours
...
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: I8408acbd79ce03b10eb2c0bf3bbafc19fd277520
2020-06-25 08:50:21 +00:00
Orion Hodson
e5fdcd86a2
[automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours am: 6c0e9f46cd -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I4b94400277e38db25c76e02f66e4f5f523358452
2020-06-25 08:32:19 +00:00
Orion Hodson
6b0056827f
[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours am: 77156e6721 -s ours
...
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: I812dfa946299dc565e915dcbabe43e1d74abeb1f
2020-06-25 08:32:12 +00:00
Orion Hodson
6c0e9f46cd
[automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I3bb4fbb8c5c7df3f43bb69e1228848540e1249f9
2020-06-25 08:13:32 +00:00
Orion Hodson
77156e6721
[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours
...
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: Ief614f159c1972c181986ae05b01b5dc2a92b1ee
2020-06-25 08:13:26 +00:00
Orion Hodson
9228c914d2
Merge changes from topic "lnh-platform-split" am: c6b2c39d04
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
2020-06-25 07:58:17 +00:00
Orion Hodson
1309dcd8de
Sync with libnativehelper refactoring am: 0cdccd707f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: I7511170930440ec5a1a8067b57a76a6c19484d71
2020-06-25 07:58:10 +00:00
Orion Hodson
c6b2c39d04
Merge changes from topic "lnh-platform-split"
...
* changes:
Update to use nativehelper/JNIPlatformHelp.h
Sync with libnativehelper refactoring
2020-06-25 07:36:05 +00:00
Orion Hodson
4e14da5c36
[automerger skipped] Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 1eff58da30 am: db4a0425f3 am: e47731e742 -s ours
...
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 a5c4682505 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985379
Change-Id: I014b4c1904efdb10ea908aba14f549be36f052d6
2020-06-24 21:40:54 +00:00
Orion Hodson
e47731e742
Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 1eff58da30 am: db4a0425f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985379
Change-Id: Ib08745da0730969220db6ed83fa98c02e029f6e4
2020-06-24 21:27:28 +00:00
Orion Hodson
db4a0425f3
Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 1eff58da30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985379
Change-Id: I2c4432fd6aebf2706b2a927842d9fb21b09dd166
2020-06-24 21:23:34 +00:00
Orion Hodson
1eff58da30
Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp
2020-06-24 21:02:39 +00:00
Luke Huang
6be3a20d97
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours am: 04e5539162 -s ours am: 8fc588f87b -s ours am: aed33f73a1 -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I0d78e520bcb1854cd3cd0df8073fe03d600d4f26
2020-06-24 19:29:38 +00:00
Luke Huang
aed33f73a1
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours am: 04e5539162 -s ours am: 8fc588f87b -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: Ib23a055c8ad62aa84f8bd0668ffd94c7b9cfe6f7
2020-06-24 19:13:08 +00:00
Luke Huang
8fc588f87b
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours am: 04e5539162 -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I5af3e4f7a38fa4374a568dc99925b76fc0f033a6
2020-06-24 19:12:16 +00:00
Luke Huang
04e5539162
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I4bddd1c6f072845f1a62812995a3b4cb4299ccaa
2020-06-24 19:11:24 +00:00
Orion Hodson
0cdccd707f
Sync with libnativehelper refactoring
...
jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.
Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c4682505 )
2020-06-24 14:13:13 +01:00
Orion Hodson
697ec868d2
Sync with libnativehelper refactoring
...
jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.
Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c4682505 )
2020-06-24 12:47:10 +00:00
Luke Huang
895594dcc2
Move DnsPacket to libs net
...
This class might be used by some mainline modules.
Bug: 151052811
Test: atest DnsPacketTest
Test: atest DnsResolverTest
(clean cherry-pick from internal branch)
Merged-In: I8841d91456952ded5efbf8ea221289aecc7746ad
Change-Id: I8841d91456952ded5efbf8ea221289aecc7746ad
2020-06-24 11:32:26 +00:00
TreeHugger Robot
6190e39d0a
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -s ours am: 5c5ee11ba0 -s ours am: 3edc33cc49 -s ours am: ef0a5cd790 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 e8141aa9c3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: If04b2d1316b5725cec7b9a5cdfb126f629dfe3f9
2020-06-24 07:28:37 +00:00
Automerger Merge Worker
ae7c8cd88e
Merge "[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours am: 95ba1d0661 -s ours" into rvc-qpr-dev-plus-aosp am: 0cbcd310f9 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 e8141aa9c3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I3fc45274c9340cd012be1397d2d4c30874f17582
2020-06-24 07:28:12 +00:00
TreeHugger Robot
23352a27dd
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 am: 0034558936 -s ours am: 28dd8439d1 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: Ic7c7b95ec519d9a4acd776b6e659ec7c2aa604c8
2020-06-24 07:27:48 +00:00
TreeHugger Robot
ef0a5cd790
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -s ours am: 5c5ee11ba0 -s ours am: 3edc33cc49 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 e8141aa9c3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I88efdabb21cadc7a21347626268a9e855562798d
2020-06-24 07:12:07 +00:00
Automerger Merge Worker
0cbcd310f9
Merge "[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours am: 95ba1d0661 -s ours" into rvc-qpr-dev-plus-aosp
2020-06-24 07:11:41 +00:00
TreeHugger Robot
c618e50209
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours am: 95ba1d0661 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I543c3d4be2acf9445cdf9faae132357fc1892f66
2020-06-24 07:11:30 +00:00
TreeHugger Robot
28dd8439d1
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 am: 0034558936 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I928f83a54814438cf1095f1d3506c05f4346f97d
2020-06-24 07:11:26 +00:00
TreeHugger Robot
3edc33cc49
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -s ours am: 5c5ee11ba0 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 e8141aa9c3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: Ia4bbbe4ada4628fb18205bec5a4f66a03ba0c917
2020-06-24 06:57:17 +00:00
TreeHugger Robot
95ba1d0661
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: Ib4ece60f5283898764ffd23aea615060e2dbe348
2020-06-24 06:56:48 +00:00
TreeHugger Robot
91d1d07ff4
Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I70a9139123e5703607e2c011c7449e37880e78d5
2020-06-24 06:51:09 +00:00
TreeHugger Robot
5c5ee11ba0
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: Ib853e8dcf754451407ef858f3af766b9cab9696c
2020-06-24 06:50:26 +00:00
TreeHugger Robot
0de458a801
Merge "tethering: offload: Netlink Req" into rvc-dev
2020-06-24 06:46:47 +00:00
Orion Hodson
869fc73ad0
Merge changes from topic "lnh-platform-split"
...
* changes:
Sync with libnativehelper refactoring
Update to use nativehelper/JNIPlatformHelp.h
2020-06-24 06:18:23 +00:00
Automerger Merge Worker
6960653405
Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 -s ours am: fdb754c00d -s ours am: 5e02e65a89 -s ours" into rvc-qpr-dev-plus-aosp am: 4d81e32375 -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 4dd87aafc0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I022f18297d6034e40c3a88649ebb43d87bb6d446
2020-06-24 05:16:50 +00:00
Automerger Merge Worker
ef2b1f636f
Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 96a0513a90 am: aa1630d0b7 -s ours" into rvc-qpr-dev-plus-aosp am: 44c1385bdd -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 4dd87aafc0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: Ib0a2326956c0541fd0f30dd118af19324a86d6be
2020-06-24 05:16:21 +00:00