Commit Graph

1345 Commits

Author SHA1 Message Date
Jiyong Park
601f074989 Merge "Mark some aidl_interface modules as unstable" into rvc-dev am: fc7d16b3c7 am: 49eeb6c7d8 am: 1cb960a48e am: 17add16feb
Change-Id: I74ae64ae9f7a4ff5782c208b36816fd429c79aba
2020-04-20 06:30:34 +00:00
Jiyong Park
17add16feb Merge "Mark some aidl_interface modules as unstable" into rvc-dev am: fc7d16b3c7 am: 49eeb6c7d8 am: 1cb960a48e
Change-Id: I9e8cab0ceeaa3c35dd814d586d00310ccddae3fc
2020-04-20 06:01:09 +00:00
Jiyong Park
1cb960a48e Merge "Mark some aidl_interface modules as unstable" into rvc-dev am: fc7d16b3c7 am: 49eeb6c7d8
Change-Id: I9c62e401a59db0f85b6a7c3643ca035ee4a5e26e
2020-04-20 05:42:11 +00:00
Jiyong Park
49eeb6c7d8 Merge "Mark some aidl_interface modules as unstable" into rvc-dev am: fc7d16b3c7
Change-Id: I87f2b5384ad7f82374597a75de4595e380564e55
2020-04-20 05:23:12 +00:00
Jiyong Park
fc7d16b3c7 Merge "Mark some aidl_interface modules as unstable" into rvc-dev 2020-04-20 03:23:06 +00:00
TreeHugger Robot
ea8a47f0ab [automerger skipped] Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev am: 3baf9409d5 -s ours am: 1f093888f1 -s ours am: 38a595c418 -s ours am: a79312f9c1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ief2fd8276a2c2c86e29b40c0169da238d05fd118
2020-04-18 07:47:22 +00:00
TreeHugger Robot
a79312f9c1 [automerger skipped] Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev am: 3baf9409d5 -s ours am: 1f093888f1 -s ours am: 38a595c418 -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 69f3fa3729 is in history

Change-Id: I468dca6ee2b4ec688421e93abd1435f0939da67e
2020-04-18 07:29:04 +00:00
TreeHugger Robot
38a595c418 [automerger skipped] Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev am: 3baf9409d5 -s ours am: 1f093888f1 -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 69f3fa3729 is in history

Change-Id: I0cc6b968213abdc332c0f1c0fbc1f50dcdddef18
2020-04-18 07:06:26 +00:00
TreeHugger Robot
1f093888f1 [automerger skipped] Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev am: 3baf9409d5 -s ours
am skip reason: Change-Id I1812818c3d49463c3840a98212bbab58a110359a with SHA-1 69f3fa3729 is in history

Change-Id: I6ff4c3d99b7f036ed7c0234e5a6b8f6bd696ebd6
2020-04-18 06:44:59 +00:00
TreeHugger Robot
3baf9409d5 Merge "DO NOT MERGE Remove references of telephony-stubs." into rvc-dev 2020-04-18 06:16:44 +00:00
TreeHugger Robot
4eaf7df740 [automerger skipped] Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 am: e61564b21e am: a48386e7b6 am: f7f3a5ea3d -s ours am: be91d0967c -s ours
am skip reason: Change-Id I74b4f87c2f6aad09e05d3f2a779f880396885953 with SHA-1 4580c83253 is in history

Change-Id: Ie30103a03a9cba7b9dd4b48487e0adca5124a6f8
2020-04-17 20:07:09 +00:00
TreeHugger Robot
be91d0967c [automerger skipped] Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 am: e61564b21e am: a48386e7b6 am: f7f3a5ea3d -s ours
am skip reason: Change-Id I74b4f87c2f6aad09e05d3f2a779f880396885953 with SHA-1 4580c83253 is in history

Change-Id: Ie7c55a69ed4d88e7d25e15a615ad0356665d1c65
2020-04-17 19:48:59 +00:00
TreeHugger Robot
5ba566229f [automerger skipped] Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 am: e61564b21e -s ours am: 258c120c9f -s ours am: 3b1e596a92 -s ours
am skip reason: Change-Id I74b4f87c2f6aad09e05d3f2a779f880396885953 with SHA-1 4580c83253 is in history

Change-Id: If8086d4a7baee31b37777a99763daaf57ed64a62
2020-04-17 19:41:23 +00:00
TreeHugger Robot
fc63583902 [automerger skipped] Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 -s ours am: bb2bc6c096 -s ours am: 6382eab9ef -s ours am: cd51f06f94 -s ours
am skip reason: Change-Id I74b4f87c2f6aad09e05d3f2a779f880396885953 with SHA-1 1f66261a3c is in history

Change-Id: If0c8fdb1030281b9fccabd45a0a4df7346c11095
2020-04-17 19:40:32 +00:00
TreeHugger Robot
3b1e596a92 [automerger skipped] Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 am: e61564b21e -s ours am: 258c120c9f -s ours
am skip reason: Change-Id I74b4f87c2f6aad09e05d3f2a779f880396885953 with SHA-1 4580c83253 is in history

Change-Id: Ife1028fda80597aace5687d4bc98f1f35be40dac
2020-04-17 19:26:21 +00:00
TreeHugger Robot
cd51f06f94 [automerger skipped] Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 -s ours am: bb2bc6c096 -s ours am: 6382eab9ef -s ours
am skip reason: Change-Id I74b4f87c2f6aad09e05d3f2a779f880396885953 with SHA-1 1f66261a3c is in history

Change-Id: Idba1bea6d4f29e9b63f55aaa7d90552b96834da6
2020-04-17 19:25:36 +00:00
TreeHugger Robot
f7f3a5ea3d Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 am: e61564b21e am: a48386e7b6
Change-Id: I0d634ed6f37b67d8b11a8d179e2b6fd894f73bd9
2020-04-17 19:25:23 +00:00
TreeHugger Robot
258c120c9f [automerger skipped] Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 am: e61564b21e -s ours
am skip reason: Change-Id I74b4f87c2f6aad09e05d3f2a779f880396885953 with SHA-1 4580c83253 is in history

Change-Id: I3120888e9c94ba2803bd5c247026080a42dc7213
2020-04-17 19:05:30 +00:00
TreeHugger Robot
6382eab9ef [automerger skipped] Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 -s ours am: bb2bc6c096 -s ours
am skip reason: Change-Id I74b4f87c2f6aad09e05d3f2a779f880396885953 with SHA-1 1f66261a3c is in history

Change-Id: I8d7dc42cc0c257c90c77f4ad8f771ae311774038
2020-04-17 19:05:13 +00:00
TreeHugger Robot
bb2bc6c096 [automerger skipped] Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6 -s ours
am skip reason: Change-Id I74b4f87c2f6aad09e05d3f2a779f880396885953 with SHA-1 1f66261a3c is in history

Change-Id: I8f9dec057658a2726fbcf576f584eee55e900db8
2020-04-17 18:46:03 +00:00
TreeHugger Robot
e61564b21e Merge "[TNU06] Add roaming notification" into rvc-dev am: 56ef0ea4b6
Change-Id: I542b34a34278715d976be0baf92a554b5163a850
2020-04-17 18:45:21 +00:00
Chalard Jean
4580c83253 [TNU06] Add roaming notification
Warn user of potential data charges if the backhaul is
cellular and user is roaming.

Bug: 145629001
Test: atest TetheringTests
Change-Id: I74b4f87c2f6aad09e05d3f2a779f880396885953
Merged-In: I74b4f87c2f6aad09e05d3f2a779f880396885953
(cherry picked from commit 1af69e5b8f339bde5b70886d80960ce22c847245, aosp/1237026)
2020-04-17 17:14:12 +00:00
Chalard Jean
ffb500bbb2 Merge "[TNU06] Add roaming notification" am: 565160c302 am: 8f365b0b13 am: bc380e0215 am: 3e86e96701 am: d865dda2a3
Change-Id: If3f7db58352c0d7097d625e299da4515fcb5ee67
2020-04-17 17:12:44 +00:00
Chalard Jean
d865dda2a3 Merge "[TNU06] Add roaming notification" am: 565160c302 am: 8f365b0b13 am: bc380e0215 am: 3e86e96701
Change-Id: I05c77f2319f77b77e9da8ad5bfcd17d2b8458601
2020-04-17 16:52:09 +00:00
Chalard Jean
3e86e96701 Merge "[TNU06] Add roaming notification" am: 565160c302 am: 8f365b0b13 am: bc380e0215
Change-Id: I70f7d6361283c26f75f988adfad8d29e0f3e2b08
2020-04-17 16:40:51 +00:00
Chalard Jean
bc380e0215 Merge "[TNU06] Add roaming notification" am: 565160c302 am: 8f365b0b13
Change-Id: Ia02ca67be0a103e980be6a4c7a0ed66836716d51
2020-04-17 16:28:53 +00:00
Chalard Jean
8f365b0b13 Merge "[TNU06] Add roaming notification" am: 565160c302
Change-Id: I8f66563665375bdde40b59c997b9aba197f04dbd
2020-04-17 16:17:50 +00:00
paulhu
1f66261a3c [TNU06] Add roaming notification
Warn user of potential data charges if the backhaul is
cellular and user is roaming.

Bug: 145629001
Test: atest TetheringTests
Change-Id: I74b4f87c2f6aad09e05d3f2a779f880396885953
2020-04-17 21:25:54 +08:00
Paul Hu
256457e2a2 [automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 95c0a85b0b am: eba9f7a887 am: 50a4f794f5 -s ours am: a5b358cf8a -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 5e9c40c012 is in history

Change-Id: I386df7ff41d749b0c0ea95976865f615c3e13f2b
2020-04-17 02:18:07 +00:00
Paul Hu
2698337d3e [automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 -s ours am: fa5d45614b -s ours am: 0172dec0ca -s ours am: 06d6182c15 -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 5e9c40c012 is in history

Change-Id: I25fde201e2a510553c3988885589142d66eff14f
2020-04-17 02:16:46 +00:00
Automerger Merge Worker
a9861bdef2 Merge "[automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 95c0a85b0b -s ours" into rvc-d1-dev-plus-aosp am: 6c83b74711 -s ours am: 26d592adf1 -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 1317e27e91 is in history

Change-Id: Icc18692a89dd227a0410a36ebceefe3b5582a2d5
2020-04-17 02:15:45 +00:00
Paul Hu
a5b358cf8a [automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 95c0a85b0b am: eba9f7a887 am: 50a4f794f5 -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 5e9c40c012 is in history

Change-Id: I8fd418b47adf50affaf0bc29d59b454c8920f7b5
2020-04-17 02:14:12 +00:00
Paul Hu
06d6182c15 [automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 -s ours am: fa5d45614b -s ours am: 0172dec0ca -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 5e9c40c012 is in history

Change-Id: I4f3f765216daec3621d6944eb221b2ca0fa5ebb6
2020-04-17 01:58:26 +00:00
Automerger Merge Worker
26d592adf1 Merge "[automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 95c0a85b0b -s ours" into rvc-d1-dev-plus-aosp am: 6c83b74711 -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 1317e27e91 is in history

Change-Id: Ic7fd7e952e12febc612a856f00b4d5eaf7841596
2020-04-17 01:57:48 +00:00
Paul Hu
50a4f794f5 Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 95c0a85b0b am: eba9f7a887
Change-Id: I416411d9824bf0f8921ec2fdc4777e3e250ff67b
2020-04-17 01:57:04 +00:00
Paul Hu
0172dec0ca [automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 -s ours am: fa5d45614b -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 5e9c40c012 is in history

Change-Id: I9999c09894e1322150a9bcb4989af3c33c7f0ec0
2020-04-17 01:35:39 +00:00
Paul Hu
d3c0d036fe [automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 95c0a85b0b -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 1317e27e91 is in history

Change-Id: I2b9c2ba054e0c318f5b0bd4f1812e3ecde2f0647
2020-04-17 01:34:50 +00:00
Paul Hu
95c0a85b0b Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457
Change-Id: Iea664b4d0ee648153ceb4524e80331edf42590cf
2020-04-17 01:16:32 +00:00
Paul Hu
fa5d45614b [automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 1317e27e91 is in history

Change-Id: I3e83abed81dbb6ee37e4f0545462f2365d162778
2020-04-17 01:15:49 +00:00
Paul Hu
5e9c40c012 [TNU05.1] Address aosp/1237036 leftover comments
Bug: 147818698
Test: atest TetheringTests
Change-Id: Ife738339aeae00d2063fea6918b50204daef24fc
Merged-In: Ife738339aeae00d2063fea6918b50204daef24fc
(cherry picked from commit c638ae6436509df092ab8814bb5b64591878229d, aosp/1287133)
2020-04-16 16:51:00 +00:00
Mark Chien
b0ce0cdcd7 [automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 am: ab126a97d3 am: 14bdad0e2e am: b7c724ae20 -s ours am: 81f7626f33 -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 30c0da71b0 is in history

Change-Id: I69e0bab064dc8133bcade1038cdd9efae833485f
2020-04-16 11:10:46 +00:00
Automerger Merge Worker
245c1a022e Merge "[automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 -s ours am: 8fb063eab4 -s ours" into rvc-d1-dev-plus-aosp am: 66f96e7bc0 -s ours am: 59f2862ded -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 30c0da71b0 is in history

Change-Id: Ia7b4868d52fb5ea0e6e94f541c7a5f50bc07b7d1
2020-04-16 11:10:23 +00:00
Mark Chien
81f7626f33 [automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 am: ab126a97d3 am: 14bdad0e2e am: b7c724ae20 -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 30c0da71b0 is in history

Change-Id: I79762c8ae1917d8f981dfb195dcfac0b2d5355cb
2020-04-16 11:09:37 +00:00
Mark Chien
f1e88e7aff [automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 am: ab126a97d3 -s ours am: 9391c03a0e -s ours am: 8e4d98a763 -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 a1a0be93f0 is in history

Change-Id: I6197904161a141d64540aa4c7eba74cd8b96c21c
2020-04-16 11:09:33 +00:00
Automerger Merge Worker
59f2862ded Merge "[automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 -s ours am: 8fb063eab4 -s ours" into rvc-d1-dev-plus-aosp am: 66f96e7bc0 -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 30c0da71b0 is in history

Change-Id: I7cdfed9925e61980363aa52cc0d8a209c5eeea1d
2020-04-16 10:58:52 +00:00
Mark Chien
b7c724ae20 Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 am: ab126a97d3 am: 14bdad0e2e
Change-Id: I388502b8919c2a7fc14c61df9ad41d8ca6c0ee1d
2020-04-16 10:58:46 +00:00
Mark Chien
8e4d98a763 [automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 am: ab126a97d3 -s ours am: 9391c03a0e -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 a1a0be93f0 is in history

Change-Id: I883f8754d4b346831611df4850324688085a294c
2020-04-16 10:58:41 +00:00
Automerger Merge Worker
66f96e7bc0 Merge "[automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 -s ours am: 8fb063eab4 -s ours" into rvc-d1-dev-plus-aosp 2020-04-16 10:46:11 +00:00
Mark Chien
32ff8de3f1 [automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 -s ours am: 8fb063eab4 -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 a1a0be93f0 is in history

Change-Id: I3786eb4b15a896c34dd52ddb02b7a1160e4e2d90
2020-04-16 10:46:04 +00:00
Mark Chien
9391c03a0e [automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 am: ab126a97d3 -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 a1a0be93f0 is in history

Change-Id: I8ed7cbb556551d4cbe054ebd2dccb83e12b9f547
2020-04-16 10:45:58 +00:00